4 files changed, 34 insertions, 32 deletions
diff --git a/man/C/urpmf.8 b/man/C/urpmf.8
index 84a66d3b..5c2a6a94 100644
--- a/man/C/urpmf.8
+++ b/man/C/urpmf.8
@@ -11,7 +11,7 @@ urpmf outputs a list of packages providing the file specified as an argument.
 packages are providing it. \fBurpmf\fP will then print a list of matching files
 with their corresponding packages.
 .PP
-Using options you may search though other packages parameters.
+Using options you may search through other packages' parameters.
 \fBurpmf\fP searches through installed and uninstalled packages.
 .SH OPTIONS
 .IP "\fB\--help\fP"
@@ -20,14 +20,14 @@ print a help message and exit.
 Use only update media. This means \fBurpmi\fP will search and resolve
 dependencies only in media marked as update.
 .IP "\fB\--media\fP \fImedium1,...,mediumN\fP"
-Select specific media to use instead of all media available (or update media is
+Select specific media to use instead of all media available (or update media if
 \fB--update\fP is used).
 .IP "\fB\--excludemedia\fP \fImedium1,...,mediumN\fP"
 Do not use the given media.
 .IP "\fB\--sortmedia\fP \fImedium1,...,mediumN\fP"
 Sort the given media, substrings may be used to simplify grouping.
 .IP "\fB\--synthesis\fP \fIfile\fP"
-Use the given synthesis\fIfile\fP instead of urpmi db for searching packages and
+Use the given synthesis file instead of urpmi db for searching packages and
 resolving dependencies.
 .IP "\fB\--verbose\fP"
 Propose a verbose mode with various messages.
@@ -81,7 +81,7 @@ Print the name of the media in which the package has been found.
 Include code directly in generated perl expression. Use it with \fB--verbose\fP
 to look at perl code generated. But in any cases, use it only if you know perl.
 .IP "\fB-a\fP"
-Binary AND operator, true if both expression are true.
+Binary AND operator, true if both expressions are true.
 .IP "\fB-o\fP"
 Binary OR operator, true if one expression is true.
 .IP "\fB!\fP"
diff --git a/man/C/urpmi.8 b/man/C/urpmi.8
index e602a087..c1efc756 100644
--- a/man/C/urpmi.8
+++ b/man/C/urpmi.8
@@ -24,14 +24,14 @@ are already installed.
 proceed.
 .PP
 Note that urpmi handles installations from various types of media (ftp, http,
-rsync, local and nfs volumes, removable media such as CDROMs) and is able to
-install dependencies from a media different from the original package's
-media. If necessary, for removable media, urpmi may ask you to insert the
-appropriate disk.
+rsync, local and nfs volumes, and removable media such as CDROMs) and is able
+to install dependencies from a medium different from the original package's
+media. For removable media, urpmi may ask you to insert the appropriate disk,
+if necessary.
 .PP
-To add a new media containing rpms, run urpmi.addmedia.
+To add a new medium containing rpms, run urpmi.addmedia.
 .br
-To remove an existing media, use urpmi.removemedia.
+To remove an existing medium, use urpmi.removemedia.
 .br
 To update the package list (for example when the ftp archive changes) use
 urpmi.update.
@@ -77,7 +77,7 @@ packages. The default is 1 and setting this value to 0 just disables splitting
 in small transactions.
 .IP "\fB\--fuzzy\fP"
 Disable fast search on exact package name; i.e. it will propose all
-packages matching partially the name, even if one of them matches exactly the
+packages matching the name partially, even if one of them matches exactly the
 specified name (this is the same as \fB\-y\fP).
 .IP "\fB\--src\fP \fIname\fP"
 Search a source package matching \fIname\fP and select all its dependencies by
@@ -134,15 +134,15 @@ Activate or deactivate rpm signature checking. It's activated by default.
 Test (same as \fBrpm --test\fP) installation of packages but do not modify the
 system.
 .IP "\fB\--strict-arch\fP"
-Upgrade only packages if the newer version has the same architecture than the
-installed one. Mostly useful on machines that support several architectures
+Upgrade only packages if the newer version has the same architecture as the
+one installed. Mostly useful on machines that support several architectures
 (32 and 64 bit).
 .IP "\fB\--norebuild\fP"
 Don't try to rebuild the hdlist files from the RPMs if the original hdlist wasn't
 readable or was corrupted.
 .IP "\fB\--excludepath\fP \fIstring\fP"
-Do not install files whose name begins with the given \fIstring\fP (same as \fBrpm
---excludepath\fP).
+Do not install files of which the names begin with the given \fIstring\fP (same
+as \fBrpm --excludepath\fP).
 .IP "\fB\--excludedocs\fP"
 Do not install documents files (same as \fBrpm --excludedocs\fP).
 .IP "\fB\-a\fP"
@@ -152,7 +152,7 @@ Allow search in provides to find package (default).
 .IP "\fB\-P\fP"
 Do not search in provides to find package (this is the opposite of \fB-p\fP).
 .IP "\fB\-y\fP"
-Yhis is the same as \fB--fuzzy\fP.
+This is the same as \fB--fuzzy\fP.
 .IP "\fB\-s\fP"
 This is the same as \fB--src\fP.
 .IP "\fB\-q\fP"
@@ -207,12 +207,13 @@ possible.
 .PP
 Please test the report using
 .I urpmi --env bug_name_as_directory ...
-to check bug is still here, currently only resolution bugs are reproduceable.
+to check that the bug is still here. Obviously, only reproducible bugs can be
+resolved.
 .PP
 For sending the report, use
 .I tar cvfz bug_name_as_directory.tgz bug_name_as_directory
 and send it directly to the current maintainer (rgarciasuarez@mandrakesoft.com)
-with a description of what is wrong according to you.
+with a description of what you think is wrong.
 .SH BUGS
 When a package is removed, it may not be replaced with an older version.
 .SH AUTHOR
diff --git a/man/C/urpmi.addmedia.8 b/man/C/urpmi.addmedia.8
index f6a1deca..c6c6ff2f 100644
--- a/man/C/urpmi.addmedia.8
+++ b/man/C/urpmi.addmedia.8
@@ -1,7 +1,7 @@
 .TH urpmi.addmedia 8 "28 Aug 2003" "Mandrakesoft" "Mandrakelinux"
 .IX urpmi.addmedia
 .SH NAME
-urpmi.addmedia \- adds a new rpm media to be used by urpmi
+urpmi.addmedia \- adds a new rpm medium to be used by urpmi
 .SH SYNOPSIS
 .B urpmi.addmedia [\fIoptions\fP] <\fIname\fP> <\fIurl\fP>
 .SH DESCRIPTION
@@ -13,7 +13,7 @@ One of the following modes must be chosen:
 .PP
 http:
 .IP "\fB urpmi.addmedia [\fIoptions\fP] <\fIname\fP> http://<\fIlogin\fP>:<\fIpass\fP>@<\fIhost\fP>/<\fIpath\fP> [with <\fIrelative path of synthesis|hdlist\fP>]\fP"
-Where <\fIname\fP> is your reference for the media (e.g. "updates").
+Where <\fIname\fP> is your reference for the medium (e.g. "updates").
 <\fIname\fP> is optional if \fB--distrib\fP is given in \fIoptions\fP.
 .br
 <\fIhost\fP>/<\fIpath\fP> is the location of the rpm directory on the net.
@@ -29,18 +29,19 @@ the rpms. The location is given relative to <\fIpath\fP>.
 ftp:
 .IP "\fB urpmi.addmedia [\fIoptions\fP] <\fIname\fP> ftp://<\fIlogin\fP>:<\fIpass\fP>@<\fIhost\fP>/<\fIpath\fP> [with <\fIrelative path of synthesis|hdlist\fP>]\fP"
 The same as for http, just add your login and user if required (Note that
-you needn't to specify anonymous as login for anonymous access ftp servers).
+you don't need to specify \fBanonymous\fP as login for anonymous access ftp
+servers).
 .br
 Note that if \fBwget\fP is used to download files with a firewall you may
-have to add \fBpassive_ftp=on\fP option to \fB/etc/wgetrc\fP. 
+have to add the \fBpassive_ftp=on\fP option to \fB/etc/wgetrc\fP. 
 .br
 \fIeg\fP: urpmi.addmedia ftp ftp://a:a@leia//export/media/main with media_info/hdlist.cz
 .PP
 ssh:
 .IP "\fB urpmi.addmedia [\fIoptions\fP] <\fIname\fP> ssh://<\fIlogin\fP>@<\fIhost\fP>/<\fIpath\fP> [with <\fIrelative path of synthesis|hdlist\fP>]\fP"
 The same as for http, just add your login and password if required. It is
-strongly recommended to export root key in order not to have to type password
-all the time. \fBscp\fP and \fBrsync\fP will be used to get files.
+strongly recommended to export the root key in order not to have to type a
+password all the time. \fBscp\fP and \fBrsync\fP will be used to get files.
 .br
 \fIeg\fP: urpmi.addmedia -h ssh ssh://fpons@bi/c/i586/media/main
 .PP
@@ -53,7 +54,7 @@ The same as for http, you can use <\fIhost\fP>::<\fIpath\fP> too.
 Local drive or NFS:
 .br
 .IP "\fB urpmi.addmedia [\fIoptions\fP] <\fIname\fP> file://<\fIpath\fP>\fP [with <\fIrelative path of synthesis|hdlist\fP>]\fP"
-Where <\fIname\fP> is your reference for the media (e.g. Myrpms).
+Where <\fIname\fP> is your reference for the medium (e.g. Myrpms).
 .br
 <\fIpath\fP> is the location of the rpm directory on your machine.
 .PP
@@ -89,7 +90,7 @@ Do not try to find any synthesis or hdlist file.
 .IP "\fB\--distrib\fP"
 Retrieve a set of media from a distribution. Typically, the URL provided to
 \fBurpmi.addmedia\fP will represent the parent directory of a directory
-\fBmedia\fP, which in turn will contain various subdirectories for each media
+\fBmedia\fP, which in turn will contain various subdirectories for each medium
 of the distribution. <\fIname\fP> is combined with medium names found to create
 newer medium names in the urpmi database. The \fBwith ...\fP option, if
 provided, is ignored, as hdlists found on the installation medium are used
diff --git a/man/C/urpmq.8 b/man/C/urpmq.8
index 1684cb99..7d597ab9 100644
--- a/man/C/urpmq.8
+++ b/man/C/urpmq.8
@@ -5,7 +5,7 @@ urpmq \- urpmi database query tool.
 .SH SYNOPSIS
 .B urpmq [\fIoptions\fP] [\fIpackage_names\fP | \fIrpm_files...\fP]
 .SH DESCRIPTION
-urpmq is a tool to the urpmi database. It can be used to list available
+urpmq is a tool to access the urpmi database. It can be used to list available
 packages in the various urpmi media, or to list the full dependencies of a
 package, or to list the packages that will be installed if you start urpmi.
 .PP
@@ -26,7 +26,7 @@ media if \fB--update\fP is used).
 .IP "\fB\--excludemedia\fP \fImedia1,...,mediaN\fP"
 Do not use the specified media.
 .IP "\fB\--searchmedia\fP \fImedia\fP"
-Use only the specified media to search for packages when combined with
+Use only the specified medium to search for packages when combined with
 \fB\--auto-select\fP.
 .IP "\fB\--sortmedia\fP \fImedia1,...,mediaN\fP"
 Sort the specified media. Substrings may be used to simplify grouping.
@@ -38,7 +38,7 @@ Automatically select all packages that have to be upgraded, according to already
 installed packages and packages listed in various registered media.
 .IP "\fB\--fuzzy\fP"
 Disable fast search on exact package name; i.e. it will propose all
-packages matching partially the name, even if one of them matches exactly the
+packages matching the name partially, even if one of them matches exactly the
 specified name (this is the same as \fB\-y\fP).
 .IP "\fB\--keep\fP"
 When some dependencies cannot be satisfied, change the selection of packages
@@ -64,7 +64,7 @@ Extract and dump headers of selected packages to standard output.
 .IP "\fB\--sources\fP"
 Print source URLs (or file names) of all selected packages.
 .IP "\fB\--force\fP"
-Continue when requesting inexistent packages.
+Continue when requesting packages that are not available.
 .IP "\fB\--parallel\fP \fIalias\fP"
 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
@@ -101,8 +101,8 @@ Select all matches on command line, useful when using \fB-f\fP or \fB-r\fP with
 incomplete name given.
 .IP "\fB\-c\fP"
 If maximal closure is used, assume that a package listed may have wrong or not
-up-to-date dependencies. This cause more package to be upgraded and may correct
-unresolved dependencies on the rpm database.
+up-to-date dependencies. This causes more packages to be upgraded and may
+correct unresolved dependencies on the rpm database.
 .IP "\fB\-p\fP"
 Search in provides to find package (this is the opposite of \fB-P\fP).
 .IP "\fB\-P\fP"