diff options
| -rw-r--r-- | pod/urpmi.8.pod | 37 | ||||
| -rw-r--r-- | pod/urpmi.addmedia.8.pod | 14 | ||||
| -rw-r--r-- | pod/urpmi.files.5.pod | 2 | ||||
| -rw-r--r-- | pod/urpmi.removemedia.8.pod | 4 | ||||
| -rw-r--r-- | pod/urpmq.8.pod | 14 |
5 files changed, 34 insertions, 37 deletions
diff --git a/pod/urpmi.8.pod b/pod/urpmi.8.pod index 7d761965..b696268c 100644 --- a/pod/urpmi.8.pod +++ b/pod/urpmi.8.pod @@ -84,16 +84,16 @@ of the urpmi database for searching packages and resolving dependencies. Install all required dependencies without asking. -=item B<--auto-update> +=item B<--auto-select> -Like B<--auto-select>, but also updates all relevant media before -selection of upgradeable packages is made. +Select all packages that can be upgraded, according to already installed +packages and packages listed in various registered media. -=item B<--auto-select> +=item B<--auto-update> -Automatically select all packages that have to be upgraded, according to -already installed packages and packages listed in various registered -media. +Like B<--auto-select>, but also updates all relevant media before +selection of upgradeable packages is made. This avoids a previous call to +C<urpmi.update>. =item B<--no-install> @@ -192,13 +192,13 @@ with the B<--root> option. =item B<--wget> -Use wget for downloading distant files. By default curl -is used if available, or wget instead. +Use wget for downloading distant files. By default curl is used if +available, or wget instead. =item B<--curl> -Use curl for downloading distant -files. By default curl is used if available, or wget instead. +Use curl for downloading distant files. By default curl is used if +available, or wget instead. =item B<--curl-options> I<'options'> @@ -255,26 +255,26 @@ by default. =item B<--test> Test the installation of packages but do not actually install anything or -modify the system. (That's the same as B<rpm --test>). +modify the system. (That's the same as C<rpm --test>). =item B<--excludepath> I<string> Do not install files of which the -names begin with the given I<string> (same as B<rpm --excludepath>). +names begin with the given I<string> (same as C<rpm --excludepath>). =item B<--excludedocs> -Do not install documents files (same as B<rpm --excludedocs>). +Do not install documents files (same as C<rpm --excludedocs>). =item B<--ignoresize> Don't check file systems for sufficient disk space before installation. -This is equivalent to B<rpm --ignoresize>. +This is equivalent to C<rpm --ignoresize>. =item B<--noscripts> Don't execute the scriptlets. -This is equivalent to B<rpm --noscripts>. +This is equivalent to C<rpm --noscripts>. =item B<--skip> I<pattern,...> @@ -303,12 +303,11 @@ If multiple packages match the given substring, install them all. =item B<-p> -Allow search in provides to find package (default). +Allow search in provides to find the package (this is the default). =item B<-P> -Do not search in provides to find package (this -is the opposite of B<-p>). +Do not search in provides to find package (this is the opposite of B<-p>). =item B<-y> diff --git a/pod/urpmi.addmedia.8.pod b/pod/urpmi.addmedia.8.pod index 856fa820..45fc3d3d 100644 --- a/pod/urpmi.addmedia.8.pod +++ b/pod/urpmi.addmedia.8.pod @@ -65,7 +65,7 @@ is the location of the media directory on your machine (e.g. C<media/main>). removable device is mounted. This works for removable drives, but also for ISO images mounted on a loop device. urpmi will then be able to re-mount the ISO image to the specified path (but the ISO image must be mounted -when you run B<urpmi.addmedia>). +when you run C<urpmi.addmedia>). =back @@ -105,13 +105,13 @@ Use specified HTTP proxy. =item B<--proxy-user> I<user:password> Use specified user and password to use for proxy authentication. -Specifying B<--proxy-user=ask> will cause B<urpmi.addmedia> to prompt for a +Specifying B<--proxy-user=ask> will cause C<urpmi.addmedia> to prompt for a username and a password. =item B<--update> Add a medium which will be taken into -account by B<MandrivaUpdate> or by B<urpmi --update> when looking for updates. +account by B<MandrivaUpdate> or by C<urpmi --update> when looking for updates. =item B<--probe-synthesis> @@ -128,13 +128,13 @@ Do not try to find any synthesis or hdlist file. So, if you use a network media (http, ftp, etc.), specifying the location of a synthesis or hdlist with B<with...> is mandatory. -On the other hand, if you use a local media B<urpmi.addmedia> will extract +On the other hand, if you use a local media C<urpmi.addmedia> will extract all RPM headers and construct an hdlist by itself. =item B<--distrib> Retrieve a set of media from a distribution. Typically, the URL provided -to B<urpmi.addmedia> will represent the parent directory of a directory +to C<urpmi.addmedia> will represent the parent directory of a directory B<media>, which in turn will contain various subdirectories for each medium of the distribution. <I<name>> is combined with medium names found to create newer medium names in the urpmi database. The B<with ...> @@ -158,7 +158,7 @@ of the distribution told by the installed mandriva-release package. Creates a virtual medium. This only works for C<file://> and C<removable://> protocols, and no files will be created in F</var/lib/urpmi>. The medium is always up-to-date and so it does not need -to be updated by B<urpmi.update>. +to be updated by C<urpmi.update>. =item B<--norebuild> @@ -169,7 +169,7 @@ if the original hdlist wasn't readable or was corrupted. Add the new media in the urpmi configuration file, but don't update it nor proceed to any -download. The media, to be usable, will need to be updated with B<urpmi.update>. +download. The media, to be usable, will need to be updated with C<urpmi.update>. =item B<--nopubkey> diff --git a/pod/urpmi.files.5.pod b/pod/urpmi.files.5.pod index 86827b3b..af1ad7d5 100644 --- a/pod/urpmi.files.5.pod +++ b/pod/urpmi.files.5.pod @@ -22,7 +22,7 @@ packages. That's why it's not world-readable. =item I<< /var/lib/urpmi/hdlist.<media_name>.cz >> Contains information about all known packages; it's a summary of rpm -headers. If an hdlist file is used for a medium, B<urpmf> can operate +headers. If an hdlist file is used for a medium, C<urpmf> can operate completely without accessing this medium (this is almost always the case). =item I<< /var/lib/urpmi/synthesis.hdlist.<media_name>.cz >> diff --git a/pod/urpmi.removemedia.8.pod b/pod/urpmi.removemedia.8.pod index 8d44cfb2..e01ed424 100644 --- a/pod/urpmi.removemedia.8.pod +++ b/pod/urpmi.removemedia.8.pod @@ -8,9 +8,9 @@ urpmi.removemedia - remove a rpm media from the known media of urpmi =head1 DESCRIPTION -B<urpmi.removemedia> removes from all configuration files all references +urpmi.removemedia removes from all configuration files all references to the named media and to rpms from that media. <I<names>> is a list of -names you first told to B<urpmi.addmedia>. +names you first told to urpmi.addmedia. =head1 OPTIONS diff --git a/pod/urpmq.8.pod b/pod/urpmq.8.pod index 2ae909ab..ae7d8526 100644 --- a/pod/urpmq.8.pod +++ b/pod/urpmq.8.pod @@ -40,7 +40,7 @@ List available media and their URLs. =item B<--list-nodes> -List available nodes when using B<--parallel>. +List available nodes for parallel installation (when using B<--parallel>). =item B<--list-aliases> @@ -48,9 +48,8 @@ List available parallel aliases. =item B<--update> -Use only update -media. This means that urpmq will search and resolve dependencies only in -media marked as containing updates. +Use only update media. This means that urpmq will search and resolve +dependencies only in media marked as containing updates. =item B<--media> I<media1,...,mediaN> @@ -78,9 +77,8 @@ searching packages and resolving dependencies. =item B<--auto-select> -Automatically select all packages that have to be -upgraded, according to already installed packages and packages listed in -various registered media. +Select all packages that can be upgraded, according to already installed +packages and packages listed in various registered media. =item B<--keep> @@ -158,7 +156,7 @@ and a password. =item B<--use-distrib> I<directory> -Configure urpmq on the fly from a distrib tree. You must be root to use +Configure urpmq on the fly from a distribution tree. You must be root to use this option. =item B<--env> I<directory> |