9 files changed, 42 insertions, 45 deletions
diff --git a/pod/proxy.cfg.5.pod b/pod/proxy.cfg.5.pod
index 660c39d0..1858ed06 100644
--- a/pod/proxy.cfg.5.pod
+++ b/pod/proxy.cfg.5.pod
@@ -16,7 +16,7 @@ environment variables used by many programs such as curl(1):
 
  [protocol://]<host>[:port]
 
-proxy_user values are simply a user name, or a user name and a password
+C<proxy_user> values are simply a user name, or a user name and a password
 separated by a colon (C<:>).
 
 =head1 AUTHOR
diff --git a/pod/rurpmi.8.pod b/pod/rurpmi.8.pod
index aa13f113..835faecc 100644
--- a/pod/rurpmi.8.pod
+++ b/pod/rurpmi.8.pod
@@ -4,7 +4,7 @@ rurpmi - restricted urpmi
 
 =head1 SYNOPSIS
 
- rurpmi [options] [package_names]
+    rurpmi [options] [package_name...]
 
 =head1 DESCRIPTION
 
diff --git a/pod/urpme.8.pod b/pod/urpme.8.pod
index e7810263..f0d4723d 100644
--- a/pod/urpme.8.pod
+++ b/pod/urpme.8.pod
@@ -4,14 +4,15 @@ urpme - rpm deinstaller
 
 =head1 SYNOPSIS
 
-    urpme [options] [package_names]
+    urpme [options] [package_name...]
 
 =head1 DESCRIPTION
 
 urpme allow packages to be deinstalled,
 including all their dependencies. I<package_names> must have one of the forms
-I<name>, I<name-version>, I<name-version-release>, or I<name-version-release.architecture>.
-If you want to specify packages more broadly, use the B<-a> option.
+I<name>, I<name-version>, I<name-version-release>, or
+I<name-version-release.architecture>. If you want to specify packages more
+broadly, use the B<-a> option.
 
 =head1 OPTIONS
 
@@ -46,7 +47,7 @@ Force invocation even if some packages do not exist.
 Activate distributed execution of urpmi to other machines (it is mandatory
 that urpmi is installed, but it is not necessary to have media defined on
 any machines). I<alias> defines which extension module is to be used by
-urpmi (currently, B<urpmi-parallel-ka-run> or B<urpmi-parallel-ssh> are
+urpmi (currently, urpmi-parallel-ka-run or urpmi-parallel-ssh are
 available) and which machines should be updated. This alias is defined in
 the file F</etc/urpmi/parallel.cfg> as described below.
 
diff --git a/pod/urpmf.8.pod b/pod/urpmf.8.pod
index 5700d8dc..107fe3f3 100644
--- a/pod/urpmf.8.pod
+++ b/pod/urpmf.8.pod
@@ -11,10 +11,10 @@ urpmf - Finds the packages matching some conditions
 By default, urpmf outputs the list of the known packages that contain a
 file whose name or path was specified as an argument on the command-line.
 <I<pattern-expression>> is the name or part of the name of the file you
-want to locate. Perl-style regular expressions are allowed. B<urpmf> will
+want to locate. Perl-style regular expressions are allowed. urpmf will
 then print a list of matching files, with their corresponding packages. By
 using options, you may format output differently, and search through other
-rpm tags. Note that B<urpmf> searches through the urpmi media (B<not> in
+rpm tags. Note that urpmf searches through the urpmi media (B<not> in
 the system's rpm database -- for that you should use rpm(8) instead).
 
 =head1 OPTIONS
@@ -65,12 +65,12 @@ Do not print identical lines twice.
 
 =item B<--update>
 
-Use only update media. This means B<urpmf> will only search through media
+Use only update media. This means urpmf will only search through media
 marked as update.
 
 =item B<--verbose>
 
-Verbose mode. B<urpmf> will emit various messages related to the parsing of
+Verbose mode. urpmf will emit various messages related to the parsing of
 hdlist files for your media.
 
 =item B<-i>
diff --git a/pod/urpmi.8.pod b/pod/urpmi.8.pod
index 087449ed..58146e91 100644
--- a/pod/urpmi.8.pod
+++ b/pod/urpmi.8.pod
@@ -43,7 +43,7 @@ Print a help message and exit (this is the same as B<-h> or B<-?>).
 
 =item B<--update>
 
-Use only update media. This means that B<urpmi> will search
+Use only update media. This means that urpmi will search
 packages and resolve dependencies only in media marked as containing updates.
 
 =item B<--media> I<media1,...,mediaN>
@@ -159,7 +159,7 @@ this case.
 Activate distributed execution of urpmi to other machines (it is mandatory
 that urpmi is installed, but it is not necessary to have media defined on
 any machines). I<alias> defines which extension module is to be used by
-urpmi (currently, B<urpmi-parallel-ka-run> or B<urpmi-parallel-ssh> are
+urpmi (currently, urpmi-parallel-ka-run or urpmi-parallel-ssh are
 available) and which machines should be updated. This alias is defined in
 the file F</etc/urpmi/parallel.cfg> as described below.
 
@@ -305,19 +305,15 @@ Proposes a verbose mode with various messages.
 
 =head1 EXAMPLES
 
-=over
-
-=item urpmi ssh://foo@bar.net/home/foo/test.rpm
+    urpmi ssh://foo@bar.net/home/foo/test.rpm
 
 Fetch F</home/foo/test.rpm> from server bar.net over ssh using user foo.
 You can use a public key or enter your password.
 
-=item urpmi --media foo- --auto-select
+    urpmi --media foo- --auto-select
 
 Fetch all the updates from media containing C<foo-> in their name.
 
-=back
-
 =head1 FILES
 
 See urpmi.files(5).
@@ -388,7 +384,7 @@ Some files are missing and all transactions failed.
 
 =head1 BUG REPORTS
 
-If you find a bug in B<urpmi> please report it using the command :
+If you find a bug in urpmi please report it using the command :
 
     urpmi --bug bug_name_as_directory ...
 
diff --git a/pod/urpmi.addmedia.8.pod b/pod/urpmi.addmedia.8.pod
index e5e83493..48fe6d47 100644
--- a/pod/urpmi.addmedia.8.pod
+++ b/pod/urpmi.addmedia.8.pod
@@ -16,7 +16,7 @@ must be chosen:
 
 =over
 
-=item B<urpmi.addmedia [I<options>>] <I<name>> http://<I<login>>:<I<pass>>@<I<host>>/<I<path>> [with <I<relative path of synthesis|hdlist>>]
+=item B<urpmi.addmedia> [I<options>] <I<name>> http://<I<login>>:<I<pass>>@<I<host>>/<I<path>> [with <I<relative path of synthesis|hdlist>>]
 
 where <I<name>> is your reference for the medium (e.g. "updates").
 <I<name>> is optional if B<--distrib> is given in the options list.
@@ -29,7 +29,7 @@ I<options>. Example:
 
     urpmi.addmedia http http://jpackage.sf.net/rpm/free with hdlist.cz ftp:
 
-=item B<urpmi.addmedia [I<options>>] <I<name>> ftp://<I<login>>:<I<pass>>@<I<host>>/<I<path>> [with <I<relative path of synthesis|hdlist>>]
+=item B<urpmi.addmedia> [I<options>] <I<name>> ftp://<I<login>>:<I<pass>>@<I<host>>/<I<path>> [with <I<relative path of synthesis|hdlist>>]
 
 The same as for http. Add your login and password if required (note that
 you don't need to specify B<anonymous> as login for anonymous access ftp
@@ -39,7 +39,7 @@ have to ensure that the B<passive_ftp> option is on in B</etc/wgetrc>
 
     urpmi.addmedia ftp ftp://a:a@leia//export/media/main with media_info/hdlist.cz
 
-=item B<urpmi.addmedia [I<options>>] <I<name>> ssh://<I<login>>@<I<host>>/<I<path>> [with <I<relative path of synthesis|hdlist>>]
+=item B<urpmi.addmedia> [I<options>] <I<name>> ssh://<I<login>>@<I<host>>/<I<path>> [with <I<relative path of synthesis|hdlist>>]
 
 The same as for http and ftp; add your login and password if required. It
 is strongly recommended to export the public key in order not to have to
@@ -48,18 +48,18 @@ files. Example:
 
     urpmi.addmedia -h ssh ssh://fpons@bi/c/i586/media/main
 
-=item B<urpmi.addmedia [I<options>>] <I<name>> rsync://<I<login>>@<I<host>>:<I<port>>/<I<path>> [with <I<relative path of synthesis|hdlist>>]
+=item B<urpmi.addmedia> [I<options>] <I<name>> rsync://<I<login>>@<I<host>>:<I<port>>/<I<path>> [with <I<relative path of synthesis|hdlist>>]
 
 The same as for http; you can use the <I<host>>::<I<path>> syntax too. Example:
 
     urpmi.addmedia rsync rsync://ftp.orst.edu::mandrake-devel/contrib/ppc with ../../cooker/ppc/media/media_info/hdlist2.cz
 
-=item B<urpmi.addmedia [I<options>>] <I<name>> file://<I<path>> [with <I<relative path of synthesis|hdlist>>]
+=item B<urpmi.addmedia> [I<options>] <I<name>> file://<I<path>> [with <I<relative path of synthesis|hdlist>>]
 
 where <I<name>> is your reference for the medium (e.g. Myrpms). <I<path>>
 is the location of the media directory on your machine (e.g. C<media/main>).
 
-=item B<urpmi.addmedia [I<options>>] <I<name>> removable://<I<path>> [with <I<relative path of synthesis|hdlist>>]
+=item B<urpmi.addmedia> [I<options>] <I<name>> removable://<I<path>> [with <I<relative path of synthesis|hdlist>>]
 
 <I<path>> is the location of the media directory on your machine when the
 removable device is mounted. This works for removable drives, but also for
diff --git a/pod/urpmi.cfg.5.pod b/pod/urpmi.cfg.5.pod
index 3b820474..dac2fcb5 100644
--- a/pod/urpmi.cfg.5.pod
+++ b/pod/urpmi.cfg.5.pod
@@ -23,11 +23,11 @@ The following options can be written in this section :
 
 =item B<allow-force>
 
-Same as specifying B<--allow-force> for B<urpmi>, disabled by default.
+Same as specifying B<--allow-force> for urpmi, disabled by default.
 
 =item B<allow-nodeps>
 
-Same as specifying B<--allow-nodeps> for B<urpmi>, disabled by default.
+Same as specifying B<--allow-nodeps> for urpmi, disabled by default.
 
 =item B<downloader>
 
@@ -35,17 +35,17 @@ Specify which download program to use: B<wget> or B<curl>.
 
 =item B<excludedocs>
 
-Same as specifying B<--excludedocs> for B<urpmi>, disabled by default.
+Same as specifying B<--excludedocs> for urpmi, disabled by default.
 
 =item B<excludepath>
 
-Same as B<--excludepath> for B<urpmi>. This options allows to give a comma
+Same as B<--excludepath> for urpmi. This options allows to give a comma
 separated list of paths to be excluded on installation. There is no path
 exclusion by default.
 
 =item B<fuzzy>
 
-Same as B<--fuzzy> for B<urpmi> or B<urpmq>. Enable or disable fuzzy
+Same as B<--fuzzy> for urpmi or urpmq. Enable or disable fuzzy
 search, disabled by default. Enabling it can be written in various ways :
 C<fuzzy> or C<fuzzy: yes> or C<fuzzy: on> or C<fuzzy: 1>.
 
@@ -74,13 +74,13 @@ file present on the medium).
 
 =item B<norebuild>
 
-Same as B<--norebuild> for B<urpmi>, B<urpmi.update> and
-B<urpmi.addmedia>, disabled by default (meaning that B<urpmi> will try to
+Same as B<--norebuild> for urpmi, urpmi.update and
+urpmi.addmedia, disabled by default (meaning that urpmi will try to
 rebuild hdlists by default).
 
 =item B<pre-clean, post-clean, clean>
 
-Control cache management for B<urpmi>, default is only activated as
+Control cache management for urpmi, default is only activated as
 B<post-clean>.
 
 =item B<prohibit-remove>
@@ -95,26 +95,26 @@ errors.
 
 =item B<split-length>
 
-Same as B<--split-length> for B<urpmi>. This option allows to control the
+Same as B<--split-length> for urpmi. This option allows to control the
 minimal length of splitted transactions. The default value is 1 (smallest
 possible transaction). Setting this value to 0 disables the splitting of
 transactions.
 
 =item B<split-level>
 
-Same as B<--split-level> for B<urpmi>. This option allows to control if
+Same as B<--split-level> for urpmi. This option allows to control if
 transactions should be splitted depending of the number of packages to
 upgrade. The default value is 20.
 
 =item B<strict-arch>
 
-Same as B<--strict-arch> for B<urpmi>. Boolean option, disabled by
+Same as B<--strict-arch> for urpmi. Boolean option, disabled by
 default, meaning that packages can be upgraded with versions for another
 architecture.
 
 =item B<verify-rpm>
 
-Same as B<--verify-rpm> for B<urpmi>. Enable or disable signature checking
+Same as B<--verify-rpm> for urpmi. Enable or disable signature checking
 (it's enabled by default). Disabling it can be written in various ways (as
 for all the other boolean options) : C<no-verify-rpm> or C<verify-rpm: no>
 or C<verify-rpm: off> or C<verify-rpm: 0>.
@@ -146,11 +146,11 @@ disabled globally). It's also possible to override B<verify-rpm> and
 B<downloader> in a medium description.
 
 Media can be marked as B<static>: this means that they won't be updated by
-B<urpmi.update> or other means. This is useful for read-only media such as
+urpmi.update or other means. This is useful for read-only media such as
 CDs.
 
-Please note that B<key-ids> is automatically set by B<urpmi.update> or
-B<urpmi.addmedia> if a remote pubkey file is available on the mirror. This
+Please note that B<key-ids> is automatically set by urpmi.update or
+urpmi.addmedia if a remote pubkey file is available on the mirror. This
 file contains all the GPG armor keys that may be used.
 
 =head1 BUGS
diff --git a/pod/urpmi.files.5.pod b/pod/urpmi.files.5.pod
index 54382b01..86827b3b 100644
--- a/pod/urpmi.files.5.pod
+++ b/pod/urpmi.files.5.pod
@@ -69,7 +69,7 @@ the same format as the skip.list.
 This file is optional. If present, it should contain a single line:
 B<url=http://....> which is the URL of a document that lists the available
 mirrors. The default is to use
-B<http://www.mandrivalinux.com/mirrorsfull.list>.
+F<http://www.mandrivalinux.com/mirrorsfull.list>.
 
 =item I</var/log/urpmi.log>
 
diff --git a/pod/urpmq.8.pod b/pod/urpmq.8.pod
index 6579bec5..653b62c8 100644
--- a/pod/urpmq.8.pod
+++ b/pod/urpmq.8.pod
@@ -49,7 +49,7 @@ List available parallel aliases.
 =item B<--update>
 
 Use only update
-media. This means that B<urpmq> will search and resolve dependencies only in
+media. This means that urpmq will search and resolve dependencies only in
 media marked as containing updates.
 
 =item B<--media> I<media1,...,mediaN>
@@ -122,7 +122,7 @@ packages that are not available.
 Activate distributed execution of urpmi to other machines (it is mandatory
 that urpmi is installed but it is not necessary to have media defined on
 any machines). I<alias> defines which extension module to use by urpmi
-(currently B<urpmi-parallel-ka-run> or B<urpmi-parallel-ssh>) and which
+(currently urpmi-parallel-ka-run or urpmi-parallel-ssh) and which
 machines should be updated, this alias is defined in the file
 F</etc/urpmi/parallel.cfg> as described below.
 
@@ -180,8 +180,7 @@ Select dependencies (maximal closure).
 
 =item B<-u>
 
-Deselect packages if a better version is already installed, this option
-can be used with B<-d> to simulate B<-M> mode of B<urpmi>.
+Deselect packages if a better version is already installed.
 
 =item B<-a>
 
@@ -224,6 +223,7 @@ Like B<-y>, but forces to match case-insensitively.
 =item B<-s>
 
 This is the same as B<--src>.
+
 =item B<-i>
 
 Prints useful information in human readable form, as for I<rpm -qi>.