Commit 7c2086ef authored by Josip Rodin's avatar Josip Rodin

moved admin-manuals into user-manuals, and all the related changes

CVS version numbers

english/sitemap.wml: 1.25 -> 1.26 
english/News/weekly/2001/24/index.wml: 1.7 -> 1.8 
english/News/weekly/2001/25/index.wml: 1.7 -> 1.8 
english/doc/Makefile: 1.16 -> 1.17 
english/doc/admin-manuals.defs: 1.2 -> 1.3(DEAD) 
english/doc/admin-manuals.wml: 1.32 -> 1.33(DEAD) 
english/doc/ddp.wml: 1.31 -> 1.32 
english/doc/index.wml: 1.49 -> 1.50 
english/doc/user-manuals.wml: 1.30 -> 1.31 
english/doc/version.defs: INITIAL -> 1.1 
english/security/index.wml: 1.45 -> 1.46
parent ed2f7458
......@@ -53,7 +53,7 @@ href="http://www.debian.org/doc/manuals/securing-debian-howto/">Securing
Debian HOWTO</a> which was formerly edited by Alexander Reelsen. If you can
afford some spare time dedicated to this task, please help Javi by providing
patches to the current CVS version of the document, see <a
href="http://www.debian.org/doc/admin-manuals#securing">here</a> for details.</p>
href="$(HOME)/doc/user-manuals#securing">here</a> for details.</p>
<p><strong>Debian Mirror Infrastructure.</strong> There have been intermittent
problems with the mirror infrastructure over the last year or so, but we
......
......@@ -7,7 +7,7 @@ formed to coordinate and unify all efforts to write more and better
documentation for the Debian system. It contains quite a lot documents,
ranging from a <a href="$(HOME)/doc/FAQ/">FAQ</a>, several <a
href="$(HOME)/doc/user-manuals">users manuals</a>, some <a
href="$(HOME)/doc/admin-manuals">administration</a> and <a
href="$(HOME)/doc/user-manuals">administration</a> and <a
href="$(HOME)/doc/manuals/network-administrator/">network
manuals</a> concluding with the <a
href="$(HOME)/doc/manuals/securing-debian-howto/">Securing
......
......@@ -15,8 +15,7 @@ todo.$(LANGUAGE).html: todo.wml $(TEMPLDIR)/ddp.wml
docpolicy.$(LANGUAGE).html: docpolicy.wml $(TEMPLDIR)/ddp.wml
cvs.$(LANGUAGE).html: cvs.wml $(TEMPLDIR)/ddp.wml $(ENGLISHSRCDIR)/doc/dirtree.jpg
topics.$(LANGUAGE).html: topics.wml $(TEMPLDIR)/ddp.wml
user-manuals.$(LANGUAGE).html: user-manuals.wml $(TEMPLDIR)/ddp.wml $(ENGLISHSRCDIR)/doc/manuals.defs
admin-manuals.$(LANGUAGE).html: admin-manuals.wml $(TEMPLDIR)/ddp.wml \
$(ENGLISHSRCDIR)/doc/manuals.defs $(ENGLISHSRCDIR)/doc/admin-manuals.defs
user-manuals.$(LANGUAGE).html: user-manuals.wml $(TEMPLDIR)/ddp.wml \
$(ENGLISHSRCDIR)/doc/manuals.defs $(ENGLISHSRCDIR)/doc/version.defs
devel-manuals.$(LANGUAGE).html: devel-manuals.wml $(TEMPLDIR)/ddp.wml $(ENGLISHSRCDIR)/doc/manuals.defs
misc-manuals.$(LANGUAGE).html: misc-manuals.wml $(TEMPLDIR)/ddp.wml $(ENGLISHSRCDIR)/doc/manuals.defs
#use wml::debian::ddp title="DDP Administrators' Manuals"
#include "$(ENGLISHDIR)/doc/manuals.defs"
#include "$(ENGLISHDIR)/doc/admin-manuals.defs"
<document "Debian Installation Manual" "install">
<blockquote>
Installation instructions for the Debian GNU/Linux distribution.
<doctable>
<authors "Bruce Perens, Sven Rudolph, Igor Grobman, James Treacy, Adam Di Carlo">
<maintainer "Adam Di Carlo, Chris Tillman">
<status>
Active work being done for Debian releases (2.2 and future). Need help with
non-x86 installation and non-English language versions; please volunteer,
this is very important to Debian. Contact debian-boot@lists.debian.org for
more information.
</status>
<availability>
<a href="$(HOME)/releases/stable/installmanual">Released version</a>
<br>
Also available at
<tt>ftp://ftp.debian.org/debian/dists/stable/disks-*/current/install.html</tt>
<p><a href="$(HOME)/releases/testing/installmanual">Version being prepared
for the next stable (in testing)</a>
<br>
Also available in the Debian package
<strong><a href="http://packages.debian.org/unstable/doc/install-doc.html">install-doc</a></strong>
<p><inbfdcvs>
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "Debian Release Notes" "relnotes">
<blockquote>
This document contains information on what's new in the current Debian
GNU/Linux distribution and complete upgrading information for users of
older Debian releases.
<doctable>
<authors "Adam Di Carlo, Bob Hilliard, Josip Rodin, Anne Bezemer">
<maintainer "Rob Bradford">
<status>
Active work being done for Debian releases. Help is needed to
complete the `Split packages' section. Contact debian-doc@lists.debian.org
for more information.
</status>
<availability>
<a href="$(HOME)/releases/stable/releasenotes">Released version</a>
<br>
Also available at <tt>ftp://ftp.debian.org/dists/stable/main/upgrade-*/</tt>
<p><a href="$(HOME)/releases/testing/releasenotes">Version being prepared
for the next stable (in testing)</a>
<p><inbfdcvs>
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "Debian Reference" "quick-reference">
<blockquote>
This Debian GNU/Linux reference covers many aspects of system
administration through shell-command examples. Basic tutorials, tips, and
other information are provided for topics including system installation,
Debian package management, the Linux kernel under Debian, system tuning,
building a gateway, text editors, CVS, programming, and GnuPG.
<p>Previously known as "Quick Reference".</p>
<doctable>
<authors "Osamu Aoki">
<maintainer "Osamu Aoki">
<status>
most comprehensive DDP user manual at the moment,
but still has room for improvement
</status>
<availability>
<a href="manuals/quick-reference/index.en.html">English version</a>
<a href="manuals/quick-reference/index.fr.html">French version</a>
<a href="manuals/quick-reference/index.it.html">Italian version</a>
<br>
<inddpcvs "quick-reference">
<br>
Development version hosted at <a href="http://qref.sf.net/">qref.sf.net</a>.
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "APT HOWTO" "apt-howto">
<blockquote>
This manual tries to be a quick but complete source of information
about the APT system and its features. It contains much information
about the main uses of APT and many examples.
<doctable>
<authors "Gustavo Noronha Silva">
<maintainer "Gustavo Noronha Silva">
<status>
ready
</status>
<availability>
<inpackage "apt-howto">
<released "manuals/apt-howto/index.en.html">
<a href="manuals/apt-howto/index.pt-br.html">Portuguese version</a>
<a href="manuals/apt-howto/index.es.html">Spanish version</a>
<a href="manuals/apt-howto/index.ru.html">Russian version</a>
<a href="manuals/apt-howto/index.pl.html">Polish version</a>
<a href="manuals/apt-howto/index.ko.html">Korean version</a>
<br>
<inddpcvs "apt-howto">
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "dselect Documentation for Beginners" "dselect">
<blockquote>
This file documents dselect for first-time users, and is intended to help
in getting Debian installed successfully. It makes no attempt to explain
everything, so when you first meet dselect, work through the help screens.
<doctable>
<authors "Stphane Bortzmeyer">
<maintainer "Stphane Bortzmeyer">
<status>
Stalled (?)
</status>
<availability>
<a href="$(HOME)/releases/stable/i386/dselect-beginner">Released version,
i386 arch</a>
<br>
Also available at
<tt>ftp://ftp.debian.org/dists/stable/main/disks-*/current/doc/dselect-beginner.*</tt>
<p><a href="$(HOME)/releases/testing/i386/dselect-beginner">Version being
prepared for the next stable (frozen), i386 arch</a>
<p><inbfdcvs>
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "Debian System Administrator's Manual" "system">
<blockquote>
This document is mentioned in the introduction of the Policy manual.
It covers all system administration aspects of a Debian system.
<doctable>
<authors "Tapio Lehtonen">
<maintainer "Tapio Lehtonen">
<status>
in active development
</status>
<availability>
not yet available
<inddpcvs "system-administrator">
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "Debian Network Administrator's Manual" "network">
<blockquote>
This manual covers all network administration aspects of a Debian system.
<doctable>
<authors "Ardo van Rangelrooij, Oliver Elphick, Duncan C. Thomson, Ivan E. Moore II">
<maintainer "Ivan E. Moore II">
<status>
in active development
</status>
<availability>
not yet available
<inddpcvs "network-administrator">
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "Hardware Compatibility List" "hardware">
<blockquote>
Lists all pieces of hardware we know to work or not to work with
the Debian GNU/Linux distribution. This list may also include
hints to set up Debian to work for a piece of hardware, e.g. sample
X configurations for different display adapters.
<doctable>
<authors "(?)">
<maintainer "Oliver Elphick">
<status>
stalled; reason to be called into question; superfluous considering
Linux Hardware Compatibility HOWTO exists?
</status>
<availability>
not available yet
</availability>
</doctable>
</blockquote>
<document "Securing Debian Manual" "securing">
<blockquote>
This manual describes the process of securing and hardening the default
Debian installation as good as possible.
<doctable>
<authors "Alexander Reelsen, Javier Fernndez-Sanguino Pea">
<maintainer "Javier Fernndez-Sanguino Pea">
<status>
in active development
</status>
<availability>
<released "manuals/securing-debian-howto/index.en.html"> (version <version-securing-debian-howto-en>)
<br>
<a href="manuals/securing-debian-howto/index.es.html">Spanish version</a> (version <version-securing-debian-howto-es>)
<br>
# Not yet available since it is written in linuxdoc sgml
# <a href="manuals/securing-debian-howto/index.pt.html">Portuguese version</a>
<a href="manuals/securing-debian-howto/index.ru.html">Russian version</a> (version <version-securing-debian-howto-ru>)
<br>
<inddpcvs "securing-debian-howto">
</availability>
</doctable>
</blockquote>
<br>&nbsp;
......@@ -10,7 +10,6 @@ efforts to write more and better documentation for the Debian system.
<br>
<ul>
<li><strong><a href="user-manuals">Users' manuals</a></strong></li>
<li><strong><a href="admin-manuals">Administrators' manuals</a></strong></li>
<li><strong><a href="devel-manuals">Developers' manuals</a></strong></li>
<li><strong><a href="misc-manuals">Miscellaneous manuals</a></strong></li>
<li><strong><a href="#other">Problematic manuals</a></strong></li>
......@@ -91,11 +90,11 @@ users. Caveat emptor.</p>
<li><a href="user-manuals#userref">Debian User Reference Manual</a>,
stalled and quite incomplete
<li><a href="user-manuals#tips">Debian Tips</a>, stalled, almost empty
<li><a href="admin-manuals#system">Debian System Administrator's
<li><a href="user-manuals#system">Debian System Administrator's
Manual</a>, stalled, almost empty
<li><a href="admin-manuals#network">Debian Network Administrator's
<li><a href="user-manuals#network">Debian Network Administrator's
Manual</a>, stalled, incomplete
<li><a href="admin-manuals#hardware">Hardware Compatibility List</a>,
<li><a href="user-manuals#hardware">Hardware Compatibility List</a>,
obsolete, superfluous considering
<a href="http://www.tldp.org/HOWTO/Hardware-HOWTO/">Hardware
Compatibility HOWTO</a> exists
......
......@@ -32,21 +32,16 @@ topics.
<br>
<ul>
<li><a href="user-manuals#faq">Debian GNU/Linux FAQ</a>
<li><a href="user-manuals#install">Debian Installation Manual</a>
<li><a href="user-manuals#relnotes">Debian Release Notes</a>
<li><a href="user-manuals#quick-reference">Debian Reference</a>
<li><a href="user-manuals#apt-howto">APT HOWTO</a>
<li><a href="user-manuals#dselect">dselect Documentation for Beginners</a>
<li><a href="user-manuals#guide">Debian Guide</a>
<li><a href="user-manuals#usersguide">The Debian Linux User's Guide</a>
<li><a href="user-manuals#euro-support">Euro support in Debian GNU/Linux</a>
<li><a href="user-manuals#java-faq">Debian GNU/Linux and Java FAQ</a>
</ul>
<p><strong><font size="+1">A</font>dministrators' manuals</strong>
<br>
<ul>
<li><a href="admin-manuals#install">Debian Installation Manual</a>
<li><a href="admin-manuals#relnotes">Debian Release Notes</a>
<li><a href="admin-manuals#quick-reference">Debian Reference</a>
<li><a href="admin-manuals#apt-howto">APT HOWTO</a>
<li><a href="admin-manuals#dselect">dselect Documentation for Beginners</a>
<li><a href="admin-manuals#securing">Securing Debian Manual</a>
<li><a href="user-manuals#securing">Securing Debian Manual</a>
</ul>
</td>
......
#use wml::debian::ddp title="DDP Users' Manuals"
#include "$(ENGLISHDIR)/doc/manuals.defs"
#include "$(ENGLISHDIR)/doc/version.defs"
<document "Debian META Manual" "meta">
......@@ -43,6 +44,160 @@
<br>&nbsp;
<document "Debian Installation Manual" "install">
<blockquote>
Installation instructions for the Debian GNU/Linux distribution.
<doctable>
<authors "Bruce Perens, Sven Rudolph, Igor Grobman, James Treacy, Adam Di Carlo">
<maintainer "Adam Di Carlo, Chris Tillman">
<status>
Active work being done for Debian releases (2.2 and future). Need help with
non-x86 installation and non-English language versions; please volunteer,
this is very important to Debian. Contact debian-boot@lists.debian.org for
more information.
</status>
<availability>
<a href="$(HOME)/releases/stable/installmanual">Released version</a>
<br>
Also available at
<tt>ftp://ftp.debian.org/debian/dists/stable/disks-*/current/install.html</tt>
<p><a href="$(HOME)/releases/testing/installmanual">Version being prepared
for the next stable (in testing)</a>
<br>
Also available in the Debian package
<strong><a href="http://packages.debian.org/unstable/doc/install-doc.html">install-doc</a></strong>
<p><inbfdcvs>
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "Debian Release Notes" "relnotes">
<blockquote>
This document contains information on what's new in the current Debian
GNU/Linux distribution and complete upgrading information for users of
older Debian releases.
<doctable>
<authors "Adam Di Carlo, Bob Hilliard, Josip Rodin, Anne Bezemer">
<maintainer "Rob Bradford">
<status>
Active work being done for Debian releases. Help is needed to
complete the `Split packages' section. Contact debian-doc@lists.debian.org
for more information.
</status>
<availability>
<a href="$(HOME)/releases/stable/releasenotes">Released version</a>
<br>
Also available at <tt>ftp://ftp.debian.org/dists/stable/main/upgrade-*/</tt>
<p><a href="$(HOME)/releases/testing/releasenotes">Version being prepared
for the next stable (in testing)</a>
<p><inbfdcvs>
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "Debian Reference" "quick-reference">
<blockquote>
This Debian GNU/Linux reference covers many aspects of system
administration through shell-command examples. Basic tutorials, tips, and
other information are provided for topics including system installation,
Debian package management, the Linux kernel under Debian, system tuning,
building a gateway, text editors, CVS, programming, and GnuPG.
<p>Previously known as "Quick Reference".</p>
<doctable>
<authors "Osamu Aoki">
<maintainer "Osamu Aoki">
<status>
most comprehensive DDP user manual at the moment,
but still has room for improvement
</status>
<availability>
<a href="manuals/quick-reference/index.en.html">English version</a>
<a href="manuals/quick-reference/index.fr.html">French version</a>
<a href="manuals/quick-reference/index.it.html">Italian version</a>
<br>
<inddpcvs "quick-reference">
<br>
Development version hosted at <a href="http://qref.sf.net/">qref.sf.net</a>.
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "APT HOWTO" "apt-howto">
<blockquote>
This manual tries to be a quick but complete source of information
about the APT system and its features. It contains much information
about the main uses of APT and many examples.
<doctable>
<authors "Gustavo Noronha Silva">
<maintainer "Gustavo Noronha Silva">
<status>
ready
</status>
<availability>
<inpackage "apt-howto">
<released "manuals/apt-howto/index.en.html">
<a href="manuals/apt-howto/index.pt-br.html">Portuguese version</a>
<a href="manuals/apt-howto/index.es.html">Spanish version</a>
<a href="manuals/apt-howto/index.ru.html">Russian version</a>
<a href="manuals/apt-howto/index.pl.html">Polish version</a>
<a href="manuals/apt-howto/index.ko.html">Korean version</a>
<br>
<inddpcvs "apt-howto">
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "dselect Documentation for Beginners" "dselect">
<blockquote>
This file documents dselect for first-time users, and is intended to help
in getting Debian installed successfully. It makes no attempt to explain
everything, so when you first meet dselect, work through the help screens.
<doctable>
<authors "Stphane Bortzmeyer">
<maintainer "Stphane Bortzmeyer">
<status>
Stalled (?)
</status>
<availability>
<a href="$(HOME)/releases/stable/i386/dselect-beginner">Released version,
i386 arch</a>
<br>
Also available at
<tt>ftp://ftp.debian.org/dists/stable/main/disks-*/current/doc/dselect-beginner.*</tt>
<p><a href="$(HOME)/releases/testing/i386/dselect-beginner">Version being
prepared for the next stable (frozen), i386 arch</a>
<p><inbfdcvs>
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "Debian Tutorial" "tutorial">
<blockquote>
......@@ -161,6 +316,8 @@ which someone else is administering.
</doctable>
</blockquote>
<br>&nbsp;
<document "Euro support in Debian GNU/Linux" "euro-support">
<blockquote>
......@@ -182,6 +339,8 @@ this purpose.
</doctable>
</blockquote>
<br>&nbsp;
<document "The Debian GNU/Linux and Java FAQ" "java-faq">
<blockquote>
......@@ -201,3 +360,95 @@ and programs related to building a Free Software Java environment.
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "Debian System Administrator's Manual" "system">
<blockquote>
This document is mentioned in the introduction of the Policy manual.
It covers all system administration aspects of a Debian system.
<doctable>
<authors "Tapio Lehtonen">
<maintainer "Tapio Lehtonen">
<status>
in active development
</status>
<availability>
not yet available
<inddpcvs "system-administrator">
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "Debian Network Administrator's Manual" "network">
<blockquote>
This manual covers all network administration aspects of a Debian system.
<doctable>
<authors "Ardo van Rangelrooij, Oliver Elphick, Duncan C. Thomson, Ivan E. Moore II">
<maintainer "Ivan E. Moore II">
<status>
in active development
</status>
<availability>
not yet available
<inddpcvs "network-administrator">
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "Hardware Compatibility List" "hardware">
<blockquote>
Lists all pieces of hardware we know to work or not to work with
the Debian GNU/Linux distribution. This list may also include
hints to set up Debian to work for a piece of hardware, e.g. sample
X configurations for different display adapters.
<doctable>
<authors "(?)">
<maintainer "Oliver Elphick">
<status>
stalled; reason to be called into question; superfluous considering
Linux Hardware Compatibility HOWTO exists?
</status>
<availability>
not available yet
</availability>
</doctable>
</blockquote>
<br>&nbsp;
<document "Securing Debian Manual" "securing">
<blockquote>
This manual describes the process of securing and hardening the default
Debian installation as good as possible.
<doctable>
<authors "Alexander Reelsen, Javier Fernndez-Sanguino Pea">
<maintainer "Javier Fernndez-Sanguino Pea">
<status>
in active development
</status>
<availability>
<released "manuals/securing-debian-howto/index.en.html"> (version <version-securing-debian-howto-en>)
<br>
<a href="manuals/securing-debian-howto/index.es.html">Spanish version</a> (version <version-securing-debian-howto-es>)
<br>
# Not yet available since it is written in linuxdoc sgml
# <a href="manuals/securing-debian-howto/index.pt.html">Portuguese version</a>
<a href="manuals/securing-debian-howto/index.ru.html">Russian version</a> (version <version-securing-debian-howto-ru>)
<br>
<inddpcvs "securing-debian-howto">
</availability>
</doctable>
</blockquote>
......@@ -24,7 +24,7 @@ This requires a line such as
</BLOCKQUOTE>
in your <CODE>/etc/apt/sources.list</CODE> file.
<p>There's also a <a href="../doc/admin-manuals#securing">Securing Debian</a>
<p>There's also a <a href="../doc/user-manuals#securing">Securing Debian</a>
manual.</p>
<H2>Recent Alerts</H2>
......
......@@ -157,10 +157,9 @@ sub title_of {
<li><linkto "doc/FAQ/">
<li><linkto "doc/books">
<li><linkto "doc/ddp">
<li><linkto "doc/admin-manuals">
<li><linkto "doc/user-manuals">
<li><linkto "doc/devel-manuals">
<li><linkto "doc/misc-manuals">
<li><linkto "doc/user-manuals">
</ul>
</td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment