diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2006-11-20 14:09:27 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2006-11-20 14:09:27 +0000 |
commit | 5600492dcd56bbf8c43bc7c2696e935d3791b111 (patch) | |
tree | b87aa2fcc6b16ae8a92dccb52cdf1f9c353abafa | |
parent | 3682ad3fd865ae0ec8543e37753fb73c73dbe2e0 (diff) | |
download | urpmi-5600492dcd56bbf8c43bc7c2696e935d3791b111.tar urpmi-5600492dcd56bbf8c43bc7c2696e935d3791b111.tar.gz urpmi-5600492dcd56bbf8c43bc7c2696e935d3791b111.tar.bz2 urpmi-5600492dcd56bbf8c43bc7c2696e935d3791b111.tar.xz urpmi-5600492dcd56bbf8c43bc7c2696e935d3791b111.zip |
update AUTHOR in pod files
-rw-r--r-- | pod/proxy.cfg.5.pod | 19 | ||||
-rw-r--r-- | pod/urpme.8.pod | 4 | ||||
-rw-r--r-- | pod/urpmf.8.pod | 9 | ||||
-rw-r--r-- | pod/urpmi.8.pod | 9 | ||||
-rw-r--r-- | pod/urpmi.addmedia.8.pod | 11 | ||||
-rw-r--r-- | pod/urpmi.cfg.5.pod | 34 | ||||
-rw-r--r-- | pod/urpmi.removemedia.8.pod | 4 | ||||
-rw-r--r-- | pod/urpmi.update.8.pod | 9 | ||||
-rw-r--r-- | pod/urpmq.8.pod | 4 |
9 files changed, 60 insertions, 43 deletions
diff --git a/pod/proxy.cfg.5.pod b/pod/proxy.cfg.5.pod index 1858ed06..1d3bddb7 100644 --- a/pod/proxy.cfg.5.pod +++ b/pod/proxy.cfg.5.pod @@ -6,23 +6,30 @@ proxy.cfg - urpmi proxy configuration file format. The proxy.cfg file contains lines of the form - [media:]http_proxy=[value] - [media:]ftp_proxy=[value] - [media:]proxy_user=[value] + [media:]http_proxy=[value] + [media:]ftp_proxy=[value] + [media:]proxy_user=[value] where the media part is optional (in this case, the line applies to all media). ftp_proxy and http_proxy values have the same syntax as the usual environment variables used by many programs such as curl(1): - [protocol://]<host>[:port] + [protocol://]<host>[:port] C<proxy_user> values are simply a user name, or a user name and a password separated by a colon (C<:>). +Alternatively, instead of C<proxy_user>, you can write: + + [protocol://]proxy_user_ask + +In this case, urpmi and other tools will prompt for proxy credentials +(like with the urpmi command-line option B<--proxy-user=ask>). + =head1 AUTHOR -FranE<ccedil>ois Pons, Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> -(current maintainer) +FranE<ccedil>ois Pons, Rafael Garcia-Suarez <rgarciasuarez@mandriva.com>, +Pascal Rigaux <pixel@mandriva.com> (current maintainer) =head1 SEE ALSO diff --git a/pod/urpme.8.pod b/pod/urpme.8.pod index 559a4cbb..5b46ae2f 100644 --- a/pod/urpme.8.pod +++ b/pod/urpme.8.pod @@ -105,8 +105,8 @@ Removal of packages failed. =head1 AUTHORS -Pascal Rigaux, Francois Pons, Rafael Garcia-Suarez -<rgarciasuarez@mandriva.com> (current maintainer) +Pascal Rigaux <pixel@mandriva.com> (current maintainer), +Francois Pons, Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> =head1 SEE ALSO diff --git a/pod/urpmf.8.pod b/pod/urpmf.8.pod index 06b2aa6f..d13a46dd 100644 --- a/pod/urpmf.8.pod +++ b/pod/urpmf.8.pod @@ -14,7 +14,10 @@ file whose name or path was specified as an argument on the command-line. 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 urpmf searches through the urpmi media (B<not> in +rpm tags. The default behaviour corresponds to the B<--files> option; +using other options makes urpmf search through other tags' contents. + +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 @@ -258,5 +261,5 @@ urpmq(8), urpmi.files(5). =head1 AUTHOR -Pascal Rigaux (original author), FranE<ccedil>ois Pons, Rafael -Garcia-Suarez <rgarciasuarez@mandriva.com> (current maintainer) +Pascal Rigaux <pixel@mandriva.com> (original author and current maintainer), +FranE<ccedil>ois Pons, Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> diff --git a/pod/urpmi.8.pod b/pod/urpmi.8.pod index 8154f9cd..e06e04b5 100644 --- a/pod/urpmi.8.pod +++ b/pod/urpmi.8.pod @@ -338,11 +338,6 @@ When several packages are found, propose more choices than the default. Don't lock urpmi and rpm db. This can be useful in conjunction with B<--root>. -=item B<--norebuild> - -Don't try to rebuild the hdlist files from the RPMs if the original hdlist -wasn't readable or was corrupted. - =item B<--strict-arch> Upgrade only packages if the newer version has the same architecture as @@ -478,8 +473,8 @@ think is wrong. =head1 AUTHOR -Pascal Rigaux (original author), FranE<ccedil>ois Pons, -Rafael Garcia-Suarez, <rgarciasuarez@mandriva.com> (current maintainer) +Pascal Rigaux <pixel@mandriva.com> (original author and current maintainer), +FranE<ccedil>ois Pons, Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> =head1 SEE ALSO diff --git a/pod/urpmi.addmedia.8.pod b/pod/urpmi.addmedia.8.pod index 3173adf6..2cdf83ae 100644 --- a/pod/urpmi.addmedia.8.pod +++ b/pod/urpmi.addmedia.8.pod @@ -173,13 +173,6 @@ 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 C<urpmi.update>. -=item B<--norebuild> - -Don't try to rebuild the hdlist files from the RPMs if the original hdlist -wasn't readable or was corrupted (which is the default behaviour). For non -local media, rebuilding the hdlists can be very time- and -bandwidth-consuming. - =item B<--raw> Add the new media in the urpmi configuration file, but don't update it nor @@ -229,5 +222,5 @@ urpmi(8), urpmi.update(8), urpmi.removemedia(8), urpmf(8), urpmq(8), urpmi.files =head1 Author -Pascal Rigaux (original author), FranE<ccedil>ois Pons, Rafael -Garcia-Suarez, <rgarciasuarez@mandriva.com> (current maintainer) +Pascal Rigaux <pixel@mandriva.com> (original author and current maintainer), +FranE<ccedil>ois Pons, Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> diff --git a/pod/urpmi.cfg.5.pod b/pod/urpmi.cfg.5.pod index 972e3cfe..5cee8b26 100644 --- a/pod/urpmi.cfg.5.pod +++ b/pod/urpmi.cfg.5.pod @@ -29,6 +29,14 @@ Same as specifying B<--allow-force> for urpmi. Disabled by default. Same as specifying B<--allow-nodeps> for urpmi. Disabled by default. +=item B<auto> + +Same as specifying B<--auto> for urpmi. Disabled by default. + +=item B<compress> + +Deprecated (use rsync-options) + =item B<curl-options> Additional options to pass to B<curl>'s command line when downloading files. @@ -59,6 +67,10 @@ 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>. +=item B<keep> + +Same as B<--keep> for urpmi or urpmq. + =item B<key-ids> This option is not available on the command line. It allows to use a comma @@ -84,25 +96,37 @@ Don't import pubkeys when updating media. =item B<norebuild> -Same as B<--norebuild> for urpmi, urpmi.update and urpmi.addmedia. -Disabled by default (meaning that urpmi will try to rebuild hdlists by -default). +Obsolete. Enabled by default. =item B<pre-clean, post-clean, clean> Control cache management for urpmi, default is only activated as B<post-clean>. +=item B<priority-upgrade> + +A comma-separated list of package names that must be installed first, +and that trigger an urpmi restart. + =item B<prohibit-remove> A comma-separated list of package names that must never be removed (just like B<basesystem> dependencies). +=item B<prozilla-options> + +Same as B<--prozilla-options> for urpmi, urpmq or urpmi.addmedia. +Additional options to pass to B<prozilla> when downloading files. + =item B<repackage> Same as specifying B<--repackage> for urpmi. Disabled by default. Ignored when it's set globally by urpmi.recover. +=item B<resume> + +Same as specifying B<--resume> for urpmi. Resume transfer of partially-downloaded files. + =item B<retry> Specify how many times the downloader should retry in case of non-permanent @@ -190,8 +214,8 @@ invalid. =head1 AUTHOR -Pascal Rigaux (original author), FranE<ccedil>ois Pons, Rafael -Garcia-Suarez, <rgarciasuarez@mandriva.com> (current maintainer) +Pascal Rigaux <pixel@mandriva.com> (original author and current maintainer), +FranE<ccedil>ois Pons, Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> =head1 SEE ALSO diff --git a/pod/urpmi.removemedia.8.pod b/pod/urpmi.removemedia.8.pod index e01ed424..a14bad9a 100644 --- a/pod/urpmi.removemedia.8.pod +++ b/pod/urpmi.removemedia.8.pod @@ -44,5 +44,5 @@ urpmi(8), urpmi.addmedia(8), urpmi.update(8). =head1 AUTHOR -Pascal Rigaux (original author), FranE<ccedil>ois Pons, -Rafael Garcia-Suarez, <rgarciasuarez@mandriva.com> (current maintainer) +Pascal Rigaux <pixel@mandriva.com> (original author and current maintainer), +FranE<ccedil>ois Pons, Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> diff --git a/pod/urpmi.update.8.pod b/pod/urpmi.update.8.pod index 45a2ef30..49d4183c 100644 --- a/pod/urpmi.update.8.pod +++ b/pod/urpmi.update.8.pod @@ -33,11 +33,6 @@ option is not active by default. Disable MD5SUM file checking. -=item B<--norebuild> - -Don't try to rebuild the hdlist files from the RPMs if the original hdlist -wasn't readable or was corrupted. - =item B<--proxy> I<proxyhost[:port|1080]> Use specified HTTP proxy. @@ -102,5 +97,5 @@ urpmi(8), urpmi.addmedia(8), urpmi.removemedia(8). =head1 AUTHOR -Pascal Rigaux (original author), FranE<ccedil>ois Pons, -Rafael Garcia-Suarez, <rgarciasuarez@mandriva.com> (current maintainer) +Pascal Rigaux <pixel@mandriva.com> (original author and current maintainer), +FranE<ccedil>ois Pons, Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> diff --git a/pod/urpmq.8.pod b/pod/urpmq.8.pod index eaf36a91..f7881dd9 100644 --- a/pod/urpmq.8.pod +++ b/pod/urpmq.8.pod @@ -273,5 +273,5 @@ urpmi(8), urpmi.files(5). =head1 AUTHOR -Pascal Rigaux (original author), FranE<ccedil>ois Pons, -Rafael Garcia-Suarez, <rgarciasuarez@mandriva.com> (current maintainer) +Pascal Rigaux <pixel@mandriva.com> (original author and current maintainer), +FranE<ccedil>ois Pons, Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> |