Replace mandrake by mandriva as appropriate

10 files changed, 39 insertions, 56 deletions

diff --git a/man/C/proxy.cfg.5 b/man/C/proxy.cfg.5
index a35cbc50..b39bb113 100644
--- a/man/C/proxy.cfg.5
+++ b/man/C/proxy.cfg.5
@@ -1,4 +1,4 @@
-.TH proxy.cfg 5 "25 Aug 2004" "Mandrakesoft" "Mandrakelinux"
+.TH proxy.cfg 5 "25 Aug 2004" "Mandriva" "Mandriva Linux"
 .IX proxy.cfg
 .SH NAME
 proxy.cfg \- urpmi proxy configuration file format.
@@ -23,9 +23,9 @@ proxy_user values are simply a user name, or a user name and a
 password separated by a colon (:).
 
 .SH AUTHOR
-Francois Pons, Mandrakesoft <fpons@mandrakesoft.com>
+Francois Pons
 .PP
-Rafael Garcia-Suarez, Mandrakesoft <rgarciasuarez@mandrakesoft.com>
+Rafael Garcia-Suarez <rgarciasuarez@mandriva.com>
 (current maintainer)
 .SH SEE ALSO
 \fIurpmi\fP(8), \fIurpmi.cfg\fP(5), \fIurpmi.files\fP(5).
diff --git a/man/C/urpme.8 b/man/C/urpme.8
index 17b7c895..41831154 100644
--- a/man/C/urpme.8
+++ b/man/C/urpme.8
@@ -1,4 +1,4 @@
-.TH urpme 8 "28 Aug 2003" "Mandrakesoft" "Mandrakelinux"
+.TH urpme 8 "28 Aug 2003" "Mandriva" "Mandriva Linux"
 .IX urpme
 .SH NAME
 urpme \- rpm wrapper making deinstalls easier for the user
@@ -38,13 +38,9 @@ See \fIurpmi.files\fP(5).
 Command line inconsistency.
 .IP 2
 Removing of packages failed.
-.SH AUTHOR
-Pascal Rigaux, Mandrakesoft <pixel@mandrakesoft.com> (original author)
-.PP
-Francois Pons, Mandrakesoft <fpons@mandrakesoft.com>
-.PP
-Rafael Garcia-Suarez, Mandrakesoft <rgarciasuarez@mandrakesoft.com>
-(current maintainer)
+.SH AUTHORS
+Pascal Rigaux, Francois Pons, Rafael Garcia-Suarez,
+<rgarciasuarez@mandriva.com> (current maintainer)
 .SH SEE ALSO
 \fIurpmi.addmedia\fP(8),
 \fIurpmi.update\fP(8),
diff --git a/man/C/urpmf.8 b/man/C/urpmf.8
index 5c2a6a94..fb4221c3 100644
--- a/man/C/urpmf.8
+++ b/man/C/urpmf.8
@@ -1,4 +1,4 @@
-.TH urpmf 8 "10 Sep 2003" "Mandrakesoft" "Mandrakelinux"
+.TH urpmf 8 "10 Sep 2003" "Mandriva" "Mandriva Linux"
 .IX urpmf
 .SH NAME
 urpmf \- RPMFind - Finds the RPM package providing specified files
@@ -100,9 +100,9 @@ See \fIurpmi.files\fP(5).
 \fIurpmq\fP(8),
 \fIurpmi.files\fP(5).
 .SH AUTHOR
-Pascal Rigaux, Mandrakesoft <pixel@mandrakesoft.com> (original author)
+Pascal Rigaux (original author)
 .PP
-Francois Pons, Mandrakesoft <fpons@mandrakesoft.com>
+Francois Pons
 .PP
-Rafael Garcia-Suarez, Mandrakesoft <rgarciasuarez@mandrakesoft.com>
+Rafael Garcia-Suarez <rgarciasuarez@mandriva.com>
 (current maintainer)
diff --git a/man/C/urpmi.8 b/man/C/urpmi.8
index acd18982..e8f1459c 100644
--- a/man/C/urpmi.8
+++ b/man/C/urpmi.8
@@ -1,4 +1,4 @@
-.TH urpmi 8 "25 Nov 2004" "Mandrakesoft" "Mandrakelinux"
+.TH urpmi 8 "25 Nov 2004" "Mandriva" "Mandriva Linux"
 .IX urpmi
 .SH NAME
 urpmi \- rpm wrapper making installs easier for the user
@@ -229,16 +229,13 @@ 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)
+and send it directly to the current maintainer (rgarciasuarez@mandriva.com)
 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
-Pascal Rigaux, Mandrakesoft <pixel@mandrakesoft.com> (original author)
-.PP
-Francois Pons, Mandrakesoft <fpons@mandrakesoft.com>
-.PP
-Rafael Garcia-Suarez, Mandrakesoft <rgarciasuarez@mandrakesoft.com>
+Pascal Rigaux (original author), Francois Pons,
+Rafael Garcia-Suarez, <rgarciasuarez@mandriva.com>
 (current maintainer)
 .SH CONTRIBUTORS
 Please mail to authors if you are not belonging to this alphabetically sorted
diff --git a/man/C/urpmi.addmedia.8 b/man/C/urpmi.addmedia.8
index 377cb820..f216dad2 100644
--- a/man/C/urpmi.addmedia.8
+++ b/man/C/urpmi.addmedia.8
@@ -1,4 +1,4 @@
-.TH urpmi.addmedia 8 "28 Aug 2003" "Mandrakesoft" "Mandrakelinux"
+.TH urpmi.addmedia 8 "28 Aug 2003" "Mandriva" "Mandriva Linux"
 .IX urpmi.addmedia
 .SH NAME
 urpmi.addmedia \- adds a new rpm medium to be used by urpmi
@@ -84,7 +84,7 @@ Use specified HTTP proxy.
 .IP "\fB\--proxy-user\fP \fIuser:password\fP"
 Use specified user and password to use for proxy authentication.
 .IP "\fB\--update\fP"
-Add a medium which will be taken into account by \fBMandrakeupdate\fP or
+Add a medium which will be taken into account by \fBMandrivaUpdate\fP or
 by \fBurpmi --update\fP when looking for updates.
 .IP "\fB\--probe-synthesis\fP"
 Try to find and use synthesis file if \fBwith ...\fP is not given.
@@ -128,9 +128,9 @@ Beginning with urpmi 4.6.16, you can use variables in media URLs
 (for example \fB/mnt/mirror/$RELEASE/$ARCH/media/main\fP). The variables
 supported so far are:
 .IP "\fB$ARCH\fP"
-The architecture (as given in /etc/mandrakelinux-release)
+The architecture (as given in /etc/mandriva-release)
 .IP "\fB$RELEASE\fP"
-The OS release (as given in /etc/mandrakelinux-release; its value is
+The OS release (as given in /etc/mandriva-release; its value is
 \fBcooker\fP on a cooker system.)
 .IP "\fB$HOST\fP"
 The canonical hostname of the machine urpmi runs on.
@@ -144,9 +144,7 @@ See \fIurpmi.files\fP(5).
 \fIurpmq\fP(8),
 \fIurpmi.files\fP(5).
 .SH AUTHOR
-Pascal Rigaux, Mandrakesoft <pixel@mandrakesoft.com> (original author)
-.PP
-Francois Pons, Mandrakesoft <fpons@mandrakesoft.com>
-.PP
-Rafael Garcia-Suarez, Mandrakesoft <rgarciasuarez@mandrakesoft.com>
+Pascal Rigaux (original author),
+Francois Pons,
+Rafael Garcia-Suarez, <rgarciasuarez@mandriva.com>
 (current maintainer)
diff --git a/man/C/urpmi.cfg.5 b/man/C/urpmi.cfg.5
index d6d5ddfd..c96a1083 100644
--- a/man/C/urpmi.cfg.5
+++ b/man/C/urpmi.cfg.5
@@ -54,7 +54,7 @@ fuzzy search, disabled by default. Enabling it can be written in various ways :
 This option is not available on the command line. It allows to use a comma
 separated list of \fBkey-ids\fP to be globally accepted (keys still need to be
 authorized by \fBrpm\fP) for any medium unless a specific \fBkey-ids\fP option
-for this medium is given. There is no default (even Mandrakesoft key id 70771ff3
+for this medium is given. There is no default (even Mandriva key id 70771ff3
 is not by default).
 
 .TP
@@ -151,11 +151,9 @@ An \fB{\fP should finish a line, as well as a \fB}\fP should start it when used.
 
 This means the construction \fB{ no-verify-rpm }\fP on a single line is invalid.
 .SH AUTHOR
-Pascal Rigaux, Mandrakesoft <pixel@mandrakesoft.com> (original author)
-.PP
-Francois Pons, Mandrakesoft <fpons@mandrakesoft.com>
-.PP
-Rafael Garcia-Suarez, Mandrakesoft <rgarciasuarez@mandrakesoft.com>
+Pascal Rigaux (original author),
+Francois Pons,
+Rafael Garcia-Suarez, <rgarciasuarez@mandriva.com>
 (current maintainer)
 .SH SEE ALSO
 \fIurpmi\fP(8), \fIurpmi.files\fP(5).
diff --git a/man/C/urpmi.files.5 b/man/C/urpmi.files.5
index e029cfcd..1a8e84e3 100644
--- a/man/C/urpmi.files.5
+++ b/man/C/urpmi.files.5
@@ -1,4 +1,4 @@
-.TH urpmi.files 5 "07 Oct 2004" "Mandrakesoft" "Mandrakelinux"
+.TH urpmi.files 5 "07 Oct 2004" "Mandriva" "Mandriva Linux"
 .IX urpmi.files
 .SH NAME
 urpmi.files \- files used by the urpmi tools
diff --git a/man/C/urpmi.removemedia.8 b/man/C/urpmi.removemedia.8
index 17c38bf4..4d7a819a 100644
--- a/man/C/urpmi.removemedia.8
+++ b/man/C/urpmi.removemedia.8
@@ -1,4 +1,4 @@
-.TH urpmi.removemedia 8 "07 Jan 2003" "Mandrakesoft" "Mandrakelinux"
+.TH urpmi.removemedia 8 "07 Jan 2003" "Mandriva" "Mandriva Linux"
 .IX urpmi.removemedia
 .SH NAME
 urpmi.removemedia \- remove a rpm media from the known media of urpmi
@@ -24,9 +24,7 @@ See \fIurpmi.files\fP(5).
 \fIurpmf\fP(8),
 \fIurpmq\fP(8),
 .SH AUTHOR
-Pascal Rigaux, Mandrakesoft <pixel@mandrakesoft.com> (original author)
-.PP
-Francois Pons, Mandrakesoft <fpons@mandrakesoft.com>
-.PP
-Rafael Garcia-Suarez, Mandrakesoft <rgarciasuarez@mandrakesoft.com>
+Pascal Rigaux (original author),
+Francois Pons,
+Rafael Garcia-Suarez, <rgarciasuarez@mandriva.com>
 (current maintainer)
diff --git a/man/C/urpmi.update.8 b/man/C/urpmi.update.8
index f55fd2d4..39e83545 100644
--- a/man/C/urpmi.update.8
+++ b/man/C/urpmi.update.8
@@ -1,4 +1,4 @@
-.TH urpmi.update 8 "28 Aug 2003" "Mandrakesoft" "Mandrakelinux"
+.TH urpmi.update 8 "28 Aug 2003" "Mandriva" "Mandriva Linux"
 .IX urpmi.update
 .SH NAME
 urpmi.update \- Updates package lists for specified media
@@ -55,9 +55,7 @@ See \fIurpmi.files\fP(5).
 \fIurpmq\fP(8),
 \fIurpmi.files\fP(5).
 .SH AUTHOR
-Pascal Rigaux, Mandrakesoft <pixel@mandrakesoft.com> (original author)
-.PP
-Francois Pons, Mandrakesoft <fpons@mandrakesoft.com>
-.PP
-Rafael Garcia-Suarez, Mandrakesoft <rgarciasuarez@mandrakesoft.com>
+Pascal Rigaux (original author),
+Francois Pons,
+Rafael Garcia-Suarez, <rgarciasuarez@mandriva.com>
 (current maintainer)
diff --git a/man/C/urpmq.8 b/man/C/urpmq.8
index 47710570..cda5a01c 100644
--- a/man/C/urpmq.8
+++ b/man/C/urpmq.8
@@ -1,4 +1,4 @@
-.TH urpmq 8 "28 Aug 2002" "Mandrakesoft" "Mandrakelinux"
+.TH urpmq 8 "28 Aug 2002" "Mandriva" "Mandriva Linux"
 .IX urpmq
 .SH NAME
 urpmq \- urpmi database query tool.
@@ -138,9 +138,7 @@ See \fIurpmi.files\fP(5).
 \fIurpmi\fP(8),
 \fIurpmi.files\fP(5).
 .SH AUTHOR
-Pascal Rigaux, Mandrakesoft <pixel@mandrakesoft.com> (original author)
-.PP
-Francois Pons, Mandrakesoft <fpons@mandrakesoft.com>
-.PP
-Rafael Garcia-Suarez, Mandrakesoft <rgarciasuarez@mandrakesoft.com>
+Pascal Rigaux (original author),
+Francois Pons,
+Rafael Garcia-Suarez, <rgarciasuarez@mandriva.com>
 (current maintainer)