[SCM] Debian Live manual branch, master, updated. df9389e25a8d2e562eeb4fe5cd994d10f24807e9

Daniel Baumann daniel at debian.org
Tue Nov 11 18:11:31 UTC 2008


The following commit has been merged in the master branch:
commit df9389e25a8d2e562eeb4fe5cd994d10f24807e9
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Nov 11 19:11:20 2008 +0100

    Merging different about chapters into one about chapter.

diff --git a/chapters/about.xml b/chapters/about.xml
index f96a602..ee96c44 100644
--- a/chapters/about.xml
+++ b/chapters/about.xml
@@ -3,129 +3,10 @@
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % commondata SYSTEM "../ent/common.ent" > %commondata;
 ]>
-<chapter id="about">
-<title>About the Debian Live Project</title>
+<chapter>
+<title>About</title>
 
-<section id="motivation">
-<title>Motivation</title>
-
-<section>
-<title>What is wrong with current live systems</title>
-
-<para>There are already several Debian-based live systems and they are doing a great job. But, from the Debian perspective, most of them have one or more of the following disadvantages:</para>
-
-<orderedlist>
-<listitem><para>They are unofficial projects, developed outside of Debian.</para></listitem>
-<listitem><para>They mix different distributions, e.g. testing and unstable.</para></listitem>
-<listitem><para>They support i386 only.</para></listitem>
-<listitem><para>They change package's behavior and/or appearance by stripping them down to save space.</para></listitem>
-<listitem><para>They include unofficial packages.</para></listitem>
-<listitem><para>They ship custom kernels with additional patches not part of Debian.</para></listitem>
-<listitem><para>They are large and slow due to their sheer size and thus not suitable for rescue issues.</para></listitem>
-<listitem><para>They are not available in different flavours, e.g. CDs, DVDs, USB-stick and netboot images </para></listitem>
-</orderedlist>
-</section>
-
-<section>
-<title>Why create our own live system?</title>
-
-<para>Debian is the Universal Operating System: Debian should have an official live system for showing around and to officially represent the true, one and only Debian system with the following main advantages:</para>
-
-<orderedlist>
-<listitem><para>It would be an official Debian subproject.</para></listitem>
-<listitem><para>It reflects the (current) state of one distribution.</para></listitem>
-<listitem><para>It runs on as many architectures as possible.</para></listitem>
-<listitem><para>It consists of unchanged Debian packages only.</para></listitem>
-<listitem><para>It does not contain any unofficial packages.</para></listitem>
-<listitem><para>It uses an unaltered Debian kernel-image with no additional patches.</para></listitem>
-</orderedlist>
-
-</section>
-
-</section>
-
-<section id="philosophy">
-<title>Philosophy</title>
-
-<section>
-<title>Only unchanged, official packages</title>
-<para>
- We will only use official packages from the Debian repository, section main or maybe contrib (the use of contrib is not decided yet). The non-free section is not part of Debian and therefore not used at all for the live system.
-</para>
-
-<para>
- We will not change any packages. Whenever we need to change something, we will do that in coordination with its package maintainer in Debian.
-</para>
-
-<para>
- Exception: temporarily, our own packages like live-helper or live-initramfs may be used from our own repository for development reasons (e.g. to create development snapshots). They will be synced into Debian on a regular basis.
-</para>
-</section>
-
-<section>
-<title>No configuration of the live system</title>
-<para>
- In this phase we will not ship or install sample or alternative configurations. All packages are used in their default configuration as they are after a regular installation of Debian.
-</para>
-
-<para>
- Whenever we need a different default configuration, we will do that in coordination with its package maintainer in Debian.
-</para>
-
-<para>
- A system for configuring packages is provided using debconf in lh_config (use --preseed FILE) allowing custom configured packages to be installed in your custom produced Debian Live images, but for official live images only default configuration will be used.
-</para>
-
-<para>
- Exception: There are a few essential changes needed to be make a live system alive (e.g. configuring pam to allow empty passwords). These essential changes have to be kept as minimal as possible and, should be merged within the Debian repository if possible.
-</para>
-</section>
-
-<section>
-<title>No live system to hard disk installer</title>
-<para>
- [ this is no longer valid after etch release, we will work on an installer for lenny ]
-</para>
-
-<para>
- For the moment we will not ship an installer to copy the live system to a partition on the hard disk. Although we keep the changes in the live system as drastically minimal as possible compared to a regular Debian installation, the live system does differ in a few essential points (see exceptions, guideline 2).
-</para>
-
-<para>
- Therefore, we will ship a copy of the regular DebianInstaller (resp. Debian Installer, Graphical Installer) instead, to allow users to perform a regular Debian installation (and, of course, cdebootstrap and debootstrap are on the system too).
-</para>
-</section>
-
-</section>
-
-<section id="contact">
-<title>Contact</title>
-
-<variablelist>
- <varlistentry><term>Mailing list</term>
- <listitem><para>The primary contact for the project is the <ulink url="http://lists.debian.org/debian-live/">mailing list</ulink>. You can email the list directly by addressing your mail to <email>debian-live at lists.debian.org</email>. The <ulink url="http://lists.debian.org/debian-live/">list archives</ulink> are also available.</para></listitem>
-</varlistentry>
-
-<varlistentry><term>IRC</term>
-<listitem><para>
-A number of users and developers are present in the <ulink url="irc://irc.debian.org/#debian-live">#debian-live</ulink> channel on <ulink url="http://oftc.net">OFTC</ulink>. When asking a question on IRC, please be patient for an answer. If no answer is forthcoming, please email the mailing list.
-</para></listitem>
-</varlistentry>
-
-<varlistentry><term>BTS</term>
-<listitem><para>
-The Debian Bug Tracking System (BTS) contains details of bugs reported by users and developers. Each bug is given a number, and is kept on file until it is marked as having been dealt with. For more information, please see <xref linkend="bugs"/>.
-</para></listitem>
-</varlistentry>
-
-<varlistentry><term>Wiki</term>
-<listitem><para>
-FIXME. <ulink url="http://wiki.debian.org/DebianLive">our entry on the Debian wiki</ulink>.
-</para></listitem>
-</varlistentry>
-
-</variablelist>
-
-</section>
+<xi:include href="about/manual.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
+<xi:include href="about/project.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
 
 </chapter>
diff --git a/chapters/meta.xml b/chapters/about/manual.xml
similarity index 95%
rename from chapters/meta.xml
rename to chapters/about/manual.xml
index 92562e7..746a2ee 100644
--- a/chapters/meta.xml
+++ b/chapters/about/manual.xml
@@ -1,9 +1,9 @@
 <?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 "../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../../ent/common.ent" > %commondata;
 ]>
-<chapter id="meta">
+<sect1 id="meta">
 <title>About this manual</title>
 
 <para>
@@ -11,7 +11,7 @@ The main goal of this manual is to serve as a single access point to all documen
 
 <para>Some of the commands mentioned in the text must be executed with superuser privileges, either by becoming the root user 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 <computeroutput>$</computeroutput> or <computeroutput>#</computeroutput> respectively. This symbol is not a part of the command.</para>
 
-<section id="terms">
+<sect2 id="terms">
 <title>Terms</title>
 
 <variablelist>
@@ -69,9 +69,9 @@ The main goal of this manual is to serve as a single access point to all documen
 
 </variablelist>
 
-</section>
+</sect2>
 
-<section id="authors">
+<sect2 id="authors">
 <title>Authors</title>
 <para>A list of authors (in alphabetical order):</para>
 
@@ -88,9 +88,9 @@ The main goal of this manual is to serve as a single access point to all documen
  <listitem><para>Trent W. Buck</para></listitem>
 </itemizedlist>
 
-</section>
+</sect2>
 
-<section id="contributing">
+<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>
 
@@ -102,6 +102,6 @@ The main goal of this manual is to serve as a single access point to all documen
 $ git clone git://git.debian.org/git/debian-live/live-manual.git
 </screen>
 
-</section>
+</sect2>
 
-</chapter>
+</sect1>
diff --git a/chapters/about.xml b/chapters/about/project.xml
similarity index 94%
copy from chapters/about.xml
copy to chapters/about/project.xml
index f96a602..c912210 100644
--- a/chapters/about.xml
+++ b/chapters/about/project.xml
@@ -1,15 +1,15 @@
 <?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 "../ent/common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "../../ent/common.ent" > %commondata;
 ]>
-<chapter id="about">
+<sect1 id="about">
 <title>About the Debian Live Project</title>
 
-<section id="motivation">
+<sect2 id="motivation">
 <title>Motivation</title>
 
-<section>
+<sect3>
 <title>What is wrong with current live systems</title>
 
 <para>There are already several Debian-based live systems and they are doing a great job. But, from the Debian perspective, most of them have one or more of the following disadvantages:</para>
@@ -24,9 +24,9 @@
 <listitem><para>They are large and slow due to their sheer size and thus not suitable for rescue issues.</para></listitem>
 <listitem><para>They are not available in different flavours, e.g. CDs, DVDs, USB-stick and netboot images </para></listitem>
 </orderedlist>
-</section>
+</sect3>
 
-<section>
+<sect3>
 <title>Why create our own live system?</title>
 
 <para>Debian is the Universal Operating System: Debian should have an official live system for showing around and to officially represent the true, one and only Debian system with the following main advantages:</para>
@@ -40,14 +40,14 @@
 <listitem><para>It uses an unaltered Debian kernel-image with no additional patches.</para></listitem>
 </orderedlist>
 
-</section>
+</sect3>
 
-</section>
+</sect2>
 
-<section id="philosophy">
+<sect2 id="philosophy">
 <title>Philosophy</title>
 
-<section>
+<sect3>
 <title>Only unchanged, official packages</title>
 <para>
  We will only use official packages from the Debian repository, section main or maybe contrib (the use of contrib is not decided yet). The non-free section is not part of Debian and therefore not used at all for the live system.
@@ -60,9 +60,9 @@
 <para>
  Exception: temporarily, our own packages like live-helper or live-initramfs may be used from our own repository for development reasons (e.g. to create development snapshots). They will be synced into Debian on a regular basis.
 </para>
-</section>
+</sect3>
 
-<section>
+<sect3>
 <title>No configuration of the live system</title>
 <para>
  In this phase we will not ship or install sample or alternative configurations. All packages are used in their default configuration as they are after a regular installation of Debian.
@@ -79,9 +79,9 @@
 <para>
  Exception: There are a few essential changes needed to be make a live system alive (e.g. configuring pam to allow empty passwords). These essential changes have to be kept as minimal as possible and, should be merged within the Debian repository if possible.
 </para>
-</section>
+</sect3>
 
-<section>
+<sect3>
 <title>No live system to hard disk installer</title>
 <para>
  [ this is no longer valid after etch release, we will work on an installer for lenny ]
@@ -94,11 +94,11 @@
 <para>
  Therefore, we will ship a copy of the regular DebianInstaller (resp. Debian Installer, Graphical Installer) instead, to allow users to perform a regular Debian installation (and, of course, cdebootstrap and debootstrap are on the system too).
 </para>
-</section>
+</sect3>
 
-</section>
+</sect2>
 
-<section id="contact">
+<sect2 id="contact">
 <title>Contact</title>
 
 <variablelist>
@@ -126,6 +126,6 @@ FIXME. <ulink url="http://wiki.debian.org/DebianLive">our entry on the Debian wi
 
 </variablelist>
 
-</section>
+</sect2>
 
-</chapter>
+</sect1>
diff --git a/index.xml b/index.xml
index 5127878..ea32cdc 100644
--- a/index.xml
+++ b/index.xml
@@ -50,7 +50,6 @@ Document Format (PDF).
 </bookinfo>
 
 <!-- Chapters -->
-<xi:include href="chapters/meta.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
 <xi:include href="chapters/about.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
 <xi:include href="chapters/installation.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
 <xi:include href="chapters/basics.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>

-- 
Debian Live manual



More information about the debian-live-changes mailing list