5 files changed, 114 insertions, 130 deletions
diff --git a/man/C/urpmi.8 b/man/C/urpmi.8
index d9bb9326..c91a7f45 100644
--- a/man/C/urpmi.8
+++ b/man/C/urpmi.8
@@ -1,18 +1,17 @@
-.TH urpmi 8 "05 Jul 2001" "MandrakeSoft" "Mandrake Linux"
+.TH urpmi 8 "12 Feb 2002" "MandrakeSoft" "Mandrake Linux"
 .IX urpmi
 .SH NAME
 urpmi \- rpm wrapper making installs easier for the user
 .SH SYNOPSIS
 .B urpmi [\fIoptions\fP] [\fIpackage_names\fP | \fIrpm_files...\fP]
 .SH DESCRIPTION
-urpmi enables non-superuser install of rpms. In fact, it only authorizes
-well-known rpms to be installed. If you want to install local rpm file, you
-will have to be root.
+urpmi authorizes well-known rpms (or rpm files) to be installed including
+all their dependencies.
+You can use it to install source package dependencies too as root, or source
+package itself as simple user.
 
 You can compare rpm vs. urpmi  with  insmod vs. modprobe or dpkg vs apt-get
 .PP
-All users belonging to group urpmi are allowed to install packages.
-.br
 Just launch urpmi followed by what you think is the name of the package(s),
 and urpmi will:
 .br
@@ -43,17 +42,39 @@ To install all available menu entries of all known packages,
 use autoirpm-icons.
 .SH OPTIONS
 .IP "\fB\--help\fP"
-print an help message and exit.
+print an help message and exit (this is the same as \fB-h\fP or \fB-?\fP).
 .IP "\fB\--update\fP"
 use only update media. This means \fBurpmi\fP will search and resolve
 dependencies only in media marked as update.
+.IP "\fB\--media\fP"
+select specific media to use instead of all media available (or update media is
+\fB--updtae\fP is used).
 .IP "\fB\--auto\fP"
 installs all required dependencies without asking.
 .IP "\fB\--auto-select\fP"
 automatically select all packages that have to be upgraded according to already
 installed packages and packages listed in various media registered.
+.IP "\fB\--fuzzy\fP"
+disable fast search on exact package name, ie it will propose all
+package containing the name even if one has the given name (this is the same
+as \fB\-y\fP).
+.IP "\fB\--src\fP"
+next package name is a source package and it will select all dependencies if
+\fBurpmi\fP is run as root or only install source package as simple user (this
+is the same as \fB\-s\fP).
+.IP "\fB\--noclean\fP"
+do not remove any package from the cache (/var/cache/urpmi/rpms).
+.IP "\fB\--complete\fP"
+use parsehdlist server to complete \fB--auto-select\fP selection (should not be
+necessary in most cases).
 .IP "\fB\--force\fP"
 assumes yes on all questions.
+.IP "\fB\--wget\fP"
+use wget only for downloading distant files. By default curl is used if
+available or wget instead.
+.IP "\fB\--curl\fP"
+use curl only for downloading distant files. By default curl is used if
+available or wget instead.
 .IP "\fB\--X\fP"
 use X interface.
 .IP "\fB\--best-output\fP"
@@ -61,25 +82,20 @@ try to use X interface or if not available the standard text interface (using
 rpm).
 .IP "\fB\-a\fP"
 if multiple packages match the substring given, take them all
-.IP "\fB\-m\fP"
-choose minimun closure of requires (this is the default). This is a relatively
-slow algorithm that tries to minimize the number of package to upgrade
-to only what is really necessary.
-.IP "\fB\-M\fP"
-choose maximal closure of requires. This is the fastest algorithms that try to
-upgrade all requires if they can be upgraded.
-.IP "\fB\-c\fP"
-if maximal closure is used, assume that a package listed mey have wrong or not
-up-to-date dependancies. This cause more package to be upgraded and may correct
-unresolved dependancies on the rpm database.
 .IP "\fB\-p\fP"
-allow search in provides to find package.
+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"
+this is the same as \fB--fuzzy\fP.
+.IP "\fB\-s\fP"
+this is the same as \fB--src\fP.
 .IP "\fB\-q\fP"
 proposes a quiet mode when calling rpm where no upgrade status are printed.
 .IP "\fB\-v\fP"
 proposes a verbose mode with various messages.
 .SH FILES
-/usr/bin/urpmi
+/usr/sbin/urpmi
 .br
 The \fBurpmi\fP executable (perl script)
 .PP
@@ -90,14 +106,14 @@ There is one filelist per media(*).
 .PP
 /var/lib/urpmi/hdlist.*
 .br
-Contain information about all known packages, it's a summary of rpm headers.
+Contains information about all known packages, it's a summary of rpm headers.
 There is one hdlist per media(*).
 .PP
 /var/lib/urpmi/synthesis.hdlist.*
 .br
-Contain synthesis information about all known packages built from hdlist files
+Contains synthesis information about all known packages built from hdlist files
 that can be used by minimal closure algorithm. If these files are not present
-use \fBurpmi.update -a\fP to generate them. These files are not mandatory.
+use \fBurpmi.update -a\fP to generate them.
 .PP
 /etc/urpmi/urpmi.cfg
 .br
@@ -107,19 +123,9 @@ Contains media description, previous format from older urpmi is accepted.
 .br
 Contains package names that should be not automatically updated.
 .PP
-/var/lib/urpmi/depslist.ordered
-.br
-A simple text file containning all dependencies of all known packages.
-.PP
-/var/lib/urpmi/provides
-.br
-A simple text file containning all provides and the list of associated
-packages that contains them.
-.PP
-/var/lib/urpmi/compss
+/etc/urpmi/inst.list
 .br
-A simple text file containning for each Group used the list of package in
-this group.
+Contains package names that should be installed instead of updated.
 .SH "SEE ALSO"
 urpmi.addmedia(8),
 urpmi.update(8),
diff --git a/man/C/urpmi.addmedia.8 b/man/C/urpmi.addmedia.8
index 57e6de26..44cdd0b5 100644
--- a/man/C/urpmi.addmedia.8
+++ b/man/C/urpmi.addmedia.8
@@ -1,4 +1,4 @@
-.TH urpmi.addmedia 8 "05 Jul 2001" "MandrakeSoft" "Mandrake Linux"
+.TH urpmi.addmedia 8 "12 Feb 2001" "MandrakeSoft" "Mandrake Linux"
 .IX urpmi.addmedia
 .SH NAME
 urpmi.addmedia \- adds a new rpms media for use with urpmi
@@ -9,28 +9,28 @@ urpmi.addmedia tells urpmi that he can find new rpms at the specified
 location. Currently supported medias are: local drives, removable drives
 (such as cd's), http and ftp.
 .PP
-All users belonging to group urpmi are allowed to add a new media.
-.PP
 One of the following modes must be choosen:
 .PP
 http:
 .br
-.IP "\fB    urpmi.addmedia <\fIname\fP> http://<\fIhost\fP>/<\fIpath\fP> with <\fIrelative path of hdlist\fP>\fP"
+.IP "\fB urpmi.addmedia [\fIoptions\fP] <\fIname\fP> http://<\fIhost\fP>/<\fIpath\fP> [with <\fIrelative path of synthesis|hdlist\fP>]\fP"
 Where <\fIname\fP> is your reference for the media (e.g. MandrakeUpdate).
+<\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.
 .br
 <\fIrelative path of hdlist\fP> is the pathname where to find the hdlist of
 the rpms. The location is given relative to <\fIpath\fP>.
 .br
-Note that \fBwget\fP is used to download files, you may add specific options to
-\fBwget\fP by editing \fB/etc/wgetrc\fP file. Please refer to \fBwget\fP
-documentation for more information.
-.IP "\fB    urpmi.addmedia <\fIname\fP> ftp://<\fIlogin\fP>:<\fIuser\fP>@<\fIhost\fP>/<\fIpath\fP> with <\fIrelative path of hdlist\fP>\fP"
+\fBcurl\fP is used by default to download files, \fBwget\fP may be used if
+\fBcurl\fP is not installed or \fB--curl\fP is given in \fIoptions\fP.
+.PP
+ftp:
+.IP "\fB urpmi.addmedia [\fIoptions\fP] <\fIname\fP> ftp://<\fIlogin\fP>:<\fIuser\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).
 .br
-Note that \fBwget\fP is used to download files, so if a firewall is used you may
+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. 
 .nf
 eg: urpmi.addmedia ftp ftp://a:a@leia//export/Mandrake/RPMS with ../base/hdlist
@@ -38,28 +38,36 @@ eg: urpmi.addmedia ftp ftp://a:a@leia//export/Mandrake/RPMS with ../base/hdlist
 .PP
 Local drive or NFS:
 .br
-.IP "\fB    urpmi.addmedia <\fIname\fP> file://<\fIpath\fP>\fP with <\fIrelative path of hdlist\fP>\fP"
+.IP "\fB urpmi.addmedia [\fIoptions\fP] <\fIname\fP> file://<\fIpath\fP>\fP [with <\fIrelative path of hdlist\fP>]\fP"
 Where <\fIname\fP> is your reference for the media (e.g. Myrpms).
 .br
 <\fIpath\fP> is the location of the rpm directory on your machine.
 .PP
 Removable device:
 .br
-.IP "\fB    urpmi.addmedia removable_<\fIdevice\fP>://<\fIpath\fP>\fP with <\fIrelative path of hdlist\fP>\fP"
-<\fIdevice\fP> is the name of your media as specified in the /dev/ directory
-(e.g. cdrom, floppy, zip, ...).
-.br
-<\fIpath\fP> is the location of the rpm directory on your machine when media
-is mounted.
+.IP "\fB urpmi.addmedia [\fIoptions\fP] <\fIname\fP> removable://<\fIpath\fP>\fP [with <\fIrelative path of hdlist\fP>]\fP"
+<\fIpath\fP> is the location of the rpm directory on your machine when the
+removable device is mounted.
 .PP
 .SH OPTIONS
+.IP "\fB\--wget\fP"
+use wget only for downloading distant files. By default curl is used if
+available or wget instead.
+.IP "\fB\--curl\fP"
+use curl only for downloading distant files. By default curl is used if
+available or wget instead.
 .IP "\fB\--update\fP"
 add a medium which will be taken into account when updating only update media by
 \fBurpmi\fP.
+.IP "\fB\--distrib\fP"
+add all media from an installation medium. <\fIname\fP> if used is used with
+medium name found to create newer medium name in urpmi database. The \fBwith
+[...]\fP is not used as hdlist found on installation medium are used
+automatically.
 .SH FILES
-/usr/bin/urpmi
+/usr/sbin/urpmi.addmedia
 .br
-The \fBurpmi\fP executable (perl script)
+The \fBurpmi.addmedia\fP executable (perl script)
 .PP
 /var/lib/urpmi/list.*
 .br
@@ -85,19 +93,9 @@ Contains media description, previous format from older urpmi is accepted.
 .br
 Contains package names that should be not automatically updated.
 .PP
-/var/lib/urpmi/depslist.ordered
-.br
-A simple text file containing all dependencies of all known packages.
-.PP
-/var/lib/urpmi/provides
-.br
-A simple text file containning all provides and the list of associated
-packages that contains them.
-.PP
-/var/lib/urpmi/compss
+/etc/urpmi/inst.list
 .br
-A simple text file containning for each Group used the list of package in
-this group.
+Contains package names that should be installed instead of updated.
 .SH "SEE ALSO"
 urpmi(8),
 urpmi.update(8),
diff --git a/man/C/urpmi.removemedia.8 b/man/C/urpmi.removemedia.8
index 6b348f44..3ff7a239 100644
--- a/man/C/urpmi.removemedia.8
+++ b/man/C/urpmi.removemedia.8
@@ -1,4 +1,4 @@
-.TH urpmi.removemedia 8 "05 Jul 2001" "MandrakeSoft" "Mandrake Linux"
+.TH urpmi.removemedia 8 "12 Feb 2001" "MandrakeSoft" "Mandrake Linux"
 .IX urpmi.removemedia
 .SH NAME
 urpmi.removemedia \- remove a rpms media from the known medias of urpmi
@@ -13,10 +13,12 @@ the named media and to rpms from that media.
 .SH OPTIONS
 .IP "\fB\-a\fP"
 Select all media to remove them.
+.IP "\fB\-c\fP"
+Clean headers cache directory (/var/cache/urpmi/headers).
 .SH FILES
-/usr/bin/urpmi
+/usr/sbin/urpmi.removemedia
 .br
-The \fBurpmi\fP executable (perl script)
+The \fBurpmi.removemedia\fP executable (perl script)
 .PP
 /var/lib/urpmi/list.*
 .br
@@ -36,19 +38,9 @@ Contains media description, previous format from older urpmi is accepted.
 .br
 Contains package names that should be not automatically updated.
 .PP
-/var/lib/urpmi/depslist.ordered
+/etc/urpmi/inst.list
 .br
-A simple text file containing all dependencies of all known packages.
-.PP
-/var/lib/urpmi/provides
-.br
-A simple text file containning all provides and the list of associated
-packages that contains them.
-.PP
-/var/lib/urpmi/compss
-.br
-A simple text file containning for each Group used the list of package in
-this group.
+Contains package names that should be installed instead of updated.
 .SH "SEE ALSO"
 urpmi(8),
 urpmi.addmedia(8),
diff --git a/man/C/urpmi.update.8 b/man/C/urpmi.update.8
index ef28a86f..26b9916b 100644
--- a/man/C/urpmi.update.8
+++ b/man/C/urpmi.update.8
@@ -1,4 +1,4 @@
-.TH urpmi.update 8 "05 Jul 2001" "MandrakeSoft" "Mandrake Linux"
+.TH urpmi.update 8 "12 Feb 2001" "MandrakeSoft" "Mandrake Linux"
 .IX urpmi.update
 .SH NAME
 urpmi.update \- Updates packages list for specified medias
@@ -11,17 +11,25 @@ Usefull for ftp location for example.
 <\fInames\fP> is a list of name you first told to urpmi.addmedia
 
 .SH OPTIONS
+.IP "\fB\--wget\fP"
+use wget only for downloading distant files. By default curl is used if
+available or wget instead.
+.IP "\fB\--curl\fP"
+use curl only for downloading distant files. By default curl is used if
+available or wget instead.
 .IP "\fB\-a\fP"
 Select all media that are not using a removable device to update them.
 .IP "\fB\-c\fP"
 Clean /var/cache/urpmi/headers directory on exit.
+.IP "\fB\-d\fP"
+Force complete computation of (not used anymore) /var/lib/urpmi/depslist.ordered file.
 .IP "\fB\-f\fP"
 Force rebuild of hdlist files or base files (/var/lib/urpmi/depslist.ordered,
 /var/lib/urpmi/provides and /var/lib/urpmi/compss).
 .SH FILES
-/usr/bin/urpmi
+/usr/sbin/urpmi.update
 .br
-The \fBurpmi\fP executable (perl script)
+The \fBurpmi.update\fP executable (perl script)
 .PP
 /var/lib/urpmi/list.*
 .br
@@ -47,19 +55,9 @@ Contains media description, previous format from older urpmi is accepted.
 .br
 Contains package names that should be not automatically updated.
 .PP
-/var/lib/urpmi/depslist.ordered
+/etc/urpmi/inst.list
 .br
-A simple text file containing all dependencies of all known packages.
-.PP
-/var/lib/urpmi/provides
-.br
-A simple text file containning all provides and the list of associated
-packages that contains them.
-.PP
-/var/lib/urpmi/compss
-.br
-A simple text file containning for each Group used the list of package in
-this group.
+Contains package names that should be installed instead of updated.
 .SH "SEE ALSO"
 urpmi(8),
 urpmi.addmedia(8),
diff --git a/man/C/urpmq.8 b/man/C/urpmq.8
index b347f2e9..6dae76bb 100644
--- a/man/C/urpmq.8
+++ b/man/C/urpmq.8
@@ -1,4 +1,4 @@
-.TH urpmq 8 "05 Jul 2001" "MandrakeSoft" "Mandrake Linux"
+.TH urpmq 8 "12 Feb 2001" "MandrakeSoft" "Mandrake Linux"
 .IX urpmq
 .SH NAME
 urpmq \- urpmi database query tool.
@@ -11,16 +11,27 @@ packages or packages that will be installed if you start urpmi.
 .PP
 Output format of urpmq is the following according to command line options:
 .IP
-[group/]package_name[-version][-release]
+[group/]package_name[-version][-release][.arch]
 .SH OPTIONS
 .IP "\fB\--help\fP"
-print an help message and exit.
+print an help message and exit (this is the same as \fB-h\fP or \fB-?\fP).
 .IP "\fB\--update\fP"
 use only update media. This means \fBurpmq\fP will search and resolve
 dependencies only in media marked as update.
+.IP "\fB\--media\fP"
+select specific media to use instead of all media available (or update media is
+\fB--updtae\fP is used).
 .IP "\fB\--auto-select\fP"
 automatically select all packages that have to be upgraded according to already
 installed packages and packages listed in various media registered.
+.IP "\fB\--fuzzy\fP"
+disable fast search on exact package name, ie it will propose all
+package containing the name even if one has the given name (this is the same
+as \fB\-y\fP).
+.IP "\fB\--src\fP"
+next package name is a source package and it will select all dependencies if
+\fBurpmi\fP is run as root or only install source package as simple user (this
+is the same as \fB\-s\fP).
 .IP "\fB\--headers\fP"
 extract headers for package selected to standard output.
 .IP "\fB\--sources\fP"
@@ -34,26 +45,24 @@ select dependancies (maximal closure).
 .IP "\fB\-u\fP"
 deselect packages if a better version is already installed, this option can be
 used with \fB-d\fP to simulate \fB-M\fP mode of \fBurpmi\fP.
-.IP "\fB\-m\fP"
-choose minimun closure of requires. This is a relatively
-slow algorithm that tries to minimize the number of package to upgrade
-to only what is really necessary.
-.IP "\fB\-M\fP"
-disable minimal closure algorithm so both \fB-d\fP and \fB-u\fP are similar to \fB-M\fP
-mode of \fBurpmi\fP.
 .IP "\fB\-c\fP"
 if maximal closure is used, assume that a package listed mey have wrong or not
 up-to-date dependancies. This cause more package to be upgraded and may correct
 unresolved dependancies on the rpm database.
 .IP "\fB\-p\fP"
-allow search in provides to find package.
+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"
+this is the same as \fB--fuzzy\fP.
+.IP "\fB\-s\fP"
+this is the same as \fB--src\fP.
 .IP "\fB\-g\fP"
 print group of each packages listed.
 .IP "\fB\-r\fP"
 print version and release of each packages listed.
-.IP "\fB\-d\fP"
-print closure of required packages needed by requested packages on command
-line.
+.IP "\fB\-f\fP"
+print version, release and arch of each packages listed.
 .SH FILES
 /usr/bin/urpmq
 .br
@@ -83,19 +92,9 @@ Contains media description, previous format from older urpmi is accepted.
 .br
 Contains package names that should be not automatically updated.
 .PP
-/var/lib/urpmi/depslist.ordered
-.br
-A simple text file containning all dependencies of all known packages.
-.PP
-/var/lib/urpmi/provides
-.br
-A simple text file containning all provides and the list of associated
-packages that contains them.
-.PP
-/var/lib/urpmi/compss
+/etc/urpmi/inst.list
 .br
-A simple text file containning for each Group used the list of package in
-this group.
+Contains package names that should be installed instead of updated.
 .SH "SEE ALSO"
 urpmi(8),
 urpmi.addmedia(8),
@@ -109,12 +108,3 @@ rpmdrake(8)
 Francois Pons, Mandrakesoft
 .br
 fpons@mandrakesoft.com
-
-
-
-
-
-
-
-
-