Put corresponding long and short options in same line.

4 files changed, 23 insertions, 66 deletions

diff --git a/pod/8/urpme.pod b/pod/8/urpme.pod
index 158a6957..8358a129 100644
--- a/pod/8/urpme.pod
+++ b/pod/8/urpme.pod
@@ -18,22 +18,18 @@ want to specify packages more broadly, use the B<-a> option.
 
 =over
 
-=item B<--help>
+=item B<-h>, B<-?>, B<--help>
 
-Prints a help message and exit (this is the same as B<-h> or B<-?>).
+Prints a help message and exit.
 
 =item B<-a>
 
 If multiple packages match the given substring, deinstall them all.
 
-=item B<--verbose>
+=item B<-v>, B<--verbose>
 
 Proposes a verbose mode with various messages.
 
-=item B<-v>
-
-This is the same as B<--verbose>.
-
 =item B<--auto>
 
 Removes packages non-interactively, without asking questions.
diff --git a/pod/8/urpmf.pod b/pod/8/urpmf.pod
index 54e6314b..bff688d0 100644
--- a/pod/8/urpmf.pod
+++ b/pod/8/urpmf.pod
@@ -40,15 +40,11 @@ Use a different environment directly out of a bug report tarball.
 
 Do not use the given media.
 
-=item B<--literal>
+=item B<-l>, B<--literal>
 
 Match literally instead of interpreting the argument as a regular
 expression.
 
-=item B<-l>
-
-Equivalent to B<--literal>.
-
 =item B<--media> I<medium1,...,mediumN>
 
 Select specific media to be used, instead of defaulting to all available
diff --git a/pod/8/urpmi.pod b/pod/8/urpmi.pod
index ce90199f..205d7188 100644
--- a/pod/8/urpmi.pod
+++ b/pod/8/urpmi.pod
@@ -55,9 +55,10 @@ example when the ftp archive changes) use C<urpmi.update>.
 
 =over
 
-=item B<--help>
+=item B<-h>, B<-?>, B<--help>
+
+Prints a help message and exit.
 
-Prints a help message and exit (this is the same as B<-h> or B<-?>).
 
 =item B<--media> I<media1,...,mediaN>
 
@@ -148,7 +149,7 @@ Split urpmi's operation in small transactions of at
 least I<count> packages. The default is 8 and setting this value to 0 just
 disables splitting in small transactions.
 
-=item B<--fuzzy>
+=item B<-y>, B<--fuzzy>
 
 Disable fast search on exact package name; that means that urpmi will
 propose all packages matching part of the name, even if one of them
@@ -178,11 +179,11 @@ F</var/cache/urpmi/rpms>.
 
 Assume yes on all questions.
 
-=item B<--quiet>
+=item B<-q>, B<--quiet>
 
 Quiet mode: when calling rpm no upgrade status is printed.
 
-=item B<--verbose>
+=item B<-v>, B<--verbose>
 
 Proposes a verbose mode with various messages.
 
@@ -411,18 +412,6 @@ Allow search in provides to find the package (this is the default).
 
 Do not search in provides to find package (this is the opposite of B<-p>).
 
-=item B<-y>
-
-This is the same as B<--fuzzy>.
-
-=item B<-q>
-
-This is the same as B<--quiet>.
-
-=item B<-v>
-
-This is the same as B<--verbose>.
-
 =back
 
 =head1 EXAMPLES
diff --git a/pod/8/urpmq.pod b/pod/8/urpmq.pod
index 6778b73a..577505a1 100644
--- a/pod/8/urpmq.pod
+++ b/pod/8/urpmq.pod
@@ -20,9 +20,9 @@ according to the command-line options that were used:
 
 =over
 
-=item B<--help>
+=item B<-h>, B<-?>, B<--help>
 
-Prints a help message and exit (this is the same as B<-h> or B<-?>).
+Prints a help message and exit.
 
 =item B<--list>
 
@@ -112,13 +112,17 @@ of removing them. This behaviour generally rejects the upgrade of packages
 given on command line (or when using B<--auto-select>) when a dependency error
 occurs.
 
-=item B<--fuzzy>
+=item B<-y>, B<--fuzzy>
 
 Disable fast search on exact package name; i.e. it will propose
 all packages matching the name partially, even if one of them matches exactly
-the specified name (this is the same as B<-y>).
+the specified name.
 
-=item B<--src> I<name>
+=item B<-Y>
+
+Like B<-y>/B<--fuzzy>, but forces to match case-insensitively.
+
+=item B<-s>, B<--src> I<name>
 
 Search a source package
 matching I<name> and it will select all dependencies by default.
@@ -243,22 +247,14 @@ Prints the package suggests.
 
 Prints the sourcerpm of the package
 
-=item B<--summary>
+=item B<-S>, B<--summary>
 
 Prints concise information about the package.
 
-=item B<--verbose>
+=item B<-v>, B<--verbose>
 
 Activate verbose mode.
 
-=item B<-v>
-
-This is the same as B<--verbose>.
-
-=item B<-d>
-
-This is the same as B<--requires-recursive>.
-
 =item B<-u>
 
 Deselect packages if a better version is already installed.
@@ -278,11 +274,11 @@ If maximal closure is used, assume that a package listed may have wrong or
 not up-to-date dependencies. This causes more packages to be upgraded and
 may correct unresolved dependencies on the rpm database.
 
-=item B<--requires-recursive>
+=item B<-d>, B<--requires-recursive>
 
 Print dependencies (maximal closure).
 
-=item B<--whatprovides>
+=item B<-p>, B<--whatprovides>
 
 Search in provides to find package.
 
@@ -295,26 +291,6 @@ Reverse search to what requires the package given.
 Reverse search to what requires recursively the package given
 (looking through virtual packages).
 
-=item B<-S>
-
-Same as B<--summary>.
-
-=item B<-y>
-
-This is the same as B<--fuzzy>.
-
-=item B<-Y>
-
-Like B<-y>, but forces to match case-insensitively.
-
-=item B<-s>
-
-This is the same as B<--src>.
-
-=item B<-p>
-
-This is the same as B<--whatprovides>.
-
 =item B<-i>
 
 Prints useful information in human readable form, as for I<rpm -qi>.