svn commit: r39585 - in head: da_DK.ISO8859-1/articles da_DK.ISO8859-1/articles/euro de_DE.ISO8859-1/articles de_DE.ISO8859-1/articles/version-guide de_DE.ISO8859-1/books/faq de_DE.ISO8859-1/htdocs...

Gabor Kovesdan gabor at FreeBSD.org
Thu Sep 20 14:33:31 UTC 2012


Author: gabor
Date: Thu Sep 20 14:33:30 2012
New Revision: 39585
URL: http://svn.freebsd.org/changeset/doc/39585

Log:
  - Remove the following articles and references to them.  Where it is
    reasonable to maintain the reference, use the archived docs.
  
    5-roadmap
    checkpoint
    dialup-firewall
    diskless-x
    euro
    formatting-media
    hats (content moved to htdocs/internal)
    multi-os
    storage-devices
    vinum
    zip-drive
  
  All of these articles can be found here:
  http://docs.freebsd.org/doc/9.0-RELEASE/usr/share/doc/freebsd/en_US.ISO8859-1/articles/
  
  No objection from:	doc@, www@

Deleted:
  head/da_DK.ISO8859-1/articles/euro/
  head/de_DE.ISO8859-1/articles/version-guide/
  head/el_GR.ISO8859-7/articles/dialup-firewall/
  head/el_GR.ISO8859-7/articles/formatting-media/
  head/el_GR.ISO8859-7/articles/multi-os/
  head/en_US.ISO8859-1/articles/5-roadmap/
  head/en_US.ISO8859-1/articles/checkpoint/
  head/en_US.ISO8859-1/articles/dialup-firewall/
  head/en_US.ISO8859-1/articles/diskless-x/
  head/en_US.ISO8859-1/articles/euro/
  head/en_US.ISO8859-1/articles/formatting-media/
  head/en_US.ISO8859-1/articles/multi-os/
  head/en_US.ISO8859-1/articles/storage-devices/
  head/en_US.ISO8859-1/articles/version-guide/
  head/en_US.ISO8859-1/articles/vinum/
  head/en_US.ISO8859-1/articles/zip-drive/
  head/es_ES.ISO8859-1/articles/dialup-firewall/
  head/es_ES.ISO8859-1/articles/euro/
  head/es_ES.ISO8859-1/articles/version-guide/
  head/es_ES.ISO8859-1/articles/zip-drive/
  head/fr_FR.ISO8859-1/articles/dialup-firewall/
  head/fr_FR.ISO8859-1/articles/diskless-x/
  head/fr_FR.ISO8859-1/articles/euro/
  head/fr_FR.ISO8859-1/articles/formatting-media/
  head/fr_FR.ISO8859-1/articles/multi-os/
  head/fr_FR.ISO8859-1/articles/zip-drive/
  head/hu_HU.ISO8859-2/articles/dialup-firewall/
  head/hu_HU.ISO8859-2/articles/multi-os/
  head/hu_HU.ISO8859-2/articles/version-guide/
  head/it_IT.ISO8859-15/articles/euro/
  head/it_IT.ISO8859-15/articles/multi-os/
  head/ja_JP.eucJP/articles/dialup-firewall/
  head/ja_JP.eucJP/articles/diskless-x/
  head/ja_JP.eucJP/articles/multi-os/
  head/ja_JP.eucJP/articles/zip-drive/
  head/pl_PL.ISO8859-2/articles/dialup-firewall/
  head/ru_RU.KOI8-R/articles/5-roadmap/
  head/ru_RU.KOI8-R/articles/checkpoint/
  head/ru_RU.KOI8-R/articles/dialup-firewall/
  head/ru_RU.KOI8-R/articles/diskless-x/
  head/ru_RU.KOI8-R/articles/euro/
  head/ru_RU.KOI8-R/articles/formatting-media/
  head/ru_RU.KOI8-R/articles/hats/
  head/ru_RU.KOI8-R/articles/multi-os/
  head/ru_RU.KOI8-R/articles/version-guide/
  head/ru_RU.KOI8-R/articles/zip-drive/
  head/share/images/articles/checkpoint/
  head/share/images/articles/vinum/
  head/sr_YU.ISO8859-2/articles/dialup-firewall/
  head/sr_YU.ISO8859-2/articles/diskless-x/
Modified:
  head/da_DK.ISO8859-1/articles/Makefile
  head/de_DE.ISO8859-1/articles/Makefile
  head/de_DE.ISO8859-1/books/faq/book.sgml
  head/de_DE.ISO8859-1/htdocs/docs/books.sgml
  head/de_DE.ISO8859-1/htdocs/news/2005/news.xml
  head/de_DE.ISO8859-1/htdocs/releases/5.1R/early-adopter.html
  head/de_DE.ISO8859-1/htdocs/releases/5.2R/early-adopter.html
  head/el_GR.ISO8859-7/articles/Makefile
  head/el_GR.ISO8859-7/articles/linux-users/article.sgml
  head/el_GR.ISO8859-7/books/faq/book.sgml
  head/en_US.ISO8859-1/articles/Makefile
  head/en_US.ISO8859-1/articles/linux-users/article.sgml
  head/en_US.ISO8859-1/books/dev-model/book.sgml
  head/en_US.ISO8859-1/books/faq/book.sgml
  head/en_US.ISO8859-1/htdocs/docproj/translations.sgml
  head/en_US.ISO8859-1/htdocs/docs/books.sgml
  head/en_US.ISO8859-1/htdocs/news/2000/index.sgml
  head/en_US.ISO8859-1/htdocs/news/2001/news.xml
  head/en_US.ISO8859-1/htdocs/news/2002/news.xml
  head/en_US.ISO8859-1/htdocs/news/2005/news.xml
  head/en_US.ISO8859-1/htdocs/news/status/report-2003-01-2003-02.xml
  head/en_US.ISO8859-1/htdocs/projects/newbies.sgml
  head/en_US.ISO8859-1/htdocs/releases/5.1R/early-adopter.html
  head/en_US.ISO8859-1/htdocs/releases/5.1R/schedule.sgml
  head/en_US.ISO8859-1/htdocs/releases/5.2.1R/early-adopter.html
  head/en_US.ISO8859-1/htdocs/releases/5.2R/early-adopter.html
  head/en_US.ISO8859-1/htdocs/releases/5.2R/schedule.sgml
  head/en_US.ISO8859-1/htdocs/releng/index.sgml
  head/es_ES.ISO8859-1/articles/Makefile
  head/es_ES.ISO8859-1/articles/linux-users/article.sgml
  head/fr_FR.ISO8859-1/articles/Makefile
  head/fr_FR.ISO8859-1/articles/linux-users/article.sgml
  head/fr_FR.ISO8859-1/htdocs/docproj/translations.sgml
  head/fr_FR.ISO8859-1/htdocs/docs/books.sgml
  head/fr_FR.ISO8859-1/htdocs/news/2000/index.sgml
  head/fr_FR.ISO8859-1/htdocs/news/2001/news.xml
  head/fr_FR.ISO8859-1/htdocs/news/2002/news.xml
  head/fr_FR.ISO8859-1/htdocs/releng/index.sgml
  head/hu_HU.ISO8859-2/articles/Makefile
  head/hu_HU.ISO8859-2/books/faq/book.sgml
  head/hu_HU.ISO8859-2/htdocs/docs/books.sgml
  head/it_IT.ISO8859-15/articles/Makefile
  head/it_IT.ISO8859-15/htdocs/docs/books.sgml
  head/ja_JP.eucJP/articles/Makefile
  head/ja_JP.eucJP/books/faq/book.sgml
  head/ja_JP.eucJP/htdocs/docproj/translations.sgml
  head/ja_JP.eucJP/htdocs/docs/books.sgml
  head/ja_JP.eucJP/htdocs/news/2001/news.xml
  head/ja_JP.eucJP/htdocs/releases/5.1R/early-adopter.html
  head/ja_JP.eucJP/htdocs/releases/5.2.1R/early-adopter.html
  head/ja_JP.eucJP/htdocs/releases/5.2R/early-adopter.html
  head/ja_JP.eucJP/share/sgml/news.xml
  head/pl_PL.ISO8859-2/articles/Makefile
  head/pt_BR.ISO8859-1/articles/linux-users/article.sgml
  head/pt_BR.ISO8859-1/books/faq/book.sgml
  head/ru_RU.KOI8-R/articles/Makefile
  head/ru_RU.KOI8-R/books/faq/book.sgml
  head/ru_RU.KOI8-R/htdocs/docproj/translations.sgml
  head/ru_RU.KOI8-R/htdocs/docs/books.sgml
  head/ru_RU.KOI8-R/htdocs/news/2000/index.sgml
  head/ru_RU.KOI8-R/htdocs/news/2001/news.xml
  head/ru_RU.KOI8-R/htdocs/news/2002/news.xml
  head/ru_RU.KOI8-R/htdocs/releng/index.sgml
  head/ru_RU.KOI8-R/share/sgml/urls.ent
  head/share/sgml/urls.ent
  head/sr_YU.ISO8859-2/articles/Makefile
  head/tr_TR.ISO8859-9/htdocs/docs.sgml
  head/zh_CN.GB2312/articles/linux-users/article.sgml
  head/zh_TW.Big5/books/faq/book.sgml
  head/zh_TW.Big5/htdocs/docs/books.sgml
  head/zh_TW.Big5/share/sgml/news.xml
  head/zh_TW.Big5/share/sgml/urls.ent

Modified: head/da_DK.ISO8859-1/articles/Makefile
==============================================================================
--- head/da_DK.ISO8859-1/articles/Makefile	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/da_DK.ISO8859-1/articles/Makefile	Thu Sep 20 14:33:30 2012	(r39585)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-SUBDIR = euro
 SUBDIR+= ipsec-must
 SUBDIR+= pxe
 

Modified: head/de_DE.ISO8859-1/articles/Makefile
==============================================================================
--- head/de_DE.ISO8859-1/articles/Makefile	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/de_DE.ISO8859-1/articles/Makefile	Thu Sep 20 14:33:30 2012	(r39585)
@@ -13,7 +13,6 @@ SUBDIR+= laptop
 SUBDIR+= linux-comparison
 SUBDIR+= new-users
 SUBDIR+= solid-state
-SUBDIR+= version-guide
 
 # ROOT_SYMLINKS+= new-users
 

Modified: head/de_DE.ISO8859-1/books/faq/book.sgml
==============================================================================
--- head/de_DE.ISO8859-1/books/faq/book.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/de_DE.ISO8859-1/books/faq/book.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -1449,19 +1449,6 @@ $FreeBSDde$
       </qandaentry>
 
       <qandaentry>
-        <question id="multiboot">
-          <para>Kann ich mehr als ein Betriebssystem auf meinem PC
-            unterbringen?</para>
-        </question>
-
-        <answer>
-          <para>Sehen Sie sich <ulink
-            url="&url.articles.multi-os.en;/article.html">Die
-            Multi-OS-Seite</ulink> an.</para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry>
         <question id="windows-coexist">
           <para>Kann &windows; neben &os; existieren?</para>
         </question>
@@ -5390,10 +5377,7 @@ kern.sched.name: 4BSD</screen>
             &man.boot0cfg.8; auf beiden Platten booteasy installieren,
             damit Sie in der Lage sind, das alte und das neue System
             abwechselnd zu starten, nachdem der Kopiervorgang
-            abgeschlossen ist.  Im <ulink
-            url="&url.articles.formatting-media.en;/article.html">Formatting-Media
-            Tutorial</ulink> finden Sie weitere Informationen zu
-            diesen Schritten.</para>
+            abgeschlossen ist.</para>
 
 	  <para>Nachdem Sie die neue Platte eingerichtet haben,
 	    können Sie Ihre Daten verschieben.  Dummerweise

Modified: head/de_DE.ISO8859-1/htdocs/docs/books.sgml
==============================================================================
--- head/de_DE.ISO8859-1/htdocs/docs/books.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/de_DE.ISO8859-1/htdocs/docs/books.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -101,13 +101,6 @@
 
 <!-- Articles are sorted by pathname -->
 
-    <p><a href="&url.articles;/5-roadmap/index.html">The
-        Roadmap for 5-STABLE</a> (5-roadmap)<br/>
-      Beschreibt die Entwicklungs- und
-        Veröffentlichungspläne hin zum Zweig
-        5-STABLE.  Dieser Artikel ist nur mehr von historischem
-        Interesse.</p>
-
     <p><a href="&url.articles;/bsdl-gpl/index.html">Why you should use
         a BSD style license for your Open Source Project</a> (bsdl-gpl)<br/>
       Beschreibt die Vorteile der Veröffentlichung von
@@ -123,12 +116,6 @@
        Wie FreeBSD einem großen ISP in Lateinamerika helfen
         konnte.</p>
 
-    <p><a href="&url.articles;/checkpoint/index.html">Integration
-        of Checkpoint VPN-1/Firewall-1 and FreeBSD IPsec</a>
-        (checkpoint)<br/>
-      Wie man eine Checkpoint VPN-1/Firewall-1 mit FreeBSD und
-        IPsec konfiguriert.</p>
-
     <p><a href="&url.articles;/committers-guide/index.html">The
         Committer's Guide</a> (committers-guide)<br/>
       Eine Einführung für neue FreeBSD Committer.</p>
@@ -178,22 +165,6 @@
         Advanced Points</a> (cvsup-advanced)<br/>
       Ein Artikel, der die Feinheiten von CVSup beschreibt.</p>
 
-    <p><a href="&url.articles;/dialup-firewall/index.html">Dialup
-        firewalling with FreeBSD</a> (dialup-firewall)<br/>
-      Beschreibt das Einrichten einer Firewall auf einem Rechner
-        mit PPP und ipfw, der über eine Einwahlverbindung und
-        eine dynamisch zugewiesene IP-Adresse mit dem Internet
-        verbunden ist.</p>
-
-    <p><a href="&url.articles;/diskless-x/index.html">Creating
-        a diskless X server</a> (diskless-x)<br/>
-      Wie man einen plattenlosen X-Server einrichtet.</p>
-
-    <p><a href="&url.articles;/euro/index.html">The Euro symbol
-        on FreeBSD</a> (euro)<br/>
-      Wie man FreeBSD und diverse Anwendungen dazu bringen kann,
-        das Euro-Symbol anzuzeigen.</p>
-
     <p><a href="&url.articles.de;/explaining-bsd/index.html">
         Hintergrundwissen zu BSD</a> (explaining-bsd)<br/>
       Eine Antwort auf die Frage: "Was ist BSD?"</p>
@@ -215,11 +186,6 @@
       Die Verwaltung von verschiedenen Schriftarten unter FreeBSD
         sowie deren Einbindung in verschiedene Programme.</p>
 
-    <p><a href="&url.articles;/formatting-media/index.html">Formatting
-        media on FreeBSD</a> (formatting-media)<br/>
-      Die Einrichtung von Speichermedien unter FreeBSD, sowie
-        deren Aufteilung in Slices und Partitionen.</p>
-
     <p><a href="&url.articles;/freebsd-questions/index.html">How
         to get the best results from the FreeBSD-questions mailing list</a>
         (freebsd-questions)<br/>
@@ -243,12 +209,6 @@
      Eine Anleitung zur Erstellung von UFS-Partitionen mit aktiviertem
        Journaling auf Desktop-Systemen.</p>
 
-    <p><a href="&url.articles;/hats/index.html">Working with Hats</a>
-        (hats)<br/>
-      Eine Anleitung für Committer, die den Umgang mit
-        "hats" (also Committern, die für bestimmte
-        Bereiche von FreeBSD verantwortlich sind) beschreibt.</p>
-
     <p><a href="&url.articles;/hubs/index.html">Mirroring FreeBSD</a>
         (hubs)
       <br/>Umfassende Informationen zum Spiegeln der FreeBSD
@@ -296,12 +256,6 @@
         (mh)<br/>
       Eine Einführung in das MH-Mailprogramm.</p>
 
-    <p><a href="&url.articles;/multi-os/index.html">Using
-        FreeBSD with other operating systems</a> (multi-os)<br/>
-      Wie Sie FreeBSD gemeinsam mit einem oder mehreren
-        Betriebssystemen auf dem gleichen Rechner betreiben
-        können.</p>
-
     <p><a href="&url.articles;/nanobsd/index.html">NanoBSD</a>
         (nanobsd)<br/>
       Informationen zu den NanoBSD-Werkzeugen, mit deren Hilfe
@@ -402,37 +356,11 @@
       Beschreibt "solid state"-Gerätedateien unter
         FreeBSD.</p>
 
-    <p><a href="&url.articles;/storage-devices/index.html">Storage Devices</a>
-        (storage-devices)<br/>
-      Detaillierte Informationen über Speichermedien,
-        wie ESDI- und SCSI-Platten, Bandlaufwerke und CD-ROM-Laufwerke
-        unter FreeBSD.</p>
-
-    <p><a href="&url.articles.de;/version-guide/index.html">Die für
-        Sie passende FreeBSD-Version bestimmen</a>
-        (version-guide)<br/>
-      Wie Sie sich für die für Sie richtige
-        FreeBSD-Version entscheiden.  Behandelt werden Releases,
-        Entwicklungszweige, die Unterschiede zwischen -CURRENT und
-        -STABLE, sowie der geplante Entwicklungszyklus des
-        Projekts.</p>
-
-    <p><a href="&url.articles;/vinum/index.html">Bootstrapping
-        Vinum: A Foundation for Reliable Servers</a> (vinum)<br/>
-      Eine Einführung in ausfallsichere Server, sowie eine
-        Schritt-für-Schritt-Anleitung zum Bau eines solchen mit
-        Vinum.</p>
-
     <p><a href="&url.articles;/vm-design/index.html">Design
         elements of the FreeBSD VM system</a> (vm-design)<br/>
       Beschreibt das Design des virtuellen Speichersystems von
         FreeBSD.</p>
 
-    <p><a href="&url.articles;/zip-drive/index.html">Zip-drives
-        and FreeBSD</a> (zip-drive)<br/>
-      Wie man ein Iomega-Ziplaufwerk (SCSI, IDE oder parallel)
-        unter FreeBSD formatiert, einhängt und verwendet.</p>
-
     <h2>Informationen auf anderen Internetseiten</h2>
 
     <p>Verschiedene unabhängige Projekte haben ebenfalls sehr

Modified: head/de_DE.ISO8859-1/htdocs/news/2005/news.xml
==============================================================================
--- head/de_DE.ISO8859-1/htdocs/news/2005/news.xml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/de_DE.ISO8859-1/htdocs/news/2005/news.xml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -440,7 +440,7 @@
 	  <title>Neuer Artikel:  Eine FreeBSD-Version wählen</title>
 
 	  <p>Ein neuer Artikel, <a
-	    href="&enbase;/doc/de_DE.ISO8859-1/articles/version-guide/">
+	    href="http://docs.freebsd.org/doc/9.0-RELEASE/usr/share/doc/freebsd/en_US.ISO8859-1/articles/version-guide/index.html">
 	    Die für Sie passende FreeBSD-Version bestimmen</a>,
 	    erklärt, wie Sie herausfinden können, welche
 	    FreeBSD-Version Ihren Anforderungen am Besten entspricht.

Modified: head/de_DE.ISO8859-1/htdocs/releases/5.1R/early-adopter.html
==============================================================================
--- head/de_DE.ISO8859-1/htdocs/releases/5.1R/early-adopter.html	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/de_DE.ISO8859-1/htdocs/releases/5.1R/early-adopter.html	Thu Sep 20 14:33:30 2012	(r39585)
@@ -189,7 +189,7 @@
          target="_top">FreeBSD Release Engineering</a>.
         Informationen über den geplanten Entwicklungszweig
         5-STABLE finden Sie auf der <a
-        href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/5-roadmap/index.html"
+        href="http://docs.freebsd.org/doc/5.1-RELEASE/usr/share/doc/en_US.ISO8859-1/articles/5-roadmap/index.html"
          target="_top">``The Roadmap for 5-STABLE''</a>.</p>
       </div>
 

Modified: head/de_DE.ISO8859-1/htdocs/releases/5.2R/early-adopter.html
==============================================================================
--- head/de_DE.ISO8859-1/htdocs/releases/5.2R/early-adopter.html	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/de_DE.ISO8859-1/htdocs/releases/5.2R/early-adopter.html	Thu Sep 20 14:33:30 2012	(r39585)
@@ -153,7 +153,7 @@ target="_top">Release Engineering Web pa
 href="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/releng/index.html"
 target="_top">FreeBSD Release Engineering</a>. Informationen über den geplanten
 Entwicklungszweig 5-STABLE finden Sie auf der <a
-href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/5-roadmap/index.html"
+href="http://docs.freebsd.org/doc/5.2-RELEASE/usr/share/doc/en_US.ISO8859-1/articles/5-roadmap/index.html"
 target="_top">``The Roadmap for 5-STABLE''</a>.</p>
 </div>
 

Modified: head/el_GR.ISO8859-7/articles/Makefile
==============================================================================
--- head/el_GR.ISO8859-7/articles/Makefile	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/el_GR.ISO8859-7/articles/Makefile	Thu Sep 20 14:33:30 2012	(r39585)
@@ -7,16 +7,13 @@ SUBDIR = bsdl-gpl
 SUBDIR+= compiz-fusion
 SUBDIR+= contributing
 SUBDIR+= cvs-freebsd
-SUBDIR+= dialup-firewall
 SUBDIR+= explaining-bsd
-SUBDIR+= formatting-media
 SUBDIR+= freebsd-questions
 SUBDIR+= gjournal-desktop
 SUBDIR+= greek-language-support
 SUBDIR+= laptop
 SUBDIR+= linux-users
 SUBDIR+= mailing-list-faq
-SUBDIR+= multi-os
 SUBDIR+= nanobsd
 SUBDIR+= new-users
 SUBDIR+= problem-reports

Modified: head/el_GR.ISO8859-7/articles/linux-users/article.sgml
==============================================================================
--- head/el_GR.ISO8859-7/articles/linux-users/article.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/el_GR.ISO8859-7/articles/linux-users/article.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -149,10 +149,6 @@ in your /etc/rc.conf. Extra options can 
 	  <ulink url="ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/Latest/"></ulink>
 	  èá êáôåâÜóåôå ôá ðéï ðñüóöáôá ðáêÝôá ðïõ õðÜñ÷ïõí ãéá ôç óåéñÜ
 	  6.X.</para>
-
-	<para>Ìðïñåßôå íá äéáâÜóåôå ðåñéóóüôåñá ãéá ôéò åêäüóåéò ôïõ &os;
-	  óôï Üñèñï <ulink
-	    url="&url.base;/doc/en_US.ISO8859-1/articles/version-guide/">ÅðéëÝãïíôáò ôç ÓùóôÞ ãéá ÅóÜò ¸êäïóç ôïõ &os;</ulink>.</para>
       </note>
 
       <para>Ãéá ðåñéóóüôåñåò ðëçñïöïñßåò ó÷åôéêÜ ìå ôá ðáêÝôá, ðáñáêáëïýìå

Modified: head/el_GR.ISO8859-7/books/faq/book.sgml
==============================================================================
--- head/el_GR.ISO8859-7/books/faq/book.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/el_GR.ISO8859-7/books/faq/book.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -1349,18 +1349,6 @@ File: +DESC (ignored)</screen>
       </qandaentry>
 
       <qandaentry>
-	<question id="multiboot">
-	  <para>Ìðïñþ íá Ý÷ù ðåñéóóüôåñá áðü Ýíá ëåéôïõñãéêÜ óõóôÞìáôá óôïí
-	    õðïëïãéóôÞ ìïõ;</para>
-	</question>
-
-	<answer>
-	  <para>Ñßîôå ìéá ìáôéÜ óôçí <ulink
-	      url="&url.articles.multi-os;/index.html">óåëßäá ðïëëáðëþí ëåéôïõñãéêþí</ulink>.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="windows-coexist">
 	  <para>Ìðïñïýí íá óõíõðÜñîïõí ôá  &windows; ìå ôï &os;;</para>
 	</question>
@@ -5196,18 +5184,6 @@ kern.sched.name: 4BSD</screen>
 
     <qandaset>
       <qandaentry>
-        <question id="adding-disks">
-          <para>How can I add my new hard disk to my FreeBSD system?</para>
-        </question>
-
-        <answer>
-          <para>See the Disk Formatting Tutorial at <ulink
-            url="&url.articles.formatting-media;/index.html">
-            www.FreeBSD.org</ulink>.</para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry>
         <question id="new-huge-disk">
           <para>How do I move my system over to my huge new disk?</para>
         </question>
@@ -5229,10 +5205,7 @@ kern.sched.name: 4BSD</screen>
             and &man.disklabel.8;.  You should also install booteasy
             on both disks with &man.boot0cfg.8;, so that you can
             dual boot to the old or new system after the copying
-            is done.  See the <ulink
-            url="&url.articles.formatting-media;/index.html">
-            formatting-media article</ulink> for details on this
-            process.</para>
+            is done.</para>
 
           <para>Now you have the new disk set up, and are ready
             to move the data.  Unfortunately, you cannot just blindly

Modified: head/en_US.ISO8859-1/articles/Makefile
==============================================================================
--- head/en_US.ISO8859-1/articles/Makefile	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/articles/Makefile	Thu Sep 20 14:33:30 2012	(r39585)
@@ -1,11 +1,9 @@
 # $FreeBSD$
 
 SUBDIR =
-SUBDIR+= 5-roadmap
 SUBDIR+= bsdl-gpl
 SUBDIR+= building-products
 SUBDIR+= casestudy-argentina.com
-SUBDIR+= checkpoint
 SUBDIR+= committers-guide
 SUBDIR+= compiz-fusion
 SUBDIR+= console-server
@@ -16,14 +14,10 @@ SUBDIR+= cups
 SUBDIR+= custom-gcc
 SUBDIR+= cvs-freebsd
 SUBDIR+= cvsup-advanced
-SUBDIR+= dialup-firewall
-SUBDIR+= diskless-x
-SUBDIR+= euro
 SUBDIR+= explaining-bsd
 SUBDIR+= fbsd-from-scratch
 SUBDIR+= filtering-bridges
 SUBDIR+= fonts
-SUBDIR+= formatting-media
 SUBDIR+= freebsd-questions
 SUBDIR+= freebsd-update-server
 SUBDIR+= geom-class
@@ -37,7 +31,6 @@ SUBDIR+= linux-emulation
 SUBDIR+= linux-users
 SUBDIR+= mailing-list-faq
 SUBDIR+= mh
-SUBDIR+= multi-os
 SUBDIR+= nanobsd
 SUBDIR+= new-users
 SUBDIR+= p4-primer
@@ -53,12 +46,8 @@ SUBDIR+= releng-packages
 SUBDIR+= remote-install
 SUBDIR+= serial-uart
 SUBDIR+= solid-state
-SUBDIR+= storage-devices
-SUBDIR+= version-guide
-SUBDIR+= vinum
 SUBDIR+= vm-design
 SUBDIR+= wp-toolbox
-SUBDIR+= zip-drive
 
 # ROOT_SYMLINKS+= new-users
 

Modified: head/en_US.ISO8859-1/articles/linux-users/article.sgml
==============================================================================
--- head/en_US.ISO8859-1/articles/linux-users/article.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/articles/linux-users/article.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -129,10 +129,6 @@ in your /etc/rc.conf. Extra options can 
           <ulink url="ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/Latest/"></ulink>
           to download the most recent packages built for the
 	  6.X series.</para>
-
-        <para>You can read more about the &os; versions in the article
-	  <ulink url="&url.base;/doc/en_US.ISO8859-1/articles/version-guide/">
-	    Choosing the &os; Version That Is Right For You</ulink>.</para>
       </note>
 
       <para>For more information on packages please refer to section 4.4 of

Modified: head/en_US.ISO8859-1/books/dev-model/book.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/dev-model/book.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/books/dev-model/book.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -714,8 +714,7 @@
 
             <para>
                 Many committers have a special area of responsibility. These
-                roles are called hats
-                <citation><xref linkend="bsd-hats"/></citation>.
+                roles are called hats.
                 These hats can
                 be either project roles, such as public relations officer, or
                 maintainer for a certain area of the
@@ -2572,17 +2571,6 @@
             <bibliomisc role="url"><ulink url="http://election.uk.freebsd.org/candidates.html"></ulink></bibliomisc>
         </biblioentry>
 
-        <biblioentry id="bsd-hats" xreflabel="Losh, 2002">
-            <authorgroup>
-                <author><firstname>Warner</firstname><surname>Losh</surname></author>
-            </authorgroup>
-            <copyright><year>2002</year>
-                <holder>The FreeBSD Documentation Project</holder>
-            </copyright>
-            <title>Working with Hats</title>
-            <bibliomisc role="url"><ulink url="http://www.freebsd.org/doc/en/articles/hats/article.html"></ulink></bibliomisc>
-        </biblioentry>
-
         <biblioentry id="freebsd-handle-pr" xreflabel="FreeBSD, 2002C">
             <authorgroup>
                 <author><firstname>Dag-Erling</firstname><surname>Sm&oslash;rgrav</surname></author>

Modified: head/en_US.ISO8859-1/books/faq/book.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/books/faq/book.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -1310,19 +1310,6 @@
       </qandaentry>
 
       <qandaentry>
-	<question id="multiboot">
-	  <para>Can I have more than one operating system on my
-	    PC?</para>
-	</question>
-
-	<answer>
-	  <para>Have a look at <ulink
-	      url="&url.articles.multi-os;/index.html"> the multi-OS page</ulink>.
-	    </para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="windows-coexist">
 	  <para>Can &windows; co-exist with &os;?</para>
 	</question>
@@ -4804,9 +4791,7 @@ kern.sched.name: 4BSD</screen>
 	    &man.sysinstall.8;, or &man.fdisk.8; and &man.disklabel.8;.
 	    You should also install booteasy on both disks with
 	    &man.boot0cfg.8;, so that you can dual boot to the old or
-	    new system after the copying is done.  See the <ulink
-	      url="&url.articles.formatting-media;/index.html">formatting-media article</ulink>
-	    for details on this process.</para>
+	    new system after the copying is done.</para>
 
 	  <para>Now you have the new disk set up, and are ready to move
 	    the data.  Unfortunately, you cannot just blindly copy the

Modified: head/en_US.ISO8859-1/htdocs/docproj/translations.sgml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/docproj/translations.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/htdocs/docproj/translations.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -94,9 +94,6 @@
   <dd><a href="http://www.cybershade.us/freebsd/bg/fdp/split/">FreeBSD
     Documentation Project Primer for New Contributors</a></dd>
 
-  <dd><a href="http://www.cybershade.us/freebsd/bg/multi-os/">Installing and
-    Using FreeBSD With Other Operating Systems</a></dd>
-
   <dt><i>Documents currently being worked on</i></dt>
 
   <dd>FreeBSD Handbook</dd>

Modified: head/en_US.ISO8859-1/htdocs/docs/books.sgml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/docs/books.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/htdocs/docs/books.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -93,12 +93,6 @@
 
 	<!-- Articles are sorted by pathname -->
 
-	    <p><a href="&url.articles;/5-roadmap/index.html">The
-	        Roadmap for 5-STABLE</a> (5-roadmap)<br/>
-	      Describes medium-term development and release engineering
-	        plans leading to the 5-STABLE branch point.  This
-	        article is primarily of historical interest.</p>
-
           <p><a href="&url.articles;/bsdl-gpl/index.html">Why you should use
               a BSD style license for your Open Source Project</a> (bsdl-gpl)<br/>
               Describes the benefits of releasing code under a BSD
@@ -111,12 +105,6 @@
 	    <p><a href="&url.articles;/casestudy-argentina.com/index.html">Argentina.com : A Case Study</a> (casestudy-argentina.com)<br/>
 	      How FreeBSD helped a large ISP in Latin America.</p>
 
-	    <p><a href="&url.articles;/checkpoint/index.html">Integration
-	        of Checkpoint VPN-1/Firewall-1 and FreeBSD IPsec</a>
-	        (checkpoint)<br/>
-	      How to configure Checkpoint VPN-1/Firewall-1 and FreeBSD
-	        IPsec.</p>
-
 	    <p><a href="&url.articles;/committers-guide/index.html">The
 	        Committer's Guide</a> (committers-guide)<br/>
 		Introductory information for FreeBSD committers.</p>
@@ -166,15 +154,6 @@
 	      An article with some tips about the subtleties of
 	        CVSup.</p>
 
-	    <p><a href="&url.articles;/dialup-firewall/index.html">Dialup
-		firewalling with FreeBSD</a> (dialup-firewall)<br/>
-	      How to set up a firewall using PPP and ipfw over a dialup link
-		with dynamically assigned IP addresses.</p>
-
-	    <p><a href="&url.articles;/diskless-x/index.html">Creating
-	        a diskless X server</a> (diskless-x)<br/>
-	      How to create a diskless X server.</p>
-
 	    <p><a href="&url.articles;/euro/index.html">The Euro symbol
 	        on FreeBSD</a> (euro)<br/>
 	      How to configure FreeBSD and related applications to display the
@@ -200,11 +179,6 @@
 	      A description of the various font technologies in FreeBSD, and
 		how to use them with different programs.</p>
 
-	    <p><a href="&url.articles;/formatting-media/index.html">Formatting
-	        media on FreeBSD</a> (formatting-media)<br/>
-	      How to slice, partition, and format fixed and removable media on
-		FreeBSD.</p>
-
 	    <p><a href="&url.articles;/freebsd-questions/index.html">How
 	        to get the best results from the FreeBSD-questions mailing list</a>
 	        (freebsd-questions)<br/>
@@ -227,12 +201,6 @@
 	      A guide to create UFS partitions configured with journaling
 		for desktop use.</p>
 
-	    <p><a href="&url.articles;/hats/index.html">Working with Hats</a>
-	        (hats)<br/>
-	      A committer's guide to working with ``hats'' (other
-	        committers with authority over specific areas of
-		FreeBSD).</p>
-
 	    <p><a href="&url.articles;/hubs/index.html">Mirroring FreeBSD</a>
 	        (hubs)
 	      <br/>The all in one guide for mirroring the FreeBSD website,
@@ -278,11 +246,6 @@
 	      An introduction to using the MH mail reader on
 		FreeBSD.</p>
 
-	    <p><a href="&url.articles;/multi-os/index.html">Using
-	        FreeBSD with other operating systems</a> (multi-os)<br/>
-	      How to install FreeBSD alongside one or more different operating
-		systems on the same computer.</p>
-
 	    <p><a href="&url.articles;/nanobsd/index.html">Introduction
                 to NanoBSD</a> (nanobsd)<br/>
 	      Information about the NanoBSD tools, which can be used to
@@ -378,35 +341,11 @@
 	        and Solid State Devices</a> (solid-state)<br/>
 	      The use of solid state disk devices in FreeBSD.</p>
 
-	    <p><a href="&url.articles;/storage-devices/index.html">Storage Devices</a>
-	        (storage-devices)<br/>
-	      Detailed information about using storage devices with FreeBSD,
-		including ESDI disks, and SCSI disks, tape drives, and CDROM
-		drives.</p>
-
-	    <p><a href="&url.articles;/version-guide/index.html">Choosing the
-		FreeBSD Version That Is Right For You</a> (version-guide)<br/>
-	      How to decide which version of FreeBSD is right for your
-		needs.  Topics include the releases, branches, the difference
-		between -CURRENT and -STABLE, and the current scheduling goals
-		of the project.</p>
-
-	    <p><a href="&url.articles;/vinum/index.html">Bootstrapping
-	       Vinum: A Foundation for Reliable Servers</a> (vinum)<br/>
-	       A gentle introduction to failure-resilient servers and
-		step-by-step instructions for building one with Vinum.</p>
-
 	    <p><a href="&url.articles;/vm-design/index.html">Design
 	      elements of the FreeBSD VM system</a> (vm-design)<br/>
 	      An easy to follow description of the design of the FreeBSD
 	        virtual memory system.</p>
 
-	    <p><a href="&url.articles;/zip-drive/index.html">Zip-drives
-	        and FreeBSD</a> (zip-drive)<br/>
-	      How to format, mount, and use an Iomega Zip (SCSI, IDE, or
-		parallel) Drive on FreeBSD.</p>
-
-
     <h2>On other web sites</h2>
 
     <p>Various independent efforts have also produced a great deal of useful

Modified: head/en_US.ISO8859-1/htdocs/news/2000/index.sgml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/2000/index.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/htdocs/news/2000/index.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -278,7 +278,7 @@
 	href="http://www.jp.FreeBSD.org/">http://www.jp.FreeBSD.org/</a>.</p>
 
 	<p>A new article is available, explaining how to <a
-	  href="&base;/tutorials/dialup-firewall/index.html">use PPP, natd,
+	  href="http://docs.freebsd.org/doc/9.0-RELEASE/usr/share/doc/freebsd/en_US.ISO8859-1/articles/dialup-firewall/index.html">use PPP, natd,
 	  and ipfw</a> to implement a firewall with a PPP dialup
 	  connection.</p>
 

Modified: head/en_US.ISO8859-1/htdocs/news/2001/news.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/2001/news.xml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/htdocs/news/2001/news.xml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -295,7 +295,7 @@
 	  <title>Bootstrapping Vinum: A Foundation for Reliable Servers</title>
 	  <p><a href="mailto:Bob at BGPBook.Com">Bob Van Valzah</a> has submitted
 	    an article introducing <a
-	    href="&base;/doc/en_US.ISO8859-1/articles/vinum/index.html">
+	    href="http://docs.freebsd.org/doc/9.0-RELEASE/usr/share/doc/freebsd/en_US.ISO8859-1/articles/vinum/index.html">
 	    failure-resilient servers and step-by-step instructions
             for building one with Vinum</a>.</p>
 	</event>

Modified: head/en_US.ISO8859-1/htdocs/news/2002/news.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/2002/news.xml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/htdocs/news/2002/news.xml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -809,7 +809,7 @@
 
           <p>Aaron Kaplan has submitted a new article explaining how to
             adjust your system configuration to use the new <a
-              href="&base;/doc/en_US.ISO8859-1/articles/euro/article.html">Euro
+              href="http://docs.freebsd.org/doc/9.0-RELEASE/usr/share/doc/freebsd/en_US.ISO8859-1/articles/euro/index.html">Euro
               symbol on FreeBSD</a>.</p>
         </event>
       </day>

Modified: head/en_US.ISO8859-1/htdocs/news/2005/news.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/2005/news.xml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/htdocs/news/2005/news.xml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -409,7 +409,7 @@
 	  <title>New Article: Choosing a FreeBSD Version</title>
 
 	  <p>A new article, <a
-	    href="&base;/doc/en_US.ISO8859-1/articles/version-guide/">
+	    href="http://docs.freebsd.org/doc/9.0-RELEASE/usr/share/doc/freebsd/en_US.ISO8859-1/articles/version-guide/index.html">
 	    Choosing the FreeBSD Version That Is Right For You</a>,
 	    discusses considerations that should go into the selection
 	    of the most suitable version of FreeBSD for individual needs.

Modified: head/en_US.ISO8859-1/htdocs/news/status/report-2003-01-2003-02.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/report-2003-01-2003-02.xml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2003-01-2003-02.xml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -20,8 +20,8 @@
       projects.  FreeBSD 5.1 is expected to ship in late May or early
       June, with 5.2 following at the end of summer.  A roadmap for
       the push to 5-STABLE is available at <a
-      href="http://www.FreeBSD.org/doc/en/articles/5-roadmap">
-      http://www.FreeBSD.org/doc/en/articles/5-roadmap</a>.  Although
+      href="http://docs.freebsd.org/doc/5.2-RELEASE/usr/share/doc/en_US.ISO8859-1/articles/5-roadmap/index.html">
+      http://docs.freebsd.org/doc/5.2-RELEASE/usr/share/doc/en_US.ISO8859-1/articles/5-roadmap/index.html</a>.  Although
       the 5.x series isn't expected to fully stabilize until the 5.2
       release, 5.1 promises to be an exciting release and a significant
       improvement over 5.0 in terms of speed and stability.</p>

Modified: head/en_US.ISO8859-1/htdocs/projects/newbies.sgml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/projects/newbies.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/htdocs/projects/newbies.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -53,11 +53,7 @@
     <h2><a name="fbsd">Learning about &os;</a></h2>
 
     <ul>
-      <li><p>If you have not yet installed, and have not yet decided
-	  which version of &os; is the best for your needs, the <a
-	  href="&url.articles;/version-guide/index.html">Choosing
-	  the &os; Version That Is Right For You</a> article is meant
-	  to help you to decide.  You should most probably look for the
+      <li><p>You should most probably look for the
 	  <a href="&u.rel.announce;">latest mainstream release</a>.
           (See the Handbook for why you should <strong>not</strong> be tempted
           by any of the other branches.) Before you begin, carefully read the

Modified: head/en_US.ISO8859-1/htdocs/releases/5.1R/early-adopter.html
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/5.1R/early-adopter.html	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/htdocs/releases/5.1R/early-adopter.html	Thu Sep 20 14:33:30 2012	(r39585)
@@ -167,7 +167,7 @@
          target="_top">``FreeBSD Release Engineering''</a> article.
         Specific issues for the upcoming 5-STABLE development
         branch can be found in <a
-        href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/5-roadmap/index.html"
+        href="http://docs.freebsd.org/doc/5.1-RELEASE/usr/share/doc/en_US.ISO8859-1/articles/5-roadmap/index.html"
          target="_top">``The Roadmap for 5-STABLE''</a>.</p>
       </div>
 

Modified: head/en_US.ISO8859-1/htdocs/releases/5.1R/schedule.sgml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/5.1R/schedule.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/htdocs/releases/5.1R/schedule.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -36,7 +36,7 @@
 
 <p>FreeBSD 5.1 will continue to be released from the 5-CURRENT development
   stream.  For more details about the milestones for reaching
-  5-STABLE, see the <a href="&base;/doc/en/articles/5-roadmap">5-STABLE
+  5-STABLE, see the <a href="http://docs.freebsd.org/doc/5.1-RELEASE/usr/share/doc/en_US.ISO8859-1/articles/5-roadmap/index.html">5-STABLE
   Roadmap</a> page.</p>
 
 <p>The current release engineering <a

Modified: head/en_US.ISO8859-1/htdocs/releases/5.2.1R/early-adopter.html
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/5.2.1R/early-adopter.html	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/htdocs/releases/5.2.1R/early-adopter.html	Thu Sep 20 14:33:30 2012	(r39585)
@@ -141,7 +141,7 @@ pages</a> and in the <a
 href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/releng/index.html"
 target="_top">``FreeBSD Release Engineering''</a> article. Specific issues for the
 upcoming 5-STABLE development branch can be found in <a
-href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/5-roadmap/index.html"
+href="http://docs.freebsd.org/doc/5.2.1-RELEASE/usr/share/doc/en_US.ISO8859-1/articles/5-roadmap/index.html"
 target="_top">``The Roadmap for 5-STABLE''</a>.</p>
 </div>
 

Modified: head/en_US.ISO8859-1/htdocs/releases/5.2R/early-adopter.html
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/5.2R/early-adopter.html	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/htdocs/releases/5.2R/early-adopter.html	Thu Sep 20 14:33:30 2012	(r39585)
@@ -141,7 +141,7 @@ pages</a> and in the <a
 href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/releng/index.html"
 target="_top">``FreeBSD Release Engineering''</a> article. Specific issues for the
 upcoming 5-STABLE development branch can be found in <a
-href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/5-roadmap/index.html"
+href="http://docs.freebsd.org/doc/5.2-RELEASE/usr/share/doc/en_US.ISO8859-1/articles/5-roadmap/index.html"
 target="_top">``The Roadmap for 5-STABLE''</a>.</p>
 </div>
 

Modified: head/en_US.ISO8859-1/htdocs/releases/5.2R/schedule.sgml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/5.2R/schedule.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/htdocs/releases/5.2R/schedule.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -31,7 +31,7 @@
 
 <p>FreeBSD 5.2 will continue to be released from the 5-CURRENT development
   stream.  For more details about the milestones for reaching
-  5-STABLE, see the <a href="&base;/doc/en/articles/5-roadmap">5-STABLE
+  5-STABLE, see the <a href="http://docs.freebsd.org/doc/5.2-RELEASE/usr/share/doc/en_US.ISO8859-1/articles/5-roadmap/index.html">5-STABLE
   Roadmap</a> page.</p>
 
 <p>The current release engineering <a

Modified: head/en_US.ISO8859-1/htdocs/releng/index.sgml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releng/index.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/en_US.ISO8859-1/htdocs/releng/index.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -400,22 +400,6 @@
 	    ports cluster, how to split up the packages for the release
 	    media, and how to verify that a package set is
 	    consistent.</small></p></li>
-
-    <li><p><a href="&base;/doc/en_US.ISO8859-1/articles/5-roadmap/index.html">FreeBSD
-	  5-STABLE Roadmap</a><br/>
-
-	  <small>Described the roadmap for the project for reaching the RELENG_5
-	    branch.  Included overall status of 5.x, what was left to be done, and
-	    tentative schedules.  Note that this document is now mainly of
-	    historical interest.</small></p></li>
-
-    <li><p><a href="&base;/doc/en_US.ISO8859-1/articles/version-guide/index.html">Choosing
-	  the FreeBSD Version That Is Right For You</a><br/>
-
-	  <small>How to decide which version of FreeBSD is right for your
-	    needs.  Topics include the releases, branches, the difference
-	    between -CURRENT and -STABLE, and the current scheduling goals
-	    of the project.</small></p></li>
   </ul>
 
   <h2><a name="team" id="team">Release Engineering Team</a></h2>

Modified: head/es_ES.ISO8859-1/articles/Makefile
==============================================================================
--- head/es_ES.ISO8859-1/articles/Makefile	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/es_ES.ISO8859-1/articles/Makefile	Thu Sep 20 14:33:30 2012	(r39585)
@@ -5,8 +5,6 @@ SUBDIR =
 SUBDIR+= casestudy-argentina.com
 SUBDIR+= contributing
 SUBDIR+= cvs-freebsd
-SUBDIR+= dialup-firewall
-SUBDIR+= euro
 SUBDIR+= explaining-bsd
 SUBDIR+= fbsd-from-scratch
 SUBDIR+= fdp-es
@@ -19,8 +17,6 @@ SUBDIR+= p4-primer
 SUBDIR+= problem-reports
 SUBDIR+= pxe
 SUBDIR+= releng
-SUBDIR+= version-guide
-SUBDIR+= zip-drive
 
 DOC_PREFIX?= ${.CURDIR}/../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"

Modified: head/es_ES.ISO8859-1/articles/linux-users/article.sgml
==============================================================================
--- head/es_ES.ISO8859-1/articles/linux-users/article.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/es_ES.ISO8859-1/articles/linux-users/article.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -145,11 +145,6 @@ in your /etc/rc.conf. Extra options can 
            url="ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/Latest/"/>
           si quiere descargar los packages más recientes compilados
 	   para la versión 6.X.</para>
-
-	<para>Si quiere saber más sobre las versiones de &os;
-	  consulte el artículo <ulink
-	     url="&url.base;/doc/es_ES.ISO8859-1/articles/version-guide/">
-	    Cómo elegir la versión apropriada de &os;</ulink>.</para>
       </note>
 
       <para>Para más información sobre los packages consulte

Modified: head/fr_FR.ISO8859-1/articles/Makefile
==============================================================================
--- head/fr_FR.ISO8859-1/articles/Makefile	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/fr_FR.ISO8859-1/articles/Makefile	Thu Sep 20 14:33:30 2012	(r39585)
@@ -12,13 +12,9 @@ SUBDIR+= contributing
 SUBDIR+= contributing-ports
 SUBDIR+= contributors
 SUBDIR+= cvsup-advanced
-SUBDIR+= dialup-firewall
-SUBDIR+= diskless-x
-SUBDIR+= euro
 SUBDIR+= explaining-bsd
 SUBDIR+= filtering-bridges
 SUBDIR+= fonts
-SUBDIR+= formatting-media
 SUBDIR+= ip-aliasing
 SUBDIR+= ipsec-must
 SUBDIR+= java-tomcat
@@ -26,7 +22,6 @@ SUBDIR+= laptop
 SUBDIR+= linux-users
 SUBDIR+= make-world
 SUBDIR+= mh
-SUBDIR+= multi-os
 SUBDIR+= nanobsd
 SUBDIR+= new-users
 SUBDIR+= ntfs
@@ -37,7 +32,6 @@ SUBDIR+= problem-reports
 SUBDIR+= programming-tools
 SUBDIR+= pxe
 SUBDIR+= releng-packages
-SUBDIR+= zip-drive
 
 ROOT_SYMLINKS+= new-users
 

Modified: head/fr_FR.ISO8859-1/articles/linux-users/article.sgml
==============================================================================
--- head/fr_FR.ISO8859-1/articles/linux-users/article.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/fr_FR.ISO8859-1/articles/linux-users/article.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -168,12 +168,6 @@ in your /etc/rc.conf. Extra options can 
 	  &agrave; <envar>PACKAGESITE</envar> pour
 	  télécharger les paquetages les plus
 	  récents construits pour les versions 6.X.</para>
-
-	<para>Vous pouvez en savoir plus sur les versions de &os; dans
-	  l'article <ulink
-	  url="&url.base;/doc/en_US.ISO8859-1/articles/version-guide/">
-	  Choisir la version de &os; qui vous convient le
-	  mieux</ulink>.</para>
       </note>
 
       <para>Pour plus d'information concernant les paquetages vous

Modified: head/fr_FR.ISO8859-1/htdocs/docproj/translations.sgml
==============================================================================
--- head/fr_FR.ISO8859-1/htdocs/docproj/translations.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/fr_FR.ISO8859-1/htdocs/docproj/translations.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -114,9 +114,6 @@
   <dd><a href="http://www.cybershade.us/freebsd/bg/fdp/split/">Introduction au Projet de
     Documentation de FreeBSD pour les nouveaux participants</a></dd>
 
-  <dd><a href="http://www.cybershade.us/freebsd/bg/multi-os/">Installer et
-    Utiliser FreeBSD avec d'autres Systèmes d'Exploitation</a></dd>
-
   <dt><i>Documents en cours de traduction</i></dt>
 
   <dd>Manuel de référence FreeBSD</dd>

Modified: head/fr_FR.ISO8859-1/htdocs/docs/books.sgml
==============================================================================
--- head/fr_FR.ISO8859-1/htdocs/docs/books.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/fr_FR.ISO8859-1/htdocs/docs/books.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -116,14 +116,6 @@
 
 	  <!-- Articles are sorted by pathname -->
 
-	<p><a
-	  href="&enbase;/doc/en_US.ISO8859-1/articles/5-roadmap/index.html">Le
-	  planning de développement de la 5-STABLE.</a>
-	  (5-roadmap)<br/>
-	  Décrit les projets de développement &agrave;
-	  moyen terme et de production de version menant &agrave; la
-	  branche 5-STABLE.</p>
-
 	<p><a href="&enbase;/&url.articles;/bsdl-gpl/index.html">Pourquoi
 	  devriez-vous utiliser une licence de type BSD pour votre
 	  projet de logiciel libre</a> (bsdl-gpl)<br/>
@@ -142,13 +134,6 @@
 	  Amérique latine.</p>
 
 	<p><a
-	  href="&enbase;/doc/en_US.ISO8859-1/articles/checkpoint/index.html">Intégration
-	  de Checkpoint VPN-1/Firewall-1 et FreeBSD IPsec.</a>
-	  (checkpoint)<br/>
-	  Comment configurer Checkpoint VPN-1/Firewall-1 et FreeBSD
-	  IPsec.</p>
-
-	<p><a
 	  href="&enbase;/doc/&url.doc.langcode;/articles/committers-guide/index.html">Le
 	  Guide du "Committer"</a> (committers-guide)<br/>
 	  Informations pour les "committers" FreeBSD.></p>
@@ -192,23 +177,6 @@
 	  Un article avec quelques astuces sur les subtilités
 	  de CVSup.</p>
 
-	<p><a href="&enbase;/doc/&url.doc.langcode;/articles/dialup-firewall/index.html">Firewall
-	  avec connexion modem sous FreeBSD</a> (dialup-firewall)<br/>
-	  Comment mettre en place un firewall en utilisant PPP et ipfw
-	  avec une connexion modem et des adresses IP dynamiques.</p>
-
-	<p><a
-	  href="&enbase;/doc/&url.doc.langcode;/articles/diskless-x/index.html">Mise
-	  en oeuvre d'un terminal X sans disque dur</a>
-	  (diskless-x)<br/>
-	  Comment mettre en place un terminal X sans disque dur.</p>
-
-	<p><a
-	  href="&enbase;/doc/&url.doc.langcode;/articles/euro/article.html">Le
-	  symbole Euro sous FreeBSD</a> (euro)<br/>
-	  Comment configurer FreeBSD et les applications pour afficher
-	  le symbole Euro.</p>
-
 	<p><a
 	  href="&enbase;/doc/en_US.ISO8859-1/articles/explaining-bsd/index.html">Expliquer
 	  BSD</a> (explaining-bsd)<br/>
@@ -235,13 +203,6 @@
 	  programmes.</p>
 
 	<p><a
-	  href="&enbase;/doc/&url.doc.langcode;/articles/formatting-media/index.html">Formatage
-	  des supports de données sous FreeBSD</a>
-	  (formatting-media)<br/>
-	  Comment découper, partitionner et formater les
-	  supports fixes et amovibles sous FreeBSD.</p>
-
-	<p><a
 	  href="&enbase;/doc/en_US.ISO8859-1/articles/freebsd-questions/index.html">Comment
 	  obtenir les meilleurs résultats sur la liste de
 	  diffusion FreeBSD-questions</a> (freebsd-questions)<br/>
@@ -250,13 +211,6 @@
 	  diffusion -questions.</p>
 
 	<p><a
-	  href="&enbase;/doc/en_US.ISO8859-1/articles/hats/index.html">Travailler
-	  avec les "chefs"</a> (hats)<br/>
-	  Un guide du "committer" pour travailler avec les "chefs"
-	  (d'autres "committers" qui ont autorité sur certaines
-	  parties spécifiques de FreeBSD).</p>
-
-	<p><a
 	  href="&enbase;/doc/en_US.ISO8859-1/articles/hubs/index.html">Créer
 	  un site miroir de FreeBSD</a> (hubs)<br/>
 	  Le guide complet pour créer un miroir du site web
@@ -298,14 +252,6 @@
 	  Une introduction &agrave; l'utilisation du lecteur de
 	  courrier électronique MH sur FreeBSD.</p>
 
-	<p><a
-	  href="&enbase;/doc/&url.doc.langcode;/articles/multi-os/index.html">Utiliser
-	  FreeBSD avec d'autres systèmes d'exploitation</a>
-	  (multi-os)<br/>
-	  Comment installer FreeBSD en plus d'un ou plusieurs
-	  systèmes d'exploitation différents sur le
-	  même ordinateur.</p>
-
 	<p><a href="&enbase;/doc/&url.doc.langcode;/articles/new-users/index.html">Premiers
 	  Pas avec FreeBSD</a> (new-users)<br/>
 	  Pour les nouveaux venus &agrave; FreeBSD et &unix;.</p>
@@ -406,43 +352,12 @@
 	  &agrave; état solide sous FreeBSD.</p>
 
 	<p><a
-	  href="&enbase;/doc/en_US.ISO8859-1/articles/storage-devices/index.html">Les
-	  Périphériques de Stockage</a>
-	  (storage-devices)<br/>
-	  Informations détaillées sur l'utilisation des
-	  périphériques de stockage avec FreeBSD,
-	  notamment les disques ESDI et SCSI, les lecteurs de bandes
-	  et les lecteurs de CDROM.</p>
-
-	<p><a href="&enbase;/&url.articles;/version-guide/index.html">Choisir la
-	  bonne version de FreeBSD</a> (version-guide)<br/>
-	  Comment décider quelle version de FreeBSD est la plus
-	  adaptée &agrave; vos besoins.  Parmi les sujets
-	  abordés, les versions officielles, les branches, les
-	  différences entre -CURRENT et -STABLE, et les
-	  objectifs de planification actuels du projet.</p>
-
-	<p><a
-	  href="&enbase;/doc/en_US.ISO8859-1/articles/vinum/index.html">Aborder
-	  Vinum: une base pour des serveurs &agrave; haute
-	  fiabilité</a> (vinum)<br/>
-	  Une première introduction aux serveurs &agrave;
-	  tolérance de panne et un guide pas-&agrave;-pas pour
-	  en construire un avec l'aide de Vinum.</p>
-
-	<p><a
 	  href="&enbase;/doc/en_US.ISO8859-1/articles/vm-design/index.html">Conception
 	  du système de mémoire virtuelle de FreeBSD</a>
 	  (vm-design)<br/>
 	  Une description simple d'accès de la conception du
 	  système de mémoire virtuelle de FreeBSD.</p>
 
-	<p><a
-	  href="&enbase;/doc/&url.doc.langcode;/articles/zip-drive/index.html">Les
-	  lecteurs Zip et FreeBSD</a> (zip-drive)<br/>
-	  Comment formater, monter et utiliser un Zip Iomega (SCSI,
-	  IDE, ou parallèle) sous FreeBSD.</p>
-
     <h2>Sur d'autres sites web</h2>
 
       <p>Divers efforts indépendants ont aussi produit une

Modified: head/fr_FR.ISO8859-1/htdocs/news/2000/index.sgml
==============================================================================
--- head/fr_FR.ISO8859-1/htdocs/news/2000/index.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/fr_FR.ISO8859-1/htdocs/news/2000/index.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -285,7 +285,7 @@
 	href="http://www.jp.FreeBSD.org/">http://www.jp.FreeBSD.org/</a>.</p>
 
 	<p>Nouvel article qui explique comment <a
-	  href="&base;/tutorials/dialup-firewall/index.html">utiliser PPP, natd,
+	  href="http://docs.freebsd.org/doc/9.0-RELEASE/usr/share/doc/freebsd/en_US.ISO8859-1/articles/dialup-firewall/index.html">utiliser PPP, natd,
 	  et ipfw</a> pour mettre en place un firewall avec une connexion
 	  PPP en dialup.</p>
 

Modified: head/fr_FR.ISO8859-1/htdocs/news/2001/news.xml
==============================================================================
--- head/fr_FR.ISO8859-1/htdocs/news/2001/news.xml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/fr_FR.ISO8859-1/htdocs/news/2001/news.xml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -314,7 +314,7 @@
 	  <title>"Bootstrapping" Vinum : une base pour des serveurs fiables</title>
 	  <p><a href="mailto:Bob at BGPBook.Com">Bob Van Valzah</a> propose
 	    un article d'introduction <a
-	    href="$base/../doc/en_US.ISO8859-1/articles/vinum/index.html">
+	    href="http://docs.freebsd.org/doc/9.0-RELEASE/usr/share/doc/freebsd/en_US.ISO8859-1/articles/vinum/index.html">
 	    aux serveurs à haute-disponibilité et décrit les étapes à suivre
             pour réaliser ce type de serveur avec l'aide de Vinum</a>.</p>
 	</event>

Modified: head/fr_FR.ISO8859-1/htdocs/news/2002/news.xml
==============================================================================
--- head/fr_FR.ISO8859-1/htdocs/news/2002/news.xml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/fr_FR.ISO8859-1/htdocs/news/2002/news.xml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -836,7 +836,7 @@
 
           <p>Aaron Kaplan a réalisé un nouvel article qui explique comment
             configurer votre système pour utiliser le nouveau <a
-              href="$base/../doc/fr_FR.ISO8859-1/articles/euro/article.html">symbole
+              href="http://docs.freebsd.org/doc/9.0-RELEASE/usr/share/doc/freebsd/fr_FR.ISO8859-1/articles/euro/index.html">symbole
               Euro sur FreeBSD</a>.</p>
         </event>
       </day>

Modified: head/fr_FR.ISO8859-1/htdocs/releng/index.sgml
==============================================================================
--- head/fr_FR.ISO8859-1/htdocs/releng/index.sgml	Thu Sep 20 09:34:39 2012	(r39584)
+++ head/fr_FR.ISO8859-1/htdocs/releng/index.sgml	Thu Sep 20 14:33:30 2012	(r39585)
@@ -277,25 +277,6 @@
         configurer un groupe de machines pour en faire un "cluster de ports", comment
         regrouper les paquetages pour le media utilisé et comment vérifier la cohérence
         d'un ensemble de paquetages.</small></p></li>
-
-  <li><p><a
-        href="&enbase;/doc/en_US.ISO8859-1/articles/5-roadmap/index.html">Feuille de route de FreeBSD
-        5-STABLE</a><br/>
-
-      <small>Décrit la feuille de route du projet pour atteindre la branche RELENG_5.
-        Incluait le statut général de 5.x, ce qu'il restait &agrave; faire et
-        des plannings (provisoires).  Notez que ce document a maintenant un intérêt
-        principalement historique.</small></p></li>
-
-  <li><p><a
-	href="&enbase;/doc/en_US.ISO8859-1/articles/version-guide/index.html">Choisir
-	la bonne version de FreeBSD</a><br/>
-
-      <small>Comment décider quelle version de FreeBSD est la plus
-	adaptée &agrave; vos besoins.  Parmi les sujets abordés, les versions officielles, les branches, les différences
-	entre -CURRENT et -STABLE, et les objectifs de planification actuels
-	du projet.</small></p></li>
-
 </ul>
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-doc-all mailing list