[PATCH] iproute2: revert syntax help text mistake.

[PATCH] iproute2: revert syntax help text mistake.

[Andreas Henriksson]

Sorry. The pref and prio options are actually synonyms.
This reverts part of commit 576c63ee59de3f18bec4ebd8181a5a395f268d03.

Signed-off-by: Andreas Henriksson <andreas@fatal.se>

--- a/ip/iprule.c
+++ b/ip/iprule.c
@@ -38,7 +38,7 @@ static void usage(void)
 {
 	fprintf(stderr, "Usage: ip rule [ list | add | del | flush ] SELECTOR ACTION\n");
 	fprintf(stderr, "SELECTOR := [ not ] [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK[/MASK] ]\n");
-	fprintf(stderr, "            [ dev STRING ] [ pref NUMBER ] [ prio NUMBER ]\n");
+	fprintf(stderr, "            [ dev STRING ] [ pref NUMBER ]\n");
 	fprintf(stderr, "ACTION := [ table TABLE_ID ]\n");
 	fprintf(stderr, "          [ prohibit | reject | unreachable ]\n");
 	fprintf(stderr, "          [ realms [SRCREALM/]DSTREALM ]\n");

[PATCH] iproute2: add synonyms for ip rule options to ip(8) manpage.

[Andreas Henriksson]

commit 355e1438f73602fbac029d28891dfa889471b679
Author: Andreas Henriksson <andreas@fatal.se>
Date:   Wed Jan 2 23:21:59 2008 +0100

    Add synonyms for ip rule options to ip(8) manpage.
    
    See:
    http://bugs.debian.org/433507
    http://bugs.debian.org/213673

diff --git a/man/man8/ip.8 b/man/man8/ip.8
index c74440a..1a57a42 100644
--- a/man/man8/ip.8
+++ b/man/man8/ip.8
@@ -1568,10 +1568,12 @@ the priority of this rule.  Each rule should have an explicitly
 set
 .I unique
 priority value.
+The options preference and order are synonyms with priority.
 
 .TP
 .BI table " TABLEID"
 the routing table identifier to lookup if the rule selector matches.
+It is also possible to use lookup instead of table.
 
 .TP
 .BI realms " FROM/TO"
@@ -1589,6 +1591,7 @@ may be either the start of the block of NAT addresses (selected by NAT
 routes) or a local host address (or even zero).
 In the last case the router does not translate the packets, but
 masquerades them to this address.
+Using map-to instead of nat means the same thing.
 
 .B Warning:
 Changes to the RPDB made with these commands do not become active
@@ -1601,6 +1604,7 @@ This command has no arguments.
 
 .SS ip rule show - list rules
 This command has no arguments.
+The options list or lst are synonyms with show.
 
 .SH ip maddress - multicast addresses management
 

Re: [PATCH] iproute2: add synonyms for ip rule options to ip(8) manpage.

[Stephen Hemminger]

On Thu, 03 Jan 2008 00:49:11 +0100
Andreas Henriksson <andreas@fatal.se> wrote:

> commit 355e1438f73602fbac029d28891dfa889471b679
> Author: Andreas Henriksson <andreas@fatal.se>
> Date:   Wed Jan 2 23:21:59 2008 +0100
> 
>     Add synonyms for ip rule options to ip(8) manpage.
>     
>     See:
>     http://bugs.debian.org/433507
>     http://bugs.debian.org/213673
> 
> diff --git a/man/man8/ip.8 b/man/man8/ip.8
> index c74440a..1a57a42 100644
> --- a/man/man8/ip.8
> +++ b/man/man8/ip.8
> @@ -1568,10 +1568,12 @@ the priority of this rule.  Each rule should have an explicitly
>  set
>  .I unique
>  priority value.
> +The options preference and order are synonyms with priority.
>  
>  .TP
>  .BI table " TABLEID"
>  the routing table identifier to lookup if the rule selector matches.
> +It is also possible to use lookup instead of table.
>  
>  .TP
>  .BI realms " FROM/TO"
> @@ -1589,6 +1591,7 @@ may be either the start of the block of NAT addresses (selected by NAT
>  routes) or a local host address (or even zero).
>  In the last case the router does not translate the packets, but
>  masquerades them to this address.
> +Using map-to instead of nat means the same thing.
>  
>  .B Warning:
>  Changes to the RPDB made with these commands do not become active
> @@ -1601,6 +1604,7 @@ This command has no arguments.
>  
>  .SS ip rule show - list rules
>  This command has no arguments.
> +The options list or lst are synonyms with show.
>  
>  .SH ip maddress - multicast addresses management
>  
> 
> 

applied both.

-- 
Stephen Hemminger <stephen.hemminger@vyatta.com>