Overhaul doc section (move outdated manuals to obsolete.wml; some cosmetic; see #922222)

7 files changed, 81 insertions, 93 deletions

diff --git a/english/doc/ddp.wml b/english/doc/ddp.wml
index aa8ea1bfae8..5a0417c0535 100644
--- a/english/doc/ddp.wml
+++ b/english/doc/ddp.wml
@@ -72,4 +72,7 @@ users. Caveat emptor.</p>
       and
       <a href="devel-manuals#debmake-doc">Guide for Debian Maintainers</a></li>
   <li><a href="obsolete#repo">Debian Repository HOWTO</a>, outdated after introduction of secure APT</li>
+  <li><a href="devel-manuals#i18n">Introduction to i18n</a>, stalled</li>
+  <li><a href="misc-manuals#sgml-howto">Debian SGML/XML HOWTO</a>, stalled, obsolete</li>
+  <li><a href="misc-manuals#markup">Debiandoc-SGML Markup Manual</a>, stalled; DebianDoc is about to being removed</li>
 </ul>
diff --git a/english/doc/devel-manuals.defs b/english/doc/devel-manuals.defs
index a3d9f1d5133..40e9338bf4d 100644
--- a/english/doc/devel-manuals.defs
+++ b/english/doc/devel-manuals.defs
@@ -67,7 +67,7 @@
             langs=""
             formats="html txt pdf"
             srctype="SGML"
-            vcstype="ddp"
+            vcstype="attic"
             />
 </define-tag>
 
diff --git a/english/doc/devel-manuals.wml b/english/doc/devel-manuals.wml
index 4fae643a0c9..b6dee3ef44d 100644
--- a/english/doc/devel-manuals.wml
+++ b/english/doc/devel-manuals.wml
@@ -193,55 +193,6 @@ package, and packaging the <code>gnujump</code> game and a Java library.
 
 <hr>
 
-<document "Introduction to i18n" "i18n">
-
-<div class="centerblock">
-<p>
-  This document describes basic idea and howto of l10n (localization),
-  i18n (internationalization), and m17n (multilingualization) for
-  programmers and package maintainers.
-
-  <p>The aim of this document is to make more packages support i18n
-  and to make Debian a more internationalized distribution.
-  Contributions from all over the world will be welcome, because
-  the original author is Japanese-speaker and this document would be
-  on Japanization if there were no contributions.
-
-<doctable>
-  <authors "Tomohiro KUBOTA (&#20037;&#20445;&#30000;&#26234;&#24195;)">
-  <maintainer "Tomohiro KUBOTA (&#20037;&#20445;&#30000;&#26234;&#24195;)">
-  <status>
-  in development
-  </status>
-  <availability>
-  not yet complete
-  <inddpsvn-intro-i18n>
-  </availability>
-</doctable>
-</div>
-
-<hr>
-
-<document "Debian XML/SGML Policy" "xml-sgml-policy">
-
-<div class="centerblock">
-<p>
-  Subpolicy for Debian packages that provide and/or make use
-  of XML or SGML resources.
-
-<doctable>
-  <authors "Mark Johnson, Ardo van Rangelrooij, Adam Di Carlo">
-  <status>
-  starting, merging in current SGML policy from <tt>sgml-base-doc</tt>
-  and new materials for XML catalog management
-  </status>
-  <availability>
-  <inddpsvn-xml-sgml-policy>
-  </availability>
-</doctable>
-</div>
-<hr>
-
 <document "Debian Installer internals" "d-i-internals">
 
 <div class="centerblock">
diff --git a/english/doc/index.wml b/english/doc/index.wml
index 1e7d8b09983..572a05be740 100644
--- a/english/doc/index.wml
+++ b/english/doc/index.wml
@@ -70,7 +70,10 @@ topics.</p>
       <li><a href="user-manuals#quick-reference">Debian Reference</a></li>
       <li><a href="user-manuals#securing">Securing Debian Manual</a></li>
       <li><a href="user-manuals#aptitude">aptitude user's manual</a></li>
+      <li><a href="user-manuals#apt-guide">APT User's Guide</a></li>
+      <li><a href="user-manuals#apt-offline">Using APT Offline</a></li>
       <li><a href="user-manuals#java-faq">Debian GNU/Linux and Java FAQ</a></li>
+      <li><a href="user-manuals#hamradio-maintguide">Debian Hamradio Maintainer’s Guide</a></li>
     </ul>
 
   </div>
@@ -85,7 +88,6 @@ topics.</p>
       <li><a href="devel-manuals#maint-guide">Debian New Maintainers' Guide</a></li>
       <li><a href="devel-manuals#packaging-tutorial">Introduction to Debian packaging</a></li>
       <li><a href="devel-manuals#menu">Debian Menu System</a></li>
-      <li><a href="devel-manuals#i18n">Introduction to i18n</a></li>
       <li><a href="devel-manuals#d-i-internals">Debian Installer internals</a></li>
       <li><a href="devel-manuals#dbconfig-common">Guide for database using package maintainers</a></li>
       <li><a href="devel-manuals#dbapp-policy">Policy for packages using databases</a></li>
@@ -94,8 +96,6 @@ topics.</p>
     <h4><a href="misc-manuals">Miscellaneous manuals</a></h4>
     <ul>
       <li><a href="misc-manuals#history">Debian Project History</a></li>
-      <li><a href="misc-manuals#markup">Debiandoc-SGML Markup Manual</a></li>
-      <li><a href="misc-manuals#sgml-howto">Debian SGML/XML HOWTO</a></li>
     </ul>
 
   </div>
diff --git a/english/doc/misc-manuals.wml b/english/doc/misc-manuals.wml
index b025afb5f94..61ff13deefc 100644
--- a/english/doc/misc-manuals.wml
+++ b/english/doc/misc-manuals.wml
@@ -22,31 +22,4 @@
 </doctable>
 </div>
 
-<hr>
-
-<document "DebianDoc-SGML Markup Manual" "markup">
-
-<div class="centerblock">
-<p>
-  Documentation for the <strong>debiandoc-sgml</strong> system,
-  including best practices and hints for maintainers. Future versions
-  should includes tips for easier maintenance and building of
-  documentation in Debian packages, guidelines for organizing
-  translation of documentation, and other helpful information.
-  See also <a href="https://bugs.debian.org/43718">bug #43718</a>.
-
-<doctable>
-  <authors "Ian Jackson, Ardo van Rangelrooij">
-  <maintainer "Ardo van Rangelrooij">
-  <status>
-  ready
-  </status>
-  <availability>
-  <inpackage "debiandoc-sgml-doc">
-  <inddpcvs-debiandoc-sgml-doc>
-  </availability>
-</doctable>
-</div>
-
-<hr>
 
diff --git a/english/doc/obsolete.wml b/english/doc/obsolete.wml
index f028960284b..77957a66cd3 100644
--- a/english/doc/obsolete.wml
+++ b/english/doc/obsolete.wml
@@ -215,6 +215,8 @@ which someone else is administering.
 </doctable>
 </div>
 
+<hr />
+
 <document "APT HOWTO" "apt-howto">
 
 <div class="centerblock">
@@ -230,7 +232,7 @@ which someone else is administering.
    obsolete since 2009
   </status>
   <availability>
-  <inpackage "apt-howto">
+#  <inpackage "apt-howto">
   <inddpcvs name="apt-howto" langs="en ca cs de es el fr it ja pl pt-br ru uk tr zh-tw zh-cn"
 	    formats="html txt pdf ps" naming="locale" vcstype="attic"/>
   </availability>
@@ -301,6 +303,8 @@ which someone else is administering.
 </doctable>
 </div>
 
+<hr />
+
 <document "How Software Producers can distribute their products directly in .deb format" "swprod">
 
 <div class="centerblock">
@@ -328,30 +332,37 @@ which someone else is administering.
 </doctable>
 </div>
 
-<hr>
-
-<h2 id="misc">Miscellaneous documentation</h2>
+<hr />
 
-<document "Debian Repository HOWTO" "repo">
+<document "Introduction to i18n" "i18n">
 
 <div class="centerblock">
 <p>
-  This document explains how Debian repositories work, how to create
-  them, and how to add them to the <tt>sources.list</tt> correctly.
-</p>
+  This document describes basic idea and howto of l10n (localization),
+  i18n (internationalization), and m17n (multilingualization) for
+  programmers and package maintainers.
+
+  <p>The aim of this document is to make more packages support i18n
+  and to make Debian a more internationalized distribution.
+  Contributions from all over the world will be welcome, because
+  the original author is Japanese-speaker and this document would be
+  on Japanization if there were no contributions.
+
 <doctable>
-  <authors "Aaron Isotton">
-  <maintainer "Aaron Isotton">
+  <authors "Tomohiro KUBOTA (&#20037;&#20445;&#30000;&#26234;&#24195;)">
+  <maintainer "Tomohiro KUBOTA (&#20037;&#20445;&#30000;&#26234;&#24195;)">
   <status>
-  ready (?)
+  stalled, obsolete
   </status>
   <availability>
-  <inddpcvs name="repository-howto" index="repository-howto"
-            formats="html" langs="en fr de uk ta" vcstype="attic">
+  not yet complete
+  <inddpsvn-intro-i18n>
   </availability>
 </doctable>
 </div>
 
+<hr />
+
 <document "Debian SGML/XML HOWTO" "sgml-howto">
 
 <div class="centerblock">
@@ -376,3 +387,51 @@ which someone else is administering.
   </availability>
 </doctable>
 </div>
+
+<hr />
+
+<document "DebianDoc-SGML Markup Manual" "markup">
+
+<div class="centerblock">
+<p>
+  Documentation for the <strong>debiandoc-sgml</strong> system,
+  including best practices and hints for maintainers. Future versions
+  should includes tips for easier maintenance and building of
+  documentation in Debian packages, guidelines for organizing
+  translation of documentation, and other helpful information.
+  See also <a href="https://bugs.debian.org/43718">bug #43718</a>.
+
+<doctable>
+  <authors "Ian Jackson, Ardo van Rangelrooij">
+  <maintainer "Ardo van Rangelrooij">
+  <status>
+  ready
+  </status>
+  <availability>
+  <inpackage "debiandoc-sgml-doc">
+  <inddpcvs-debiandoc-sgml-doc>
+  </availability>
+</doctable>
+</div>
+
+<h2 id="misc">Miscellaneous documentation</h2>
+
+<document "Debian Repository HOWTO" "repo">
+
+<div class="centerblock">
+<p>
+  This document explains how Debian repositories work, how to create
+  them, and how to add them to the <tt>sources.list</tt> correctly.
+</p>
+<doctable>
+  <authors "Aaron Isotton">
+  <maintainer "Aaron Isotton">
+  <status>
+  ready (?)
+  </status>
+  <availability>
+  <inddpcvs name="repository-howto" index="repository-howto"
+            formats="html" langs="en fr de uk ta" vcstype="attic">
+  </availability>
+</doctable>
+</div>
diff --git a/english/doc/user-manuals.wml b/english/doc/user-manuals.wml
index 15ed4637080..9b7d4ca13e0 100644
--- a/english/doc/user-manuals.wml
+++ b/english/doc/user-manuals.wml
@@ -302,6 +302,8 @@ and programs related to building a Free Software Java environment.
 </doctable>
 </div>
 
+<hr />
+
 <document "Debian Hamradio Maintainer’s Guide" "hamradio-maintguide">
 
 <div class="centerblock">