| Message ID | 1456302093-697-4-git-send-email-phil@nwl.cc |
|---|---|
| State | Superseded, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
On Wed, 24 Feb 2016 09:21:16 +0100 Phil Sutter <phil@nwl.cc> wrote: > Get rid of extraneous closing brackets and while here, merge the double > netns parameter. > > Signed-off-by: Phil Sutter <phil@nwl.cc> Patch does not apply to current git. Applying: iplink: fix help text syntax error: patch failed: ip/iplink.c:70 error: ip/iplink.c: patch does not apply Please rebase and resend the whole patch series with v2
This patch series aims at improving consistency of builtin help texts and related man pages (synopsis section at least). It was created by comparing the two and fixing up whatever occurred to be broken. Changes since v1: - rebased onto current master - resolved merge conflict in ip-link.8.in due to added 'trust' option Phil Sutter (20): ip: align help text with manpage ipaddrlabel: Improve help text precision iplink: fix help text syntax ipneigh: add missing proxy keyword to help text ipntable: Fix typo in help text iproute: TYPE keyword is not optional, fix help text accordingly iprule: add missing nat keyword to help text man: ip-address.8: Minor syntax fixes man: ip-link.8: minor font fix man: ip-link.8: Fix and improve synopsis man: ip-neighbour: Fix for missing NUD_STATE description man: ip-netns.8: Clarify synopsis a bit man: ip-ntable.8: Review synopsis section man: ip-rule.8: Review synopsis section man: ip-token.8: Review synopsis section man: ip-tunnel.8: Document missing 6rd action man: ip-xfrm.8: Document missing parameters man: ip.8: Add missing flags and token subcommand description man: ip-l2tp.8: Fix BNF syntax man: ip-*.8: drop any reference to generic ip options ip/ip.c | 2 +- ip/ipaddrlabel.c | 3 +- ip/iplink.c | 9 ++-- ip/ipneigh.c | 2 +- ip/ipntable.c | 2 +- ip/iproute.c | 6 +-- ip/iprule.c | 1 + man/man8/ip-address.8.in | 8 ++-- man/man8/ip-addrlabel.8 | 14 +----- man/man8/ip-l2tp.8 | 24 ++++------ man/man8/ip-link.8.in | 117 +++++++++++++++++++++++------------------------ man/man8/ip-monitor.8 | 4 +- man/man8/ip-mroute.8 | 2 +- man/man8/ip-neighbour.8 | 11 +++-- man/man8/ip-netns.8 | 4 +- man/man8/ip-ntable.8 | 39 +++++++++------- man/man8/ip-rule.8 | 19 +++++--- man/man8/ip-token.8 | 12 ++--- man/man8/ip-tunnel.8 | 11 +++-- man/man8/ip-xfrm.8 | 11 +++++ man/man8/ip.8 | 29 +++++++++++- 21 files changed, 183 insertions(+), 147 deletions(-)
diff --git a/ip/iplink.c b/ip/iplink.c index 5ab9d613c4f99..5a220276f1f96 100644 --- a/ip/iplink.c +++ b/ip/iplink.c @@ -70,17 +70,16 @@ void iplink_usage(void) fprintf(stderr, " [ address LLADDR ]\n"); fprintf(stderr, " [ broadcast LLADDR ]\n"); fprintf(stderr, " [ mtu MTU ]\n"); - fprintf(stderr, " [ netns PID ]\n"); - fprintf(stderr, " [ netns NAME ]\n"); + fprintf(stderr, " [ netns { PID | NAME } ]\n"); fprintf(stderr, " [ link-netnsid ID ]\n"); fprintf(stderr, " [ alias NAME ]\n"); fprintf(stderr, " [ vf NUM [ mac LLADDR ]\n"); fprintf(stderr, " [ vlan VLANID [ qos VLAN-QOS ] ]\n"); - fprintf(stderr, " [ rate TXRATE ] ]\n"); + fprintf(stderr, " [ rate TXRATE ]\n"); - fprintf(stderr, " [ spoofchk { on | off} ] ]\n"); - fprintf(stderr, " [ query_rss { on | off} ] ]\n"); + fprintf(stderr, " [ spoofchk { on | off} ]\n"); + fprintf(stderr, " [ query_rss { on | off} ]\n"); fprintf(stderr, " [ state { auto | enable | disable} ] ]\n"); fprintf(stderr, " [ master DEVICE ]\n"); fprintf(stderr, " [ nomaster ]\n");
Get rid of extraneous closing brackets and while here, merge the double netns parameter. Signed-off-by: Phil Sutter <phil@nwl.cc> --- ip/iplink.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)