www/prep FTP ftp.html

[Fabio Pesari]

CVSROOT:        /web/www
Module name:    www
Changes by:     Fabio Pesari <fabiop>   15/05/28 20:40:47

Modified files:
        prep           : FTP ftp.html 

Log message:
        Added dgix.ru (Europe/Russia) [RT #1017823]

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/FTP?cvsroot=www&r1=1.475&r2=1.476
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/ftp.html?cvsroot=www&r1=1.552&r2=1.553

Patches:
Index: FTP
===================================================================
RCS file: /web/www/www/prep/FTP,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -b -r1.475 -r1.476
--- FTP 28 May 2015 20:07:59 -0000      1.475
+++ FTP 28 May 2015 20:40:46 -0000      1.476
@@ -1,4 +1,4 @@
-How to get GNU Software.                           $Date: 2015/05/28 20:07:59 $
+How to get GNU Software.                           $Date: 2015/05/28 20:40:46 $
 
 * No warranty
 
@@ -147,6 +147,7 @@
 Portugal - ftp://mirrors.fe.up.pt/pub/gnu/, http://mirrors.fe.up.pt/pub/gnu/ 
(also, mirrors alpha: http://mirrors.fe.up.pt/pub/gnu-alpha/, 
ftp://mirrors.fe.up.pt/pub/gnu-alpha/)
 Romania - http://gnu.mirrors.linux.ro/, ftp://gnu.mirrors.linux.ro/gnu/, 
rsync://gnu.mirrors.linux.ro/gnu/
 Russia - http://mirror.tochlab.net/pub/gnu/, ftp://mirror.tochlab.net/pub/gnu/
+Russia - http://dgix.ru/mirrors/gnu/, https://dgix.ru/mirrors/gnu/, 
rsync://dgix.ru/mirrors/gnu/
 Serbia - http://mirror.sbb.rs/gnu/, ftp://mirror.sbb.rs/gnu/, 
rsync://mirror.sbb.rs/gnu/
 Slovenia - http://gnu.prunk.si
 Slovenia - http://mirror.lihnidos.org/GNU/ftp/gnu/ (also, mirrors alpha: 
http://mirror.lihnidos.org/GNU/alpha/gnu/)

Index: ftp.html
===================================================================
RCS file: /web/www/www/prep/ftp.html,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -b -r1.552 -r1.553
--- ftp.html    28 May 2015 20:32:35 -0000      1.552
+++ ftp.html    28 May 2015 20:40:46 -0000      1.553
@@ -438,6 +438,9 @@
  <ul>
   <li><a rel="nofollow" 
href="http://mirror.tochlab.net/pub/gnu/";>http://mirror.tochlab.net/pub/gnu/</a></li>
   <li><a rel="nofollow" 
href="ftp://mirror.tochlab.net/pub/gnu/";>ftp://mirror.tochlab.net/pub/gnu/</a></li>
+  <li><a rel="nofollow" 
href="http://dgix.ru/mirrors/gnu/";>http://dgix.ru/mirrors/gnu/</a></li>
+  <li>https://dgix.ru/mirrors/gnu/</li>
+  <li>rsync://dgix.ru/mirrors/gnu/</li>
  </ul></li><!-- end of Russia -->
  <li>Serbia
  <ul>
@@ -597,7 +600,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -615,14 +618,18 @@
 <p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/05/28 20:32:35 $
+<<<<<<< ftp.html
+$Date: 2015/05/28 20:40:46 $
+=======
+$Date: 2015/05/28 20:40:46 $
+>>>>>>> 1.552
 <!-- timestamp end -->
 </p>
 </div>