www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/prep ftp.html wrappers-and-scripts/ftp_conv...


From: Karl Berry
Subject: www/prep ftp.html wrappers-and-scripts/ftp_conv...
Date: Sun, 23 Sep 2007 22:18:50 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Karl Berry <karl>       07/09/23 22:18:50

Modified files:
        prep           : ftp.html 
        prep/wrappers-and-scripts: ftp_convert.pl 

Log message:
        no double ftp in urls, ticket 343816

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/ftp.html?cvsroot=www&r1=1.121&r2=1.122
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/wrappers-and-scripts/ftp_convert.pl?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: ftp.html
===================================================================
RCS file: /web/www/www/prep/ftp.html,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- ftp.html    15 Sep 2007 19:05:43 -0000      1.121
+++ ftp.html    23 Sep 2007 22:17:54 -0000      1.122
@@ -576,7 +576,7 @@
 
 <p>
 TeX is freely redistributable.  You can get it by FTP or on CD-ROM or
-other media.  For FTP instructions, see <a 
href="ftp://ftp://ftp.tug.org/tex/unixtex.ftp";>ftp://ftp.tug.org/tex/unixtex.ftp</a>.
+other media.  For FTP instructions, see <a 
href="ftp://ftp.tug.org/tex/unixtex.ftp";>ftp://ftp.tug.org/tex/unixtex.ftp</a>.
 </p>
 
 <p>
@@ -639,7 +639,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2007/09/15 19:05:43 $
+$Date: 2007/09/23 22:17:54 $
 <!-- 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- wrappers-and-scripts/ftp_convert.pl 20 Mar 2007 22:49:49 -0000      1.6
+++ wrappers-and-scripts/ftp_convert.pl 23 Sep 2007 22:18:45 -0000      1.7
@@ -224,7 +224,12 @@
                        s/(\b\S*http:\S*\b)([\.\s]*)/<a href="$1">$1<\/a>$2/g;
                        next;
                }
-               if (/ftp\.\S+/)
+               if (/ftp:\S+/)
+               {
+                       s/(\b\S*ftp:\S*\b)([\.\s]*)/<a href="$1">$1<\/a>$2/g;
+                       next;
+
+               } elsif (/ftp\.\S+/)
                {
                        s/(\b\S*ftp\.\S*[\[\]]*\b)(\.*\s*)/<a 
href="ftp:\/\/$1">$1<\/a>$2/g;
                        next;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]