Index: docs/sample.gftp/bookmarks
===================================================================
--- docs/sample.gftp/bookmarks	(revision 968)
+++ docs/sample.gftp/bookmarks	(working copy)
@@ -42,26 +42,6 @@
 password=@EMAIL@
 account=
 
-[Debian Sites/Debian non-US]
-hostname=non-us.debian.org
-port=21
-protocol=FTP
-remote directory=/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Debian Sites/Freshmeat DEBs]
-hostname=ftp.freshmeat.net
-port=21
-protocol=FTP
-remote directory=/pub/debs
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
 [General Sites/gFTP]
 hostname=www.gftp.org
 port=21
@@ -132,36 +112,6 @@
 password=@EMAIL@
 account=
 
-[General Sites/Source Forge]
-hostname=ftp.sourceforge.net
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[General Sites/Tux.Org]
-hostname=ftp.tux.org
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[General Sites/TSX-11]
-hostname=tsx-11.mit.edu
-port=21
-protocol=FTP
-remote directory=/pub/linux
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
 [General Sites/Wcarchive]
 hostname=ftp.cdrom.com
 port=21
@@ -172,51 +122,11 @@
 password=@EMAIL@
 account=
 
-[Mandriva Sites/Community SRPMS (California)]
-hostname=mirrors.usc.edu
-port=21
-protocol=FTP
-remote directory=/pub/linux/distributions/mandrakelinux/devel/community/SRPMS/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Mandriva Sites/Devel iso (California)]
-hostname=mirrors.usc.edu
-port=21
-protocol=FTP
-remote directory=/pub/linux/distributions/mandrakelinux/devel/iso/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Mandriva Sites/Official iso (California)]
-hostname=mirrors.usc.edu
-port=21
-protocol=FTP
-remote directory=/pub/linux/distributions/mandrakelinux/official/iso/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Mandriva Sites/Mandriva Old (California)]
-hostname=mirrors.usc.edu
-port=21
-protocol=FTP
-remote directory=/pub/linux/distributions/mandrakelinux/old/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Mandriva Sites/Community SRPMS (France)]
+[Mandriva Sites/Community SRPMS (France)] 
 hostname=ftp.ciril.fr
 port=21
 protocol=FTP
-remote directory=/pub/linux/mandrakelinux/devel/community/SRPMS/
+remote directory=/pub/linux/mandriva/devel/community/SRPMS/
 local directory=
 username=anonymous
 password=@EMAIL@
@@ -226,7 +136,7 @@
 hostname=ftp.ciril.fr
 port=21
 protocol=FTP
-remote directory=/pub/linux/mandrakelinux/devel/iso/
+remote directory=/pub/linux/mandriva/devel/iso/
 local directory=
 username=anonymous
 password=@EMAIL@
@@ -236,7 +146,7 @@
 hostname=ftp.ciril.fr
 port=21
 protocol=FTP
-remote directory=/pub/linux/mandrakelinux/official/iso/
+remote directory=/pub/linux/mandriva/official/iso/
 local directory=
 username=anonymous
 password=@EMAIL@
@@ -246,7 +156,7 @@
 hostname=ftp.isu.edu.tw
 port=21
 protocol=FTP
-remote directory=/pub/Linux/Mandrakelinux/devel/community/SRPMS/
+remote directory=/pub/Linux/mandriva/devel/community/SRPMS/
 local directory=
 username=anonymous
 password=@EMAIL@
@@ -256,7 +166,7 @@
 hostname=ftp.isu.edu.tw
 port=21
 protocol=FTP
-remote directory=/pub/Linux/Mandrakelinux/devel/iso/
+remote directory=/pub/Linux/mandriva/devel/iso/
 local directory=
 username=anonymous
 password=@EMAIL@
@@ -266,7 +176,7 @@
 hostname=ftp.isu.edu.tw
 port=21
 protocol=FTP
-remote directory=/pub/Linux/Mandrakelinux/official/iso/
+remote directory=/pub/Linux/mandriva/official/iso/
 local directory=
 username=anonymous
 password=@EMAIL@
@@ -276,7 +186,7 @@
 hostname=ftp.isu.edu.tw
 port=21
 protocol=FTP
-remote directory=/pub/Linux/Mandrakelinux/old/
+remote directory=/pub/Linux/mandriva/old/
 local directory=
 username=anonymous
 password=@EMAIL@
@@ -292,26 +202,6 @@
 password=@EMAIL@
 account=
 
-[RedHat Sites/Freshmeat RPMs]
-hostname=ftp.freshmeat.net
-port=21
-protocol=FTP
-remote directory=/pub/rpms
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[RedHat Sites/RH Contrib]
-hostname=contrib.redhat.com
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
 [RedHat Sites/RH Main]
 hostname=ftp.redhat.com
 port=21
@@ -342,16 +232,6 @@
 password=@EMAIL@
 account=
 
-[RedHat Sites/RPM.org]
-hostname=ftp.rpm.org
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
 [RedHat Sites/Fresh RPMS]
 hostname=ftp.freshrpms.net
 port=21
@@ -372,16 +252,6 @@
 password=@EMAIL@
 account=
 
-[Slackware Sites/linuxmafia.org]
-hostname=packages.linuxmafia.org
-port=21
-protocol=FTP
-remote directory=/pub/slackware-7.0
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
 [SuSE Sites/SuSE]
 hostname=ftp.suse.com
 port=21
@@ -402,8 +272,8 @@
 password=@EMAIL@
 account=
 
-[SuSE Sites/SuSE Update]
-hostname=ftp.suse.com
+[SuSE Sites/OpenSuSE Update]
+hostname=ftp.hosteurope.de/mirror/ftp.opensuse.org/
 port=21
 protocol=FTP
 remote directory=/suse_update
@@ -452,16 +322,6 @@
 password=@EMAIL@
 account=
 
-[X11 Sites/LessTif]
-hostname=ftp.hungry.com
-port=21
-protocol=FTP
-remote directory=/pub/hungry/lesstif
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
 [X11 Sites/Qt]
 hostname=ftp.troll.no
 port=21
