[SCM] live-manual branch, master, updated. debian/20100301-1-11-g9487102

Daniel Baumann daniel at debian.org
Sat Apr 10 10:53:08 UTC 2010 

The following commit has been merged in the master branch:
commit 9487102c566c1a1713e90b05d251294ccf3c0483
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Apr 10 12:44:35 2010 +0200

    Rewrapping and reformating xml for the About chapter.

diff --git a/xml/chapters/about.xml b/xml/chapters/about.xml
index 15b255f..4fefbb4 100644
--- a/xml/chapters/about.xml
+++ b/xml/chapters/about.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
+	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+	<!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
 ]>
+
 <chapter>
 <title>About</title>
 
diff --git a/xml/chapters/about/manual.xml b/xml/chapters/about/manual.xml
index 6573821..e998895 100644
--- a/xml/chapters/about/manual.xml
+++ b/xml/chapters/about/manual.xml
@@ -1,70 +1,185 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "../../entities/common.ent" > %commondata;
+	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+	<!ENTITY % commondata SYSTEM "../../entities/common.ent" > %commondata;
 ]>
+
 <sect1 id="meta">
 <title>About this manual</title>
 
-<para>The main goal of this manual is to serve as a single access point to all documentation related to the Debian Live project. It does not include end-user documentation for using a Debian Live system.</para>
-
-<para>Some of the commands mentioned in the text must be executed with superuser privileges which can be obtained by becoming the root user via <filename>su</filename> or by using <filename>sudo</filename>. To distinguish between commands which may be executed by an unprivileged user and those requiring superuser privileges, commands are prepended by <command>$</command> or <command>#</command> respectively. This symbol is not a part of the command.</para>
+<para>
+	The main goal of this manual is to serve as a single access point to all
+	documentation related to the Debian Live project. It does not include
+	end-user documentation for using a Debian Live system.
+</para>
+
+<para>
+	Some of the commands mentioned in the text must be executed with
+	superuser privileges which can be obtained by becoming the root user via
+	<filename>su</filename> or by using <filename>sudo</filename>. To
+	distinguish between commands which may be executed by an unprivileged
+	user and those requiring superuser privileges, commands are prepended by
+	<command>$</command> or <command>#</command> respectively. This symbol
+	is not a part of the command.
+</para>
 
 <sect2 id="terms">
 <title>Terms</title>
 
 <variablelist>
-<varlistentry><term>Live system</term>
-<listitem><para>An operating system that can boot without installation to a hard drive. Live systems do not alter local operating system(s) or file(s) already installed on the computer hard drive unless instructed to do so. Live systems are typically booted from media such as CDs or DVDs, some may also boot with USB sticks or over the network (via netboot images).</para></listitem>
+
+<varlistentry>
+<term>Live system</term>
+
+<listitem>
+<para>
+	An operating system that can boot without installation to a hard drive.
+	Live systems do not alter local operating system(s) or file(s) already
+	installed on the computer hard drive unless instructed to do so. Live
+	systems are typically booted from media such as CDs or DVDs, some may
+	also boot with USB sticks or over the network (via netboot images).
+</para>
+</listitem>
 </varlistentry>
 
-<varlistentry><term>Debian Live</term>
-<listitem><para>The Debian sub-project which maintains the &live-helper; and &live-initramfs; utilities.</para></listitem>
+<varlistentry>
+<term>Debian Live</term>
+
+<listitem>
+<para>
+	The Debian sub-project which maintains the &live-helper; and
+	&live-initramfs; utilities.
+</para>
+</listitem>
 </varlistentry>
 
-<varlistentry><term>Debian Live system</term>
-<listitem><para>A live system that uses software from the Debian operating system that may be booted from CDs, DVDs, USB sticks, over the network (via netboot images), and over the internet (via boot parameter fetch=URL)</para></listitem>
+<varlistentry>
+<term>Debian Live system</term>
+
+<listitem>
+<para>
+	A live system that uses software from the Debian operating system that
+	may be booted from CDs, DVDs, USB sticks, over the network (via netboot
+	images), and over the internet (via boot parameter fetch=URL)
+</para>
+</listitem>
 </varlistentry>
 
-<varlistentry><term>Build system / host system</term>
-<listitem><para>The environment used to create the live system.</para></listitem>
+<varlistentry>
+<term>Build system / host system</term>
+
+<listitem>
+<para>
+	The environment used to create the live system.
+</para>
+</listitem>
 </varlistentry>
 
-<varlistentry><term>&live-helper;</term>
-<listitem><para>A collection of scripts used to build customised Debian Live systems.</para></listitem>
+<varlistentry>
+<term>&live-helper;</term>
+
+<listitem>
+<para>
+	A collection of scripts used to build customised Debian Live systems.
+</para>
+</listitem>
 </varlistentry>
 
-<varlistentry><term>&live-initramfs;</term>
-<listitem><para>A collection of scripts used to boot live systems. &live-initramfs; is a fork of <filename>casper</filename> by Canonical, Ltd.</para></listitem>
+<varlistentry>
+<term>&live-initramfs;</term>
+
+<listitem>
+<para>
+	A collection of scripts used to boot live systems. &live-initramfs; is a
+	fork of <filename>casper</filename> by Canonical, Ltd.
+</para>
+</listitem>
 </varlistentry>
 
-<varlistentry><term><filename>live-package</filename></term>
-<listitem><para>The former name of &live-helper;.</para></listitem>
+<varlistentry>
+<term><filename>live-package</filename></term>
+
+<listitem>
+<para>
+	The former name of &live-helper;.
+</para>
+</listitem>
 </varlistentry>
 
-<varlistentry><term>Debian Installer / (d-i)</term>
-<listitem><para>The official installation system for the Debian distribution.</para></listitem>
+<varlistentry>
+<term>Debian Installer / (d-i)</term>
+
+<listitem>
+<para>
+	The official installation system for the Debian distribution.
+</para>
+</listitem>
 </varlistentry>
 
-<varlistentry><term>Cheat codes</term>
-<listitem><para>FIXME</para></listitem>
+<varlistentry>
+<term>Cheat codes</term>
+
+<listitem>
+<para>
+	FIXME
+</para>
+</listitem>
 </varlistentry>
 
-<varlistentry><term>chroot</term>
-<listitem><para>The chroot program, chroot(8), enables us to run different instances of the GNU/Linux environment on a single system simultaneously without rebooting.</para></listitem>
+<varlistentry>
+<term>chroot</term>
+
+<listitem>
+<para>
+	The chroot program, chroot(8), enables us to run different instances of
+	the GNU/Linux environment on a single system simultaneously without
+	rebooting.
+</para>
+</listitem>
 </varlistentry>
 
-<varlistentry><term>binary image</term>
-<listitem><para>On a live system, binary image refers to the binary filesystem and the respective extension, such as binary.iso or binary.img.</para></listitem>
+<varlistentry>
+<term>binary image</term>
+
+<listitem>
+<para>
+	On a live system, binary image refers to the binary filesystem and the
+	respective extension, such as binary.iso or binary.img.
+</para>
+</listitem>
 </varlistentry>
 
-<varlistentry><term>Target distribution</term>
-<listitem><para>The distribution upon which your live system will be based. This can differ from the distribution of your Build System.</para></listitem>
+<varlistentry>
+<term>Target distribution</term>
+
+<listitem>
+<para>
+	The distribution upon which your live system will be based. This can
+	differ from the distribution of your Build System.
+</para>
+</listitem>
 </varlistentry>
 
-<varlistentry><term>&lenny;/&squeeze;/&sid; stable/testing/unstable</term>
-<listitem><para>The "stable" distribution contains the latest officially released distribution of Debian. The "testing" distribution is the staging area for the next stable release. A major advantage of using this distribution is that it has more recent versions of software relative to the "stable" release. The "unstable" distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge.</para>
-<para>At the time of writing, &lenny; is the current "stable" release and &squeeze; is the current "testing" release. &sid; will always be a synonym for the "unstable" release.</para>
+<varlistentry>
+<term>&lenny;/&squeeze;/&sid; stable/testing/unstable</term>
+
+<listitem>
+<para>
+	The "stable" distribution contains the latest officially released
+	distribution of Debian. The "testing" distribution is the staging area
+	for the next stable release. A major advantage of using this
+	distribution is that it has more recent versions of software relative to
+	the "stable" release. The "unstable" distribution is where active
+	development of Debian occurs. Generally, this distribution is run by
+	developers and those who like to live on the edge.
+</para>
+
+<para>
+	At the time of writing, &lenny; is the current "stable" release
+	and &squeeze; is the current "testing" release. &sid; will always be a
+	synonym for the "unstable" release.
+</para>
 </listitem>
 </varlistentry>
 
@@ -74,71 +189,206 @@
 
 <sect2 id="authors">
 <title>Authors</title>
-<para>A list of authors (in alphabetical order):</para>
+
+<para>
+	A list of authors (in alphabetical order):
+</para>
 
 <itemizedlist>
- <listitem><para>Ben Armstrong</para></listitem>
- <listitem><para>Brendan Sleight</para></listitem>
- <listitem><para>Chris Lamb</para></listitem>
- <listitem><para>Daniel Baumann</para></listitem>
- <listitem><para>Franklin Piat</para></listitem>
- <listitem><para>Jonas Stein</para></listitem>
- <listitem><para>Kai Hendry</para></listitem>
- <listitem><para>Marco Amadori</para></listitem>
- <listitem><para>Mathieu Geli</para></listitem>
- <listitem><para>Matthias Kirschner</para></listitem>
- <listitem><para>Richard Nelson</para></listitem>
- <listitem><para>Trent W. Buck</para></listitem>
-</itemizedlist>
 
-</sect2>
+<listitem>
+<para>
+	Ben Armstrong
+</para>
+</listitem>
 
-<sect2 id="contributing">
-<title>Contributing to this document</title>
-<para>This manual is intended as a community project and all proposals for improvements and contributions are extremely welcome. The preferred way to submit a contribution is to send it to the mailing list. Please see <xref linkend="contact"/> for more information.</para>
+<listitem>
+<para>
+	Brendan Sleight
+</para>
+</listitem>
 
-<para>When submitting a contribution please clearly identify its copyright holder and include the licensing statement. Note that to be accepted the contribution must be licensed under the same license as the rest of the document, namely GPL version 3 or later.</para>
+<listitem>
+<para>
+	Chris Lamb
+</para>
+</listitem>
 
-<para>The sources for this manual are maintained using the Git version control system. You can checkout the latest copy by executing:</para>
+<listitem>
+<para>
+	Daniel Baumann
+</para>
+</listitem>
 
-<screen>$ git clone git://live.debian.net/git/live-manual.git</screen>
+<listitem>
+<para>
+	Franklin Piat
+</para>
+</listitem>
 
-<para>Prior to submission of your contribution, please preview your work. To preview the live-manual, ensure the packages needed for building are installed by executing:</para>
+<listitem>
+<para>
+	Jonas Stein
+</para>
+</listitem>
 
-<screen># apt-get install dblatex docbook-xml docbook-xsl make po4a w3m</screen>
+<listitem>
+<para>
+	Kai Hendry
+</para>
+</listitem>
 
-<para>You may build the live-manual from the top level directory of your git checkout by executing:</para>
+<listitem>
+<para>
+	Marco Amadori
+</para>
+</listitem>
 
-<screen>$ make build</screen>
+<listitem>
+<para>
+	Mathieu Geli
+</para>
+</listitem>
+
+<listitem>
+<para>
+	Matthias Kirschner
+</para>
+</listitem>
+
+<listitem>
+<para>
+	Richard Nelson
+</para>
+</listitem>
+
+<listitem>
+<para>
+	Trent W. Buck
+</para>
+</listitem>
+
+</itemizedlist>
+
+</sect2>
+
+<sect2 id="contributing">
+<title>Contributing to this document</title>
+
+<para>
+	This manual is intended as a community project and all proposals for
+	improvements and contributions are extremely welcome. The preferred way
+	to submit a contribution is to send it to the mailing list. Please see
+	<xref linkend="contact"/> for more information.
+</para>
+
+<para>
+	When submitting a contribution please clearly identify its copyright
+	holder and include the licensing statement. Note that to be accepted the
+	contribution must be licensed under the same license as the rest of the
+	document, namely GPL version 3 or later.
+</para>
+
+<para>
+	The sources for this manual are maintained using the Git version control
+	system. You can checkout the latest copy by executing:
+</para>
+
+<para>
+	<screen>$ git clone git://live.debian.net/git/live-manual.git</screen>
+</para>
+
+<para>
+	Prior to submission of your contribution, please preview your work. To
+	preview the live-manual, ensure the packages needed for building are
+	installed by executing:
+</para>
+
+<para>
+	<screen># apt-get install dblatex docbook-xml docbook-xsl make po4a
+	w3m</screen>
+</para>
+
+<para>
+	You may build the live-manual from the top level directory of your git
+	checkout by executing:
+</para>
+
+<para>
+	<screen>$ make build</screen>
+</para>
 
 <sect3 id="commiting">
 <title>Applying patches</title>
-<para>Directly commiting to the repository is possible by anyone. However, we ask you to send bigger changes to the mailinglist to discuss them first. In order to push to the repository, the following steps are required.</para>
+
+<para>
+	Directly commiting to the repository is possible by anyone. However, we
+	ask you to send bigger changes to the mailinglist to discuss them first.
+	In order to push to the repository, the following steps are required.
+</para>
 
 <itemizedlist>
-<listitem><para>Fetch the public commit key:</para>
-<screen>$ mkdir -p ~/.ssh/identity.d
+
+<listitem>
+<para>
+	Fetch the public commit key:
+</para>
+
+<para>
+	<screen>$ mkdir -p ~/.ssh/identity.d
 $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live
 $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub
-$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*</screen></listitem>
+$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*</screen>
+</para>
+</listitem>
+
+<listitem>
+<para>
+	Add the following section to your openssh-client config:
+</para>
 
-<listitem><para>Add the following section to your openssh-client config:</para>
-<screen> $ cat &gt;&gt; ~/.ssh/config &lt;&lt; EOF
+<para>
+	<screen> $ cat &gt;&gt; ~/.ssh/config &lt;&lt; EOF
 Host live.debian.net
 	Hostname live.debian.net
 	User gitosis
 	IdentityFile ~/.ssh/identity.d/live-manual at debian-live
-EOF
-</screen></listitem>
+EOF</screen>
+</para>
+</listitem>
+
+<listitem>
+<para>
+	Checkout a clone of the manual through ssh:
+</para>
 
-<listitem><para>Checkout a clone of the manual through ssh:</para>
-<screen>$ git clone gitosis at live.debian.net:/live-manual.git</screen></listitem>
+<para>
+	<screen>$ git clone gitosis at live.debian.net:/live-manual.git</screen>
+</para>
+</listitem>
+
+<listitem>
+<para>
+	Commit the file after editing. Write commit messages, that consist of
+	full useful sentences, starting with a capital letter and ending with a
+	full stop. Usually starting with the form
+	'Fixing/Adding/Removing/Correcting/':
+</para>
+
+<para>
+	<screen>$ git commit -a</screen>
+</para>
+</listitem>
 
-<listitem><para>Commit the file after editing. Write commit messages, that consist of full useful sentences, starting with a capital letter and ending with a full stop. Usually starting with the form 'Fixing/Adding/Removing/Correcting/':</para>
-<screen>$ git commit -a</screen></listitem>
+<listitem>
+<para>
+	Push the commit to the server:
+</para>
 
-<listitem><para>Push the commit to the server:</para>
-<screen>$ git push</screen></listitem>
+<para>
+	<screen>$ git push</screen>
+</para>
+</listitem>
 
 </itemizedlist>
 

-- 
live-manual

More information about the debian-live-changes mailing list