deprecate [with <relative path of synthesis|hdlist>]: don't document it anymore

3 files changed, 20 insertions, 37 deletions

diff --git a/pod/urpmi.addmedia.8.pod b/pod/urpmi.addmedia.8.pod
index 5ecf4c3c..fbde6d01 100644
--- a/pod/urpmi.addmedia.8.pod
+++ b/pod/urpmi.addmedia.8.pod
@@ -4,7 +4,7 @@ urpmi.addmedia - adds a new rpm media to be used by urpmi
 
 =head1 SYNOPSIS
 
-    urpmi.addmedia [options] <name> <url> [with <hdlist>]
+    urpmi.addmedia [options] <name> <url>
 
 =head1 DESCRIPTION
 
@@ -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>>
 
 where <I<name>> is a human-readable name for the new media (e.g.
 "updates"). <I<name>> is optional if B<--distrib> is given in the options
@@ -27,9 +27,9 @@ where to find the hdlist of the rpms. The location is given relative to
 used if B<curl> is not installed or if or B<--wget> is given in
 I<options>. Example:
 
-    urpmi.addmedia http http://jpackage.sf.net/rpm/free with hdlist.cz ftp:
+    urpmi.addmedia http http://jpackage.sf.net/rpm/free
 
-=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>>
 
 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
@@ -37,9 +37,9 @@ servers). If B<wget> is used to download files with a firewall you may
 have to ensure that the B<passive_ftp> option is on in B</etc/wgetrc>
 (that's usually the default). Example:
 
-    urpmi.addmedia ftp ftp://a:a@leia//export/media/main with media_info/hdlist.cz
+    urpmi.addmedia ftp ftp://a:a@leia//export/media/main
 
-=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>>
 
 The same as for http and ftp; add your login and password if required. You
 may want to export the public key in order not to have to type your
@@ -50,19 +50,19 @@ 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>>
 
 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
 
-=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>>
 
 where <I<name>> is a human-readable name for the new media (e.g.
 "local updates"). <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>>
 
 <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
@@ -120,21 +120,11 @@ C<urpmi --update> when looking for updates.
 
 =item B<--probe-synthesis>
 
-Try to find and use synthesis file if B<with ...> is not given.
+Use synthesis file.
 
 =item B<--probe-hdlist>
 
-Try to find and use hdlist file if B<with ...> is not given.
-
-=item B<--no-probe>
-
-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 C<urpmi.addmedia> will extract
-all RPM headers and construct an hdlist by itself.
+Use hdlist file.
 
 =item B<--distrib>
 
@@ -142,9 +132,7 @@ Retrieve a set of media from a distribution. Typically, the URL provided
 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 ...>
-option, is not necessary, as media.cfg or hdlists found on the installation
-medium are used instead automatically.
+to create newer medium names in the urpmi database.
 
 =item B<--interactive>
 
diff --git a/pod/urpmihowto.8.pod b/pod/urpmihowto.8.pod
index 992188a1..60255c9e 100644
--- a/pod/urpmihowto.8.pod
+++ b/pod/urpmihowto.8.pod
@@ -102,12 +102,10 @@ networked mirror, and so on. But you might want to add media yourself.
 For that, you should use the urpmi.addmedia program. Its usage is as
 follows:
 
-    urpmi.addmedia [options] <name> <url> [with <hdlist>]
+    urpmi.addmedia [options] <name> <url>
 
 In this synopsis, C<< <name> >> is the name of the new media,
-C<< <url> >> the URL where the RPMs are to be found, and the C<with>
-parameter optionnally specifies where to find the information file that
-describes the media's contents.
+C<< <url> >> the URL where the RPMs are to be found.
 
 Supported URLs can be C<http://>, C<ftp://>, C<rsync://>, C<ssh://> (this
 will use rsync over ssh), C<file://>, and C<removable://> (C<removable://>
diff --git a/urpmi.addmedia b/urpmi.addmedia
index 20647d0e..3db52574 100755
--- a/urpmi.addmedia
+++ b/urpmi.addmedia
@@ -32,13 +32,13 @@ sub usage {
 # Translator: and 'removable:' must not be translated!
 # Translator: neither the ``with''.
 # Translator: only what is between <brackets> can be translated.
-    my $usage = N("usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]
+    my $usage = N("usage: urpmi.addmedia [options] <name> <url>
 where <url> is one of
-       [file:/]/<path> with <relative filename of hdlist>
-       ftp://<login>:<password>\@<host>/<path> with <relative filename of hdlist>
-       ftp://<host>/<path> with <relative filename of hdlist>
-       http://<host>/<path> with <relative filename of hdlist>
-       removable://<path> with <relative filename of hdlist>
+       [file:/]/<path>
+       ftp://<login>:<password>\@<host>/<path>
+       ftp://<host>/<path>
+       http://<host>/<path>
+       removable://<path>
 
 and [options] are from
 ") . N("  --help         - print this help message.
@@ -64,7 +64,6 @@ and [options] are from
 ", $urpm::cfg::mirrors) . N("  --virtual      - create virtual media wich are always up-to-date,
                    only file:// protocol is allowed.
 ") . N("  --no-md5sum    - disable MD5SUM file checking.
-") . N("  --norebuild    - don't try to rebuild hdlist if not readable.
 ") . N("  --nopubkey     - don't import pubkey of added media
 ") . N("  --raw          - add the media in config, but don't update it.
 ") . N("  -c             - clean headers cache directory.
@@ -124,7 +123,6 @@ if (!-e $urpm->{config}) {
     open my $_f, '>', $urpm->{config} or $urpm->{fatal}(6, N("Can't create config file [%s]", $urpm->{config}));
 }
 $urpm->read_config;
-exists $options{limit_rate} or $options{limit_rate} = $urpm->{options}{'limit-rate'};
 
 if ($options{distrib}) {
     $with || $relative_hdlist
@@ -174,7 +172,6 @@ if ($options{distrib}) {
 	$name, $url, $relative_hdlist,
 	virtual => $options{virtual},
 	update => $options{update},
-	no_reload_config => $options{raw},
 	ignore => $options{raw},
 	nolock => $options{nolock},
     );