[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/prep FTP ftp.html wrappers-and-scripts/ftp_...
|
From: |
Karl Berry |
|
Subject: |
www/prep FTP ftp.html wrappers-and-scripts/ftp_... |
|
Date: |
Mon, 27 Oct 2008 13:33:45 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: Karl Berry <karl> 08/10/27 13:33:45
Modified files:
prep : FTP ftp.html
prep/wrappers-and-scripts: ftp_convert.pl
Log message:
make anchors (#383623), rewrite text
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/FTP?cvsroot=www&r1=1.124&r2=1.125
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/ftp.html?cvsroot=www&r1=1.169&r2=1.170
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/wrappers-and-scripts/ftp_convert.pl?cvsroot=www&r1=1.9&r2=1.10
Patches:
Index: FTP
===================================================================
RCS file: /web/www/www/prep/FTP,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- FTP 8 Oct 2008 12:50:15 -0000 1.124
+++ FTP 27 Oct 2008 13:33:05 -0000 1.125
@@ -1,20 +1,17 @@
- -*- text -*-
-How to get GNU Software. Last updated 2007-12-20
+How to get GNU Software. $Date: 2008/10/27
13:33:05 $
You can always find the most recent version of this list of GNU FTP
sites at http://www.gnu.org/order/ftp.html. Please send improvements to
this file to address@hidden
-* No warranties
+* No warranty
We distribute software in the hope that it will be useful, but without
any warranty. No author or distributor of this software accepts
-responsibility to anyone for the consequences of using it or for
-whether it serves any particular purpose or works at all, unless he
-says so in writing. This is exactly the same warranty that the proprietary
-software companies offer: None. If the distribution is incomplete or the
-media fails, you can always download a replacement from any of the GNU
-mirrors, free of charge.
+responsibility to anyone for the consequences of using it or for whether
+it serves any particular purpose or works at all, unless he says so in
+writing. This is exactly the same warranty that proprietary software
+companies offer: none.
* General download information
@@ -28,10 +25,11 @@
* Downloading GNU software
GNU software is available on ftp.gnu.org under the directory /gnu.
-Please try to use one of the many mirrors of that site listed below: the
-mirrors will be less busy, and you can find one closer to your location.
-Some mirrors also provide a copy of the rest of ftp.gnu.org; try the
-parent directory if you're interested.
+Please try to use one of the many mirrors of our site listed below: the
+mirrors will give you faster response. Some mirrors also provide a copy
+of the rest of ftp.gnu.org; try the parent directory if you're
+interested. You can use the generic url http://ftpmirror.gnu.org to
+choose a nearby and up-to-date mirror automatically.
The tar archives or diff files are usually compressed with gzip
(http://gnu.org/software/gzip); this is indicated with the .gz suffix.
@@ -39,11 +37,6 @@
Sometimes bzip2 compression (http://bzip.org) is used; it compresses
better than gzip, but decompresses slower. This uses the .bz2 suffix.
-Sometimes lzma compression (http://tukaani.org/lzma) is used; it also
-compresses better than gzip (and better than bzip2) and decompresses
-nearly as fast, but can take longer to do the compression. This uses
-the .lzma suffix.
-
Descriptions of GNU software are available in the Free Software
Directory: http://www.gnu.org/directory
@@ -141,8 +134,7 @@
We welcome and appreciate more mirrors. If you are able to provide one,
please see http://www.gnu.org/server/mirror.html for information and
-instructions. When it's up and running, contact address@hidden to
-have your site added to the list.
+instructions.
* TeX and how to obtain it
@@ -151,22 +143,16 @@
manuals.
TeX is freely redistributable. You can get it over the Internet or on
-physical media. For download instructions, see ftp://tug.org/tex/unixtex.ftp.
+physical media. For download instructions, see http://tug.org/texlive.
-A minimal TeX collection (enough to process Texinfo files) is included
-on the GNU Source CD-ROM. See http://www.gnu.org/order/sourcecode.html.
+* Supporting the free software movement
-* If you like the software
+If you agree with the free software ideals we espouse, or just like GNU
+software, please consider supporting the Free Software Foundation, by
+joining as an associate member (http://fsf.org/join), making a donation
+(http://www.fsf.org/associate/support_freedom/donate), or buying books
+or promotional items (http://shop.fsf.org). For still other ways to
+contribute to GNU, both technical and non-technical, see
+http://www.gnu.org/help.
-If you like the software developed and distributed by the Free
-Software Foundation, please express your satisfaction with a donation.
-Your donations will help to support the Foundation and make our future
-efforts successful. The Foundation continues to improve GNU programs
-and encourage the writing of new free software to enhance GNU/Linux
-and GNU/Hurd systems. For more information on GNU and the Foundation,
-see our web site at http://www.gnu.org.
-
-Ordering our software distributions is a very good way for your
-organization to help support our work. You can also purchase printed
-manuals, reference cards, t-shirts, and other items. See our online
-store http://shop.fsf.org for details.
+Your support will help ensure the future of free software.
Index: ftp.html
===================================================================
RCS file: /web/www/www/prep/ftp.html,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -b -r1.169 -r1.170
--- ftp.html 8 Oct 2008 12:50:15 -0000 1.169
+++ ftp.html 27 Oct 2008 13:33:05 -0000 1.170
@@ -12,7 +12,6 @@
<h2>GNU FTP Mirror List</h2>
-<!-- Last updated 2007-12-20 -->
<p>
You can always find the most recent version of this list of GNU FTP
@@ -20,19 +19,19 @@
this file to <a href="mailto:address@hidden";><address@hidden></a>.
</p>
-<h3>No warranties</h3>
+<a id="no_warranty"></a>
+<h3>No warranty</h3>
<p>
We distribute software in the hope that it will be useful, but without
any warranty. No author or distributor of this software accepts
-responsibility to anyone for the consequences of using it or for
-whether it serves any particular purpose or works at all, unless he
-says so in writing. This is exactly the same warranty that the proprietary
-software companies offer: None. If the distribution is incomplete or the
-media fails, you can always download a replacement from any of the GNU
-mirrors, free of charge.
+responsibility to anyone for the consequences of using it or for whether
+it serves any particular purpose or works at all, unless he says so in
+writing. This is exactly the same warranty that proprietary software
+companies offer: none.
</p>
+<a id="general_download_information"></a>
<h3>General download information</h3>
<p>
@@ -46,14 +45,16 @@
If asked, login in as user anonymous, with any password, and set binary mode.
</p>
+<a id="downloading_gnu_software"></a>
<h3>Downloading GNU software</h3>
<p>
GNU software is available on <a href="ftp://ftp.gnu.org";>ftp.gnu.org</a> under
the directory /gnu.
-Please try to use one of the many mirrors of that site listed below: the
-mirrors will be less busy, and you can find one closer to your location.
-Some mirrors also provide a copy of the rest of <a
href="ftp://ftp.gnu.org";>ftp.gnu.org</a>; try the
-parent directory if you're interested.
+Please try to use one of the many mirrors of our site listed below: the
+mirrors will give you faster response. Some mirrors also provide a copy
+of the rest of <a href="ftp://ftp.gnu.org";>ftp.gnu.org</a>; try the parent
directory if you're
+interested. You can use the generic url <a
href="http://ftpmirror.gnu.org";>http://ftpmirror.gnu.org</a> to
+choose a nearby and up-to-date mirror automatically.
</p>
<p>
@@ -67,17 +68,11 @@
</p>
<p>
-Sometimes lzma compression (<a
href="http://tukaani.org/lzma";>http://tukaani.org/lzma</a>) is used; it also
-compresses better than gzip (and better than bzip2) and decompresses
-nearly as fast, but can take longer to do the compression. This uses
-the .lzma suffix.
-</p>
-
-<p>
Descriptions of GNU software are available in the Free Software
Directory: <a
href="http://www.gnu.org/directory";>http://www.gnu.org/directory</a>
</p>
+<a id="gnu_mirror_list"></a>
<h3>GNU mirror list</h3>
<ul>
@@ -592,15 +587,16 @@
</ul>
</li>
</ul>
+<a id="add_your_mirror_to_this_list"></a>
<h3>Add your mirror to this list</h3>
<p>
We welcome and appreciate more mirrors. If you are able to provide one,
please see <a
href="http://www.gnu.org/server/mirror.html";>http://www.gnu.org/server/mirror.html</a>
for information and
-instructions. When it's up and running, contact <a
href="mailto:address@hidden";><address@hidden></a> to
-have your site added to the list.
+instructions.
</p>
+<a id="tex_and_how_to_obtain_it"></a>
<h3>TeX and how to obtain it</h3>
<p>
@@ -611,31 +607,24 @@
<p>
TeX is freely redistributable. You can get it over the Internet or on
-physical media. For download instructions, see <a
href="ftp://tug.org/tex/unixtex.ftp";>ftp://tug.org/tex/unixtex.ftp</a>.
-</p>
-
-<p>
-A minimal TeX collection (enough to process Texinfo files) is included
-on the GNU Source CD-ROM. See <a
href="http://www.gnu.org/order/sourcecode.html";>http://www.gnu.org/order/sourcecode.html</a>.
+physical media. For download instructions, see <a
href="http://tug.org/texlive";>http://tug.org/texlive</a>.
</p>
-<h3>If you like the software</h3>
+<a id="supporting_the_free_software_movement"></a>
+<h3>Supporting the free software movement</h3>
<p>
-If you like the software developed and distributed by the Free
-Software Foundation, please express your satisfaction with a donation.
-Your donations will help to support the Foundation and make our future
-efforts successful. The Foundation continues to improve GNU programs
-and encourage the writing of new free software to enhance GNU/Linux
-and GNU/Hurd systems. For more information on GNU and the Foundation,
-see our web site at <a href="http://www.gnu.org";>http://www.gnu.org</a>.
+If you agree with the free software ideals we espouse, or just like GNU
+software, please consider supporting the Free Software Foundation, by
+joining as an associate member (<a
href="http://fsf.org/join";>http://fsf.org/join</a>), making a donation
+(<a
href="http://www.fsf.org/associate/support_freedom/donate";>http://www.fsf.org/associate/support_freedom/donate</a>),
or buying books
+or promotional items (<a href="http://shop.fsf.org";>http://shop.fsf.org</a>).
For still other ways to
+contribute to GNU, both technical and non-technical, see
+<a href="http://www.gnu.org/help";>http://www.gnu.org/help</a>.
</p>
<p>
-Ordering our software distributions is a very good way for your
-organization to help support our work. You can also purchase printed
-manuals, reference cards, t-shirts, and other items. See our online
-store <a href="http://shop.fsf.org";>http://shop.fsf.org</a> for details.
+Your support will help ensure the future of free software.
</p>
</div>
@@ -673,7 +662,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2008/10/08 12:50:15 $
+$Date: 2008/10/27 13:33:05 $
<!-- timestamp end -->
</p>
</div>
Index: wrappers-and-scripts/ftp_convert.pl
===================================================================
RCS file: /web/www/www/prep/wrappers-and-scripts/ftp_convert.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- wrappers-and-scripts/ftp_convert.pl 20 Dec 2007 18:56:15 -0000 1.9
+++ wrappers-and-scripts/ftp_convert.pl 27 Oct 2008 13:33:42 -0000 1.10
@@ -1,17 +1,13 @@
#!/usr/local/bin/perl -w
-# ftp_convert.pl
+# $Id: ftp_convert.pl,v 1.10 2008/10/27 13:33:42 karl Exp $
#
# Converts the FTP file to a html file - just prints on the standard out
# and it is the responsibility of who ever running this to redirect to a
# flat_file. Also standard GNU HTML header and trailer needs to be added to
-# this page.
+# this page. See the Makefile.
#
# Original Script Written by : address@hidden
-# Update : address@hidden
#
-# Usage:
-#
-# ftp_convert.pl FTP
# 01/02/1999 - Murali - Added support for http sites on the ftp list
# Also fixed the bug with <tt></tt>
@@ -41,10 +37,7 @@
#EOT
$_ = <>;
-die "Incorrect format." unless /^\s*-\*- text -\*-\s*$/;
-$_ = <>;
-/(\d{4}-\d{2}-\d{2})/ or die "Incorrect format.";
-print "<!-- Last updated $1 -->\n";
+die "Incorrect format, start with How to get." unless /^How to get/;
$state = 0;
@@ -84,6 +77,8 @@
}
$start_of_ftp_list=0;
}
+ (my $anchor_id = $printstr) =~ tr/ A-Z/_a-z/;
+ print qq!<a id="$anchor_id"></a>\n!;
print "<h$headlvl>$printstr</h$headlvl>\n";
if ($start_of_ftp_list)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/prep FTP ftp.html wrappers-and-scripts/ftp_...,
Karl Berry <=