change archive links to archive.d.o and unlink dead ones

CVS version numbers

english/releases/potato/errata.wml: 1.6 -> 1.7 
english/releases/potato/index.wml: 1.61 -> 1.62

2 files changed, 17 insertions, 11 deletions

diff --git a/english/releases/potato/errata.wml b/english/releases/potato/errata.wml
index c2e9613f69e..7ae55c4f73e 100644
--- a/english/releases/potato/errata.wml
+++ b/english/releases/potato/errata.wml
@@ -1,5 +1,12 @@
 #use wml::debian::template title="Debian GNU/Linux 2.2 -- Errata" BARETITLE=true
 
+<p><strong>Debian GNU/Linux 2.2 has been obsoleted by
+<a href="../woody/">Debian GNU/Linux 3.0 ("woody")</a>.
+Security updates are discontinued as of June 30th, 2003.</strong>
+Please see
+<a href="http://lists.debian.org/debian-devel-announce/2003/debian-devel-announce-200302/msg00010.html">\
+the security team survey results</a> for more information.</p>
+
 <h2>Security issues</h2>
 
 <p>Debian security team issues updates to packages in the stable release
@@ -34,7 +41,7 @@ releases.</p>
 </ul>
 
 <p>
-See the <a href="http://http.us.debian.org/debian/dists/potato/ChangeLog">
+See the <a href="http://archive.debian.org/dists/potato/ChangeLog">
 ChangeLog</a> (and
 <a href="http://non-us.debian.org/debian-non-US/dists/potato/non-US/ChangeLog">
 ChangeLog for non-US</a>) for details on changes.</p>
@@ -42,10 +49,10 @@ ChangeLog for non-US</a>) for details on changes.</p>
 <p>Fixes to the released stable distribution often go through an
 extended testing period before they are accepted into the archive.
 However, these fixes are available in the
-<a href="http://ftp.debian.org/debian/dists/potato-proposed-updates/">
+<a href="http://archive.debian.org/dists/potato-proposed-updates/">
 dists/potato-proposed-updates</a> directory of any Debian archive
 mirror (and on the same location at our
-<a href="ftp://non-us.debian.org/debian-non-US/dists/potato-proposed-updates/">
+<a href="http://non-us.debian.org/debian-non-US/dists/potato-proposed-updates/">
 non-US server</a> and its mirrors).</p>
 
 <p>If you use <tt>apt</tt> to update your packages, you can install
@@ -56,8 +63,8 @@ the proposed updates by adding the following line to
 # if possible.
 <pre>
   \# proposed additions for a 2.2 point release
-  deb http://http.us.debian.org/debian dists/proposed-updates/
-  deb http://non-us.debian.org/debian-non-US dists/proposed-updates/
+  deb http://archive.debian.org dists/potato-proposed-updates/
+  deb http://non-us.debian.org/debian-non-US dists/potato-proposed-updates/
 </pre>
 
 <p>After that, run <kbd>apt-get update</kbd> followed by
@@ -73,8 +80,8 @@ the proposed updates by adding the following line to
 
 <h2>Unofficial Internationalized Installation Support</h2>
 
-<p>An internationalized version of the installation system for i386 is <a
-href="http://people.debian.org/~aph/current-i18n/">available</a> for
+<p>An internationalized version of the installation system for i386 is
+available (http://people.debian.org/~aph/current-i18n/) for
 testing and use.  You need to use the 'idepci' or 'compact' flavors.</p>
 
 <p>Due to some remaining problems with the internationalized
@@ -93,9 +100,8 @@ some instructions at <a
 href="http://chao.ucsd.edu/debian/boot-floppies/">
 http://chao.ucsd.edu/debian/boot-floppies/</a>.</p>
 
-<p>The other is from Marc A. Volovic and is available at <a
-href="http://www.bard.org.il/~marc/linux/rfs/">
-http://www.bard.org.il/~marc/linux/rfs/</a>.</p>
+<p>The other is from Marc A. Volovic and is available at
+http://www.bard.org.il/~marc/linux/rfs/.</p>
 
 
 <h2>Unofficial Linux Kernel 2.4 Support</h2>
diff --git a/english/releases/potato/index.wml b/english/releases/potato/index.wml
index abd5a159b1d..165131571d2 100644
--- a/english/releases/potato/index.wml
+++ b/english/releases/potato/index.wml
@@ -50,7 +50,7 @@ installation guide for Debian 2.2</a>, which is an on line tutorial.</p>
 packages:</p>
 
 <pre>
-  deb http://http.us.debian.org/debian potato main contrib non-free
+  deb http://archive.debian.org potato main contrib non-free
   deb http://non-us.debian.org/debian-non-US potato/non-US main non-free
 </pre>