Group options by purpose and add sub-headlines for each group.

The urpmi tools share a lot of options like download options, media
selections and so on. Other option groups are package selection,
output options (for urpmf, urpmq) and database options. Grouping them
makes it easier for the user to spot what she needs.

Additionally tool-specific groups will be put near the top of the
options section, while common groups will be put near the end of that
list, followed by rarely used stuff like debugging. This makes it easier
for the user to spot the tool-specific parts.

Grouping may not be perfect and some option may be in a group not
matching 100 percent. But anyway this should be a fairly good state.
followed

1 files changed, 90 insertions, 46 deletions

diff --git a/pod/8/urpmf.pod b/pod/8/urpmf.pod
index bff688d0..d63c7993 100644
--- a/pod/8/urpmf.pod
+++ b/pod/8/urpmf.pod
@@ -32,69 +32,57 @@ Prints a help message and exits.
 
 Prints the version number and exits.
 
-=item B<--env> I<directory>
+=item B<--verbose>
 
-Use a different environment directly out of a bug report tarball.
+Verbose mode. urpmf will emit various messages related to the parsing of
+media_info files for your media.
 
-=item B<--excludemedia> I<medium1,...,mediumN>
+=item B<--wait-lock>
 
-Do not use the given media.
+If the urpmi or rpm db is busy, wait until it is available
+
+=back
+
+=head2 Query Options
+
+=over
 
 =item B<-l>, B<--literal>
 
 Match literally instead of interpreting the argument as a regular
 expression.
 
-=item B<--media> I<medium1,...,mediumN>
+=item B<-i>
 
-Select specific media to be used, instead of defaulting to all available
-media (or all update media if B<--update> is used).
+Ignore case distinctions in the patterns that follow.
 
-=item B<--sortmedia> I<medium1,...,mediumN>
+=item B<-I>
 
-Sort the given media, substrings may be used to simplify grouping.
-This way, C<media1> will be taken into account first, then C<media2>, and
-so on. Media which aren't listed are taken into account after the others.
+Honor case distinctions in the patterns that follow. This is the default
+behaviour.
 
-=item B<--synthesis> I<file>
 
-Use the given synthesis file instead of urpmi db for searching packages.
+=back
 
-=item B<--use-distrib> I<directory>
+=head2 Output Options
 
-Use the given distribution tree instead of urpmi db for searching packages.
+=over
 
 =item B<--uniq>
 
 Do not print identical lines twice.
 
-=item B<--update>
-
-Use only update media. This means urpmf will only search through media
-marked as update.
-
-=item B<--urpmi-root> I<directory>
-
-Use the file system tree rooted for urpmi database and rpm install. Contrary
-to B<--root>, the urpmi configuration comes from the rooted tree.
-
-=item B<--verbose>
-
-Verbose mode. urpmf will emit various messages related to the parsing of
-media_info files for your media.
-
-=item B<--wait-lock>
 
-If the urpmi or rpm db is busy, wait until it is available
+=item B<-m>
 
-=item B<-i>
+Print the name of the media in which the
+package has been found.
 
-Ignore case distinctions in the patterns that follow.
+=item B<-f>
 
-=item B<-I>
+Print version, release and arch along with name
+of package. This modifies the effect of the I<--name> option.
 
-Honor case distinctions in the patterns that follow. This is the default
-behaviour.
 
 =item B<-F> I<string>
 
@@ -115,8 +103,7 @@ Prints the BuildHost tag.
 
 =item B<--buildtime>
 
-Prints the
-BuildTime tag.
+Prints the BuildTime tag.
 
 =item B<--conffiles>
 
@@ -200,15 +187,11 @@ Prints the packages' URL.
 
 Prints the Vendor tag.
 
-=item B<-m>
-
-Print the name of the media in which the
-package has been found.
+=back
 
-=item B<-f>
+=head2 Advanced Query Options
 
-Print version, release and arch along with name
-of package. This modifies the effect of the I<--name> option.
+=over
 
 =item B<-e>
 
@@ -240,6 +223,67 @@ Right parenthesis to close a group expression.
 
 Includes debugging output.
 
+
+=back
+
+=head2 Media Selection
+
+=over
+
+=item B<--excludemedia> I<medium1,...,mediumN>
+
+Do not use the given media.
+
+=item B<--media> I<medium1,...,mediumN>
+
+Select specific media to be used, instead of defaulting to all available
+media (or all update media if B<--update> is used).
+
+=item B<--sortmedia> I<medium1,...,mediumN>
+
+Sort the given media, substrings may be used to simplify grouping.
+This way, C<media1> will be taken into account first, then C<media2>, and
+so on. Media which aren't listed are taken into account after the others.
+
+=item B<--synthesis> I<file>
+
+Use the given synthesis file instead of urpmi db for searching packages.
+
+=item B<--use-distrib> I<directory>
+
+Use the given distribution tree instead of urpmi db for searching packages.
+
+=item B<--update>
+
+Use only update media. This means urpmf will only search through media
+marked as update.
+
+=back
+
+=head2 Database Options
+
+=over
+
+=item B<--urpmi-root> I<directory>
+
+Use the file system tree rooted for urpmi database and rpm install. Contrary
+to B<--root>, the urpmi configuration comes from the rooted tree.
+
+=item B<--wait-lock>
+
+If the urpmi or rpm db is busy, wait until it is available
+
+=back
+
+=head2 Debugging Options
+
+=over
+
+=item B<--env> I<directory>
+
+Use a different environment directly out of a bug report tarball.
+
+
 =back
 
 =head1 FORMAT