[SCM] live-manual branch, debian, updated. debian/2.0_a1-1-12-g617c51a
Daniel Baumann
daniel at debian.org
Fri Jun 18 16:59:00 UTC 2010
The following commit has been merged in the debian branch:
commit 617c51afd167bbc8f666ec5c32644f128a0b45df
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Jun 18 18:20:48 2010 +0200
Re-organising source tree into individual directories per part.
diff --git a/Makefile b/Makefile
index 29ed63b..6a0f032 100644
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,12 @@ all: test build
test:
@echo "Checking for syntax errors... [not implemented yet - FIXME]"
- #@xmllint --nonet --noout --postvalid --xinclude en/index.xml || true
+ @#xmllint --nonet --noout --postvalid --xinclude manual/en/index.xml || true
@echo "Checking for spelling errors... [not implemented yet - FIXME]"
tidy:
- for FILE in manual/en/*.xml xsl/*.xsl; \
+ for FILE in manual/en/*.xml manual/en/*/*.xml xsl/*.xsl; \
do \
sed -i -e 's|^[ \t]*||' -e 's|[ \t]*$$||' $${FILE}; \
echo `cat $${FILE}` > $${FILE}.tmp; \
diff --git a/manual/Makefile b/manual/Makefile
index 02f0b80..b0fc0b6 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -15,6 +15,11 @@ po4a.cfg:
echo "[type: docbook] $${FILE} \$$lang:\$$lang/$$(basename $${FILE})" >> po4a.cfg; \
done
+ for FILE in en/*/*.xml; \
+ do \
+ echo "[type: docbook] $${FILE} \$$lang:\$$lang/$$(basename $$(dirname $${FILE}))/$$(basename $${FILE})" >> po4a.cfg; \
+ done
+
echo "[type: xhtml] en/index.html.in \$$lang:\$$lang/index.html.in" >> po4a.cfg
update:
diff --git a/manual/de/about.xml b/manual/de/about.xml
index 3ade429..6fa62b7 100644
--- a/manual/de/about.xml
+++ b/manual/de/about.xml
@@ -2,6 +2,6 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter>
<title>About</title>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about_manual.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about_project.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about/manual.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about/project.xml"/>
</chapter>
diff --git a/manual/de/about_manual.xml b/manual/de/about/manual.xml
similarity index 98%
rename from manual/de/about_manual.xml
rename to manual/de/about/manual.xml
index 1386722..0096139 100644
--- a/manual/de/about_manual.xml
+++ b/manual/de/about/manual.xml
@@ -47,13 +47,17 @@ and over the internet (via boot parameter fetch=URL) </para>
</listitem>
</varlistentry>
<varlistentry>
- <term><filename>live-helper</filename></term>
+ <term>
+ <filename>live-helper</filename>
+ </term>
<listitem>
<para> A collection of scripts used to build customised Debian Live systems. </para>
</listitem>
</varlistentry>
<varlistentry>
- <term><filename>live-initramfs</filename></term>
+ <term>
+ <filename>live-initramfs</filename>
+ </term>
<listitem>
<para> A collection of scripts used to boot live
systems. <filename>live-initramfs</filename> is a fork of
diff --git a/manual/de/about_project.xml b/manual/de/about/project.xml
similarity index 100%
rename from manual/de/about_project.xml
rename to manual/de/about/project.xml
diff --git a/manual/de/index.xml b/manual/de/index.xml
index a69dcf7..05145db 100644
--- a/manual/de/index.xml
+++ b/manual/de/index.xml
@@ -5,8 +5,7 @@
]>
<book lang="en">
<title>Debian Live Manual</title>
- <!-- Chapters -->
-<bookinfo>
+ <bookinfo>
<author> <othername>Debian Live Project</othername>
<email>debian-live at lists.debian.org</email> </author>
<releaseinfo>&version;</releaseinfo>
@@ -30,25 +29,6 @@ url="file:///usr/share/common-licenses/GPL-3">/usr/share/common-licenses/GPL-3</
file.</para>
</legalnotice>
</bookinfo>
-
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="installation.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basics.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="overview.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common-tasks.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="live-environment.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="faq.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="reporting-bugs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="howtos.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="coding-style.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="procedures.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="resources.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="use-cases.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="success-stories.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="troubleshooting.xml"/>
-
- <!-- Appendecis -->
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices_configuration-layout.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices_configuration-files.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other.xml"/>
</book>
diff --git a/manual/de/other.xml b/manual/de/other.xml
new file mode 100644
index 0000000..fc3e754
--- /dev/null
+++ b/manual/de/other.xml
@@ -0,0 +1,22 @@
+<?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">
+<part>
+ <title>Other</title>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/installation.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/basics.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/overview.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/customization.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/common-tasks.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/live-environment.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/faq.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/reporting-bugs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/howtos.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/coding-style.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/procedures.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/resources.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/use-cases.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/success-stories.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/troubleshooting.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/appendices_configuration-layout.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/appendices_configuration-files.xml"/>
+</part>
diff --git a/manual/de/appendices_configuration-files.xml b/manual/de/other/appendices_configuration-files.xml
similarity index 100%
rename from manual/de/appendices_configuration-files.xml
rename to manual/de/other/appendices_configuration-files.xml
diff --git a/manual/de/appendices_configuration-layout.xml b/manual/de/other/appendices_configuration-layout.xml
similarity index 100%
rename from manual/de/appendices_configuration-layout.xml
rename to manual/de/other/appendices_configuration-layout.xml
diff --git a/manual/de/basics.xml b/manual/de/other/basics.xml
similarity index 100%
rename from manual/de/basics.xml
rename to manual/de/other/basics.xml
diff --git a/manual/de/coding-style.xml b/manual/de/other/coding-style.xml
similarity index 100%
rename from manual/de/coding-style.xml
rename to manual/de/other/coding-style.xml
diff --git a/manual/de/common-tasks.xml b/manual/de/other/common-tasks.xml
similarity index 100%
rename from manual/de/common-tasks.xml
rename to manual/de/other/common-tasks.xml
diff --git a/manual/de/customization.xml b/manual/de/other/customization.xml
similarity index 100%
rename from manual/de/customization.xml
rename to manual/de/other/customization.xml
diff --git a/manual/de/customization_backports.xml b/manual/de/other/customization_backports.xml
similarity index 100%
rename from manual/de/customization_backports.xml
rename to manual/de/other/customization_backports.xml
diff --git a/manual/de/customization_binary.xml b/manual/de/other/customization_binary.xml
similarity index 100%
rename from manual/de/customization_binary.xml
rename to manual/de/other/customization_binary.xml
diff --git a/manual/de/customization_bootup.xml b/manual/de/other/customization_bootup.xml
similarity index 100%
rename from manual/de/customization_bootup.xml
rename to manual/de/other/customization_bootup.xml
diff --git a/manual/de/customization_contents.xml b/manual/de/other/customization_contents.xml
similarity index 100%
rename from manual/de/customization_contents.xml
rename to manual/de/other/customization_contents.xml
diff --git a/manual/de/customization_internationalization.xml b/manual/de/other/customization_internationalization.xml
similarity index 100%
rename from manual/de/customization_internationalization.xml
rename to manual/de/other/customization_internationalization.xml
diff --git a/manual/de/customization_packages.xml b/manual/de/other/customization_packages.xml
similarity index 98%
rename from manual/de/customization_packages.xml
rename to manual/de/other/customization_packages.xml
index 2b7c209..8c3aaf4 100644
--- a/manual/de/customization_packages.xml
+++ b/manual/de/other/customization_packages.xml
@@ -94,7 +94,7 @@ may not be the desired behaviour. </para>
</sect2>
<sect2>
<title>Installing additional packages</title>
- <para> <filename>live-helper</filename> has a number of mechanisms for indicating
+ <para><filename>live-helper</filename> has a number of mechanisms for indicating
that additional packages should be installed, including: </para>
<orderedlist>
<listitem>
@@ -265,7 +265,7 @@ offer updates of the modified packages. </para>
</sect3>
<sect3 id="custom-packages-apt">
<title>Custom packages and APT</title>
- <para> <filename>live-helper</filename> uses APT to install all packages into the
+ <para><filename>live-helper</filename> uses APT to install all packages into the
live system so will therefore inherit behaviours from this program. One
relevant example is that (assuming a default configuration) given a package
available in two different repositories with different version numbers, APT
diff --git a/manual/de/faq.xml b/manual/de/other/faq.xml
similarity index 100%
rename from manual/de/faq.xml
rename to manual/de/other/faq.xml
diff --git a/manual/de/howtos.xml b/manual/de/other/howtos.xml
similarity index 100%
rename from manual/de/howtos.xml
rename to manual/de/other/howtos.xml
diff --git a/manual/de/installation.xml b/manual/de/other/installation.xml
similarity index 98%
rename from manual/de/installation.xml
rename to manual/de/other/installation.xml
index ec0d442..820f013 100644
--- a/manual/de/installation.xml
+++ b/manual/de/other/installation.xml
@@ -81,7 +81,9 @@ version in Git and are available on <ulink
url="http://live.debian.net/debian/">http://live.debian.net/debian</ulink>.</para>
</section>
<section>
- <title><filename>live-initramfs</filename></title>
+ <title>
+ <filename>live-initramfs</filename>
+ </title>
<para>
<emphasis>N.B. You do not need to install
<filename>live-initramfs</filename> on your system to create customised
diff --git a/manual/de/live-environment.xml b/manual/de/other/live-environment.xml
similarity index 100%
rename from manual/de/live-environment.xml
rename to manual/de/other/live-environment.xml
diff --git a/manual/de/overview.xml b/manual/de/other/overview.xml
similarity index 96%
rename from manual/de/overview.xml
rename to manual/de/other/overview.xml
index d7d4ba0..1f15745 100644
--- a/manual/de/overview.xml
+++ b/manual/de/other/overview.xml
@@ -5,8 +5,10 @@
<para> This chapter contains an overview of the two main tools used in building
Debian Live systems. </para>
<section id="live-helper">
- <title><filename>live-helper</filename></title>
- <para> <filename>live-helper</filename> is a collection of scripts to build Debian
+ <title>
+ <filename>live-helper</filename>
+ </title>
+ <para><filename>live-helper</filename> is a collection of scripts to build Debian
Live systems. These scripts are also referred to as "helpers". </para>
<para> The idea behind <filename>live-helper</filename> is to be a framework that
uses a configuration directory to completely automate and customize all
@@ -47,7 +49,7 @@ uses files named <filename>config/bootstrap</filename> and
will use. Generally, these files contain variables with values assigned, one
variable per line. Some programs in <filename>live-helper</filename> use
pairs of values or slightly more complicated variable assignments. </para>
- <para> <filename>live-helper</filename> respects environment variables which are
+ <para><filename>live-helper</filename> respects environment variables which are
present in the context of the shell it is running. If variables can be read
from config files, then they override environment variables, and if command
line options are used, they override values from config files. If no value
@@ -148,7 +150,7 @@ state. </para>
</section>
<section id="live-initramfs">
<title>The <filename>live-initramfs</filename> package</title>
- <para> <filename>live-initramfs</filename> is a collection of scripts providing
+ <para><filename>live-initramfs</filename> is a collection of scripts providing
hooks for the <command>initramfs-tools</command>, used to generate an
initramfs capable of booting live systems, such as those created by
<command>live-helper</command>. This includes the Debian Live isos, netboot
@@ -157,7 +159,7 @@ tarballs, and usb stick images. </para>
where a root filesystem (often a compressed filesystem image like squashfs)
is stored. If found, it will create a writable environment, using aufs or
unionfs, for Debian like systems to boot from. </para>
- <para> <filename>live-initramfs</filename> is a fork of <ulink
+ <para><filename>live-initramfs</filename> is a fork of <ulink
url="http://packages.ubuntu.com/casper">casper</ulink>. </para>
<para> More information on initial ramfs in Debian can be found in the <ulink
url="http://kernel-handbook.alioth.debian.org/"> Debian Linux Kernel
diff --git a/manual/de/procedures.xml b/manual/de/other/procedures.xml
similarity index 100%
rename from manual/de/procedures.xml
rename to manual/de/other/procedures.xml
diff --git a/manual/de/reporting-bugs.xml b/manual/de/other/reporting-bugs.xml
similarity index 100%
rename from manual/de/reporting-bugs.xml
rename to manual/de/other/reporting-bugs.xml
diff --git a/manual/de/resources.xml b/manual/de/other/resources.xml
similarity index 100%
rename from manual/de/resources.xml
rename to manual/de/other/resources.xml
diff --git a/manual/de/success-stories.xml b/manual/de/other/success-stories.xml
similarity index 100%
rename from manual/de/success-stories.xml
rename to manual/de/other/success-stories.xml
diff --git a/manual/de/troubleshooting.xml b/manual/de/other/troubleshooting.xml
similarity index 100%
rename from manual/de/troubleshooting.xml
rename to manual/de/other/troubleshooting.xml
diff --git a/manual/de/use-cases.xml b/manual/de/other/use-cases.xml
similarity index 100%
rename from manual/de/use-cases.xml
rename to manual/de/other/use-cases.xml
diff --git a/manual/en/about.xml b/manual/en/about.xml
index ebab097..9d89040 100644
--- a/manual/en/about.xml
+++ b/manual/en/about.xml
@@ -2,6 +2,6 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter>
<title>About</title>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about_manual.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about_project.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about/manual.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about/project.xml"/>
</chapter>
diff --git a/manual/en/about_manual.xml b/manual/en/about/manual.xml
similarity index 98%
rename from manual/en/about_manual.xml
rename to manual/en/about/manual.xml
index 82baf27..46c9380 100644
--- a/manual/en/about_manual.xml
+++ b/manual/en/about/manual.xml
@@ -32,13 +32,17 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><filename>live-helper</filename></term>
+ <term>
+ <filename>live-helper</filename>
+ </term>
<listitem>
<para> A collection of scripts used to build customised Debian Live systems. </para>
</listitem>
</varlistentry>
<varlistentry>
- <term><filename>live-initramfs</filename></term>
+ <term>
+ <filename>live-initramfs</filename>
+ </term>
<listitem>
<para> A collection of scripts used to boot live systems. <filename>live-initramfs</filename> is a fork of <filename>casper</filename> by Canonical, Ltd. </para>
</listitem>
diff --git a/manual/en/about_project.xml b/manual/en/about/project.xml
similarity index 100%
rename from manual/en/about_project.xml
rename to manual/en/about/project.xml
diff --git a/manual/en/index.xml b/manual/en/index.xml
index b6cb251..5e48b48 100644
--- a/manual/en/index.xml
+++ b/manual/en/index.xml
@@ -23,24 +23,6 @@
<para> On Debian systems, the complete text of the GNU General Public License can be found in <ulink url="file:///usr/share/common-licenses/GPL-3">/usr/share/common-licenses/GPL-3</ulink> file.</para>
</legalnotice>
</bookinfo>
- <!-- Chapters -->
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="installation.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basics.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="overview.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common-tasks.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="live-environment.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="faq.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="reporting-bugs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="howtos.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="coding-style.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="procedures.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="resources.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="use-cases.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="success-stories.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="troubleshooting.xml"/>
- <!-- Appendecis -->
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices_configuration-layout.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices_configuration-files.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other.xml"/>
</book>
diff --git a/manual/en/other.xml b/manual/en/other.xml
new file mode 100644
index 0000000..e353dbf
--- /dev/null
+++ b/manual/en/other.xml
@@ -0,0 +1,22 @@
+<?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">
+<part>
+ <title>Other</title>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/installation.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/basics.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/overview.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/customization.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/common-tasks.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/live-environment.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/faq.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/reporting-bugs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/howtos.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/coding-style.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/procedures.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/resources.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/use-cases.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/success-stories.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/troubleshooting.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/appendices_configuration-layout.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/appendices_configuration-files.xml"/>
+</part>
diff --git a/manual/en/appendices_configuration-files.xml b/manual/en/other/appendices_configuration-files.xml
similarity index 100%
rename from manual/en/appendices_configuration-files.xml
rename to manual/en/other/appendices_configuration-files.xml
diff --git a/manual/en/appendices_configuration-layout.xml b/manual/en/other/appendices_configuration-layout.xml
similarity index 100%
rename from manual/en/appendices_configuration-layout.xml
rename to manual/en/other/appendices_configuration-layout.xml
diff --git a/manual/en/basics.xml b/manual/en/other/basics.xml
similarity index 100%
rename from manual/en/basics.xml
rename to manual/en/other/basics.xml
diff --git a/manual/en/coding-style.xml b/manual/en/other/coding-style.xml
similarity index 100%
rename from manual/en/coding-style.xml
rename to manual/en/other/coding-style.xml
diff --git a/manual/en/common-tasks.xml b/manual/en/other/common-tasks.xml
similarity index 100%
rename from manual/en/common-tasks.xml
rename to manual/en/other/common-tasks.xml
diff --git a/manual/en/customization.xml b/manual/en/other/customization.xml
similarity index 100%
rename from manual/en/customization.xml
rename to manual/en/other/customization.xml
diff --git a/manual/en/customization_backports.xml b/manual/en/other/customization_backports.xml
similarity index 100%
rename from manual/en/customization_backports.xml
rename to manual/en/other/customization_backports.xml
diff --git a/manual/en/customization_binary.xml b/manual/en/other/customization_binary.xml
similarity index 100%
rename from manual/en/customization_binary.xml
rename to manual/en/other/customization_binary.xml
diff --git a/manual/en/customization_bootup.xml b/manual/en/other/customization_bootup.xml
similarity index 100%
rename from manual/en/customization_bootup.xml
rename to manual/en/other/customization_bootup.xml
diff --git a/manual/en/customization_contents.xml b/manual/en/other/customization_contents.xml
similarity index 100%
rename from manual/en/customization_contents.xml
rename to manual/en/other/customization_contents.xml
diff --git a/manual/en/customization_internationalization.xml b/manual/en/other/customization_internationalization.xml
similarity index 100%
rename from manual/en/customization_internationalization.xml
rename to manual/en/other/customization_internationalization.xml
diff --git a/manual/en/customization_packages.xml b/manual/en/other/customization_packages.xml
similarity index 96%
rename from manual/en/customization_packages.xml
rename to manual/en/other/customization_packages.xml
index 397fe96..d88bce7 100644
--- a/manual/en/customization_packages.xml
+++ b/manual/en/other/customization_packages.xml
@@ -78,7 +78,7 @@
</sect2>
<sect2>
<title>Installing additional packages</title>
- <para> <filename>live-helper</filename> has a number of mechanisms for indicating that additional packages should be installed, including: </para>
+ <para><filename>live-helper</filename> has a number of mechanisms for indicating that additional packages should be installed, including: </para>
<orderedlist>
<listitem>
<para> The <command>LH_PACKAGES</command> variable </para>
@@ -199,7 +199,7 @@
</sect3>
<sect3 id="custom-packages-apt">
<title>Custom packages and APT</title>
- <para> <filename>live-helper</filename> uses APT to install all packages into the live system so will therefore inherit behaviours from this program. One relevant example is that (assuming a default configuration) given a package available in two different repositories with different version numbers, APT will elect to install the package with the higher version number. </para>
+ <para><filename>live-helper</filename> uses APT to install all packages into the live system so will therefore inherit behaviours from this program. One relevant example is that (assuming a default configuration) given a package available in two different repositories with different version numbers, APT will elect to install the package with the higher version number. </para>
<para> Because of this, you may wish to increment the version number in your custom packages' <command>debian/changelog</command> files to ensure that your modified version is installed over one in the official Debian repositories. This may also be achieved by altering the live system's APT pinning preferences - see <xref linkend="apt-preferences"/> for more information. </para>
</sect3>
<sect3 id="apt-preferences">
diff --git a/manual/en/faq.xml b/manual/en/other/faq.xml
similarity index 100%
rename from manual/en/faq.xml
rename to manual/en/other/faq.xml
diff --git a/manual/en/howtos.xml b/manual/en/other/howtos.xml
similarity index 100%
rename from manual/en/howtos.xml
rename to manual/en/other/howtos.xml
diff --git a/manual/en/installation.xml b/manual/en/other/installation.xml
similarity index 98%
rename from manual/en/installation.xml
rename to manual/en/other/installation.xml
index e74cbc6..6834744 100644
--- a/manual/en/installation.xml
+++ b/manual/en/other/installation.xml
@@ -66,7 +66,9 @@
<para>If you do not wish to build or install <filename>live-helper</filename> from source, you can use snapshots. These are built automatically from the latest version in Git and are available on <ulink url="http://live.debian.net/debian/">http://live.debian.net/debian</ulink>.</para>
</section>
<section>
- <title><filename>live-initramfs</filename></title>
+ <title>
+ <filename>live-initramfs</filename>
+ </title>
<para>
<emphasis>N.B. You do not need to install <filename>live-initramfs</filename> on your system to create customised Debian Live systems. However, doing so will do no harm.</emphasis>
</para>
diff --git a/manual/en/live-environment.xml b/manual/en/other/live-environment.xml
similarity index 100%
rename from manual/en/live-environment.xml
rename to manual/en/other/live-environment.xml
diff --git a/manual/en/overview.xml b/manual/en/other/overview.xml
similarity index 89%
rename from manual/en/overview.xml
rename to manual/en/other/overview.xml
index 1dacd45..32953bb 100644
--- a/manual/en/overview.xml
+++ b/manual/en/other/overview.xml
@@ -4,8 +4,10 @@
<title>Overview of tools</title>
<para> This chapter contains an overview of the two main tools used in building Debian Live systems. </para>
<section id="live-helper">
- <title><filename>live-helper</filename></title>
- <para> <filename>live-helper</filename> is a collection of scripts to build Debian Live systems. These scripts are also referred to as "helpers". </para>
+ <title>
+ <filename>live-helper</filename>
+ </title>
+ <para><filename>live-helper</filename> is a collection of scripts to build Debian Live systems. These scripts are also referred to as "helpers". </para>
<para> The idea behind <filename>live-helper</filename> is to be a framework that uses a configuration directory to completely automate and customize all aspects of building a Live image. </para>
<para> Many concepts are similar to those in the <command>debhelper</command> Debian package tools written by Joey Hess: </para>
<orderedlist>
@@ -20,7 +22,7 @@
<para> Unlike <command>debhelper</command>, <filename>live-helper</filename> contains a tool to generate a skeleton configuration directory, <filename>lh config</filename>. This could be considered to be similar to tools such as <command>dh-make</command>. For more information about <filename>lh config</filename>, please see <xref linkend="lh-config"/>. </para>
<para> Besides the common <filename>config/common</filename>, which is used by all <filename>live-helper</filename> helper commands, some additional files can be used to configure the behavior of specific helper commands. These files are typically named <command>config/helper</command> or <command>config/stage</command> (where "stage", of course, is replaced with the name of the stage that they belong to, and "helper" with the name of the helper). </para>
<para> For example, the <command>lh bootstrap debootstrap</command> helper command uses files named <filename>config/bootstrap</filename> and <filename>config/bootstrap_debootstrap</filename> to read the options it will use. Generally, these files contain variables with values assigned, one variable per line. Some programs in <filename>live-helper</filename> use pairs of values or slightly more complicated variable assignments. </para>
- <para> <filename>live-helper</filename> respects environment variables which are present in the context of the shell it is running. If variables can be read from config files, then they override environment variables, and if command line options are used, they override values from config files. If no value for a given variable can be found (and is thus unset), <filename>live-helper</filename> will automatically set it to a default value. </para>
+ <para><filename>live-helper</filename> respects environment variables which are present in the context of the shell it is running. If variables can be read from config files, then they override environment variables, and if command line options are used, they override values from config files. If no value for a given variable can be found (and is thus unset), <filename>live-helper</filename> will automatically set it to a default value. </para>
<para> All config files are shell scripts which are sourced by a <filename>live-helper</filename> program. That means they have to follow the normal shell syntax. You can also put comments in these files; lines beginning with "#" are ignored. </para>
<para> In some rare cases you may want to have different versions of these files for different architectures or distributions. If files named <command>config/stage.arch</command> or <command>config/stage_helper.arch</command>, and <command>config/stage.dist</command> or <command>config/stage_helper.dist</command> exist (where "arch" is the same as the output of <command>dpkg --print-architecture</command> and "dist" is the same as the codename of the target distribution), then they will be used in preference to the other, more general files. </para>
<para> Please see <xref linkend="installation"/> for information on how to install <filename>live-helper</filename>. </para>
@@ -80,9 +82,9 @@
</section>
<section id="live-initramfs">
<title>The <filename>live-initramfs</filename> package</title>
- <para> <filename>live-initramfs</filename> is a collection of scripts providing hooks for the <command>initramfs-tools</command>, used to generate an initramfs capable of booting live systems, such as those created by <command>live-helper</command>. This includes the Debian Live isos, netboot tarballs, and usb stick images. </para>
+ <para><filename>live-initramfs</filename> is a collection of scripts providing hooks for the <command>initramfs-tools</command>, used to generate an initramfs capable of booting live systems, such as those created by <command>live-helper</command>. This includes the Debian Live isos, netboot tarballs, and usb stick images. </para>
<para> At boot time it will look for read-only media containing a "/live" directory where a root filesystem (often a compressed filesystem image like squashfs) is stored. If found, it will create a writable environment, using aufs or unionfs, for Debian like systems to boot from. </para>
- <para> <filename>live-initramfs</filename> is a fork of <ulink url="http://packages.ubuntu.com/casper">casper</ulink>. </para>
+ <para><filename>live-initramfs</filename> is a fork of <ulink url="http://packages.ubuntu.com/casper">casper</ulink>. </para>
<para> More information on initial ramfs in Debian can be found in the <ulink url="http://kernel-handbook.alioth.debian.org/"> Debian Linux Kernel Handbook</ulink>'s chapter on <ulink url="http://kernel-handbook.alioth.debian.org/ch-initramfs.html"> initramfs</ulink>. </para>
</section>
</chapter>
diff --git a/manual/en/procedures.xml b/manual/en/other/procedures.xml
similarity index 100%
rename from manual/en/procedures.xml
rename to manual/en/other/procedures.xml
diff --git a/manual/en/reporting-bugs.xml b/manual/en/other/reporting-bugs.xml
similarity index 100%
rename from manual/en/reporting-bugs.xml
rename to manual/en/other/reporting-bugs.xml
diff --git a/manual/en/resources.xml b/manual/en/other/resources.xml
similarity index 100%
rename from manual/en/resources.xml
rename to manual/en/other/resources.xml
diff --git a/manual/en/success-stories.xml b/manual/en/other/success-stories.xml
similarity index 100%
rename from manual/en/success-stories.xml
rename to manual/en/other/success-stories.xml
diff --git a/manual/en/troubleshooting.xml b/manual/en/other/troubleshooting.xml
similarity index 100%
rename from manual/en/troubleshooting.xml
rename to manual/en/other/troubleshooting.xml
diff --git a/manual/en/use-cases.xml b/manual/en/other/use-cases.xml
similarity index 100%
rename from manual/en/use-cases.xml
rename to manual/en/other/use-cases.xml
diff --git a/manual/po/de/about_manual.xml.po b/manual/po/de/manual.xml.po
similarity index 72%
copy from manual/po/de/about_manual.xml.po
copy to manual/po/de/manual.xml.po
index d765bde..b1f7d06 100644
--- a/manual/po/de/about_manual.xml.po
+++ b/manual/po/de/manual.xml.po
@@ -1,12 +1,13 @@
# German translations for live-manual package
-# Copyright (C) 2006-2010 Debian Live Project <debian-live at lists.debian.org>
+# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-18 17:51+0300\n"
-"PO-Revision-Date: 2010-06-06 17:46+0300\n"
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-06-18 18:28+0300\n"
+"PO-Revision-Date: 2010-06-18 18:28+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: de\n"
@@ -16,12 +17,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <sect1><title>
-#: en/about_manual.xml:4
+#: en/about/manual.xml:4
msgid "About this manual"
msgstr ""
#. type: Content of: <sect1><para>
-#: en/about_manual.xml:5
+#: en/about/manual.xml:5
msgid ""
"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-"
@@ -29,7 +30,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><para>
-#: en/about_manual.xml:6
+#: en/about/manual.xml:6
msgid ""
"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</"
@@ -40,17 +41,17 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:8
+#: en/about/manual.xml:8
msgid "Terms"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:11
+#: en/about/manual.xml:11
msgid "Live system"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:13
+#: en/about/manual.xml:13
msgid ""
"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 "
@@ -60,24 +61,28 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:17
+#: en/about/manual.xml:17
+#, fuzzy
+#| msgid "Debian Live Project"
msgid "Debian Live"
-msgstr ""
+msgstr "Debian Live Projekt"
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:19
+#: en/about/manual.xml:19
msgid ""
"The Debian sub-project which maintains the <filename>live-helper</filename> "
"and <filename>live-initramfs</filename> utilities."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:23
+#: en/about/manual.xml:23
+#, fuzzy
+#| msgid "Debian Live Project"
msgid "Debian Live system"
-msgstr ""
+msgstr "Debian Live Projekt"
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:25
+#: en/about/manual.xml:25
msgid ""
"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), "
@@ -85,120 +90,122 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:29
+#: en/about/manual.xml:29
msgid "Build system / host system"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:31
+#: en/about/manual.xml:31
msgid "The environment used to create the live system."
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/about_manual.xml:35 en/overview.xml:7
+#: en/about/manual.xml:36 en/other/overview.xml:8
msgid "<filename>live-helper</filename>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:37
+#: en/about/manual.xml:39
msgid "A collection of scripts used to build customised Debian Live systems."
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/about_manual.xml:41 en/installation.xml:69
+#: en/about/manual.xml:44 en/other/installation.xml:70
msgid "<filename>live-initramfs</filename>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:43
+#: en/about/manual.xml:47
msgid ""
"A collection of scripts used to boot live systems. <filename>live-initramfs</"
"filename> is a fork of <filename>casper</filename> by Canonical, Ltd."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:48
+#: en/about/manual.xml:52
msgid "<filename>live-package</filename>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:51
+#: en/about/manual.xml:55
msgid "The former name of <filename>live-helper</filename>."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:55
+#: en/about/manual.xml:59
msgid "Debian Installer / (d-i)"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:57
+#: en/about/manual.xml:61
msgid "The official installation system for the Debian distribution."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:61 en/customization_bootup.xml:46
+#: en/about/manual.xml:65 en/other/customization_bootup.xml:46
msgid "Cheat codes"
msgstr ""
#. type: Content of: <chapter><para>
-#: en/about_manual.xml:63 en/customization_bootup.xml:6
-#: en/customization_bootup.xml:12 en/customization_bootup.xml:15
-#: en/customization_bootup.xml:23 en/customization_bootup.xml:35
-#: en/customization_bootup.xml:39 en/customization_bootup.xml:43
-#: en/customization_bootup.xml:47 en/customization_packages.xml:16
-#: en/customization_packages.xml:128 en/customization_packages.xml:136
-#: en/customization_packages.xml:158 en/customization_packages.xml:196
-#: en/customization_packages.xml:207 en/live-environment.xml:7
-#: en/resources.xml:7 en/success-stories.xml:6
+#: en/about/manual.xml:67 en/other/customization_bootup.xml:6
+#: en/other/customization_bootup.xml:12 en/other/customization_bootup.xml:15
+#: en/other/customization_bootup.xml:23 en/other/customization_bootup.xml:35
+#: en/other/customization_bootup.xml:39 en/other/customization_bootup.xml:43
+#: en/other/customization_bootup.xml:47 en/other/customization_packages.xml:16
+#: en/other/customization_packages.xml:128
+#: en/other/customization_packages.xml:136
+#: en/other/customization_packages.xml:158
+#: en/other/customization_packages.xml:196
+#: en/other/customization_packages.xml:207 en/other/live-environment.xml:7
+#: en/other/resources.xml:7 en/other/success-stories.xml:6
msgid "FIXME"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:67
+#: en/about/manual.xml:71
msgid "chroot"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:69
+#: en/about/manual.xml:73
msgid ""
"The chroot program, chroot(8), enables us to run different instances of the "
"GNU/Linux environment on a single system simultaneously without rebooting."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:73
+#: en/about/manual.xml:77
msgid "binary image"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:75
+#: en/about/manual.xml:79
msgid ""
"On a live system, binary image refers to the binary filesystem and the "
"respective extension, such as binary.iso or binary.img."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:79
+#: en/about/manual.xml:83
msgid "Target distribution"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:81
+#: en/about/manual.xml:85
msgid ""
"The distribution upon which your live system will be based. This can differ "
"from the distribution of your Build System."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:85
+#: en/about/manual.xml:89
msgid ""
"<emphasis>lenny</emphasis>/<emphasis>squeeze</emphasis>/<emphasis>sid</"
"emphasis> stable/testing/unstable"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:87
+#: en/about/manual.xml:91
msgid ""
"The \"stable\" distribution contains the latest officially released "
"distribution of Debian. The \"testing\" distribution is the staging area for "
@@ -210,7 +217,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:88
+#: en/about/manual.xml:92
msgid ""
"At the time of writing, <emphasis>lenny</emphasis> is the current \"stable\" "
"release and <emphasis>squeeze</emphasis> is the current \"testing\" release. "
@@ -219,82 +226,82 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:94
+#: en/about/manual.xml:98
msgid "Authors"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:95
+#: en/about/manual.xml:99
msgid "A list of authors (in alphabetical order):"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:98
+#: en/about/manual.xml:102
msgid "Ben Armstrong"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:101
+#: en/about/manual.xml:105
msgid "Brendan Sleight"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:104
+#: en/about/manual.xml:108
msgid "Chris Lamb"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:107
+#: en/about/manual.xml:111
msgid "Daniel Baumann"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:110
+#: en/about/manual.xml:114
msgid "Franklin Piat"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:113
+#: en/about/manual.xml:117
msgid "Jonas Stein"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:116
+#: en/about/manual.xml:120
msgid "Kai Hendry"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:119
+#: en/about/manual.xml:123
msgid "Marco Amadori"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:122
+#: en/about/manual.xml:126
msgid "Mathieu Geli"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:125
+#: en/about/manual.xml:129
msgid "Matthias Kirschner"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:128
+#: en/about/manual.xml:132
msgid "Richard Nelson"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:131
+#: en/about/manual.xml:135
msgid "Trent W. Buck"
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:136
+#: en/about/manual.xml:140
msgid "Contributing to this document"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:137
+#: en/about/manual.xml:141
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -303,7 +310,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:138
+#: en/about/manual.xml:142
msgid ""
"When submitting a contribution please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted the "
@@ -312,43 +319,52 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:139
+#: en/about/manual.xml:143
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can checkout the latest copy by executing:"
msgstr ""
#. type: Content of: <sect1><sect2><para><screen>
-#: en/about_manual.xml:141
+#: en/about/manual.xml:145
#, no-wrap
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:141 en/about_manual.xml:145 en/about_manual.xml:149
-#: en/about_manual.xml:158 en/about_manual.xml:164 en/about_manual.xml:170
-#: en/about_manual.xml:176 en/about_manual.xml:182 en/basics.xml:43
-#: en/basics.xml:48 en/basics.xml:55 en/basics.xml:58 en/basics.xml:70
-#: en/basics.xml:79 en/basics.xml:83 en/basics.xml:87 en/basics.xml:93
-#: en/basics.xml:103 en/basics.xml:116 en/basics.xml:120 en/basics.xml:124
-#: en/basics.xml:137 en/basics.xml:141 en/basics.xml:146 en/basics.xml:158
-#: en/basics.xml:168 en/basics.xml:180 en/basics.xml:184 en/basics.xml:203
-#: en/basics.xml:218 en/customization_packages.xml:23
-#: en/customization_packages.xml:27 en/customization_packages.xml:32
-#: en/customization_packages.xml:36 en/customization_packages.xml:46
-#: en/customization_packages.xml:100 en/customization_packages.xml:104
-#: en/customization_packages.xml:114 en/customization_packages.xml:130
-#: en/customization_packages.xml:138 en/customization_packages.xml:142
-#: en/customization_packages.xml:146 en/customization_packages.xml:150
-#: en/faq.xml:34 en/faq.xml:126 en/faq.xml:129 en/faq.xml:136 en/faq.xml:139
-#: en/faq.xml:161 en/faq.xml:186 en/faq.xml:208 en/howtos.xml:17
-#: en/howtos.xml:23 en/howtos.xml:29 en/overview.xml:59 en/overview.xml:64
-#: en/overview.xml:68
+#: en/about/manual.xml:145 en/about/manual.xml:149 en/about/manual.xml:153
+#: en/about/manual.xml:162 en/about/manual.xml:168 en/about/manual.xml:174
+#: en/about/manual.xml:180 en/about/manual.xml:186 en/other/basics.xml:43
+#: en/other/basics.xml:48 en/other/basics.xml:55 en/other/basics.xml:58
+#: en/other/basics.xml:70 en/other/basics.xml:79 en/other/basics.xml:83
+#: en/other/basics.xml:87 en/other/basics.xml:93 en/other/basics.xml:103
+#: en/other/basics.xml:116 en/other/basics.xml:120 en/other/basics.xml:124
+#: en/other/basics.xml:137 en/other/basics.xml:141 en/other/basics.xml:146
+#: en/other/basics.xml:158 en/other/basics.xml:168 en/other/basics.xml:180
+#: en/other/basics.xml:184 en/other/basics.xml:203 en/other/basics.xml:218
+#: en/other/customization_packages.xml:23
+#: en/other/customization_packages.xml:27
+#: en/other/customization_packages.xml:32
+#: en/other/customization_packages.xml:36
+#: en/other/customization_packages.xml:46
+#: en/other/customization_packages.xml:100
+#: en/other/customization_packages.xml:104
+#: en/other/customization_packages.xml:114
+#: en/other/customization_packages.xml:130
+#: en/other/customization_packages.xml:138
+#: en/other/customization_packages.xml:142
+#: en/other/customization_packages.xml:146
+#: en/other/customization_packages.xml:150 en/other/faq.xml:34
+#: en/other/faq.xml:126 en/other/faq.xml:129 en/other/faq.xml:136
+#: en/other/faq.xml:139 en/other/faq.xml:161 en/other/faq.xml:186
+#: en/other/faq.xml:208 en/other/howtos.xml:17 en/other/howtos.xml:23
+#: en/other/howtos.xml:29 en/other/overview.xml:61 en/other/overview.xml:66
+#: en/other/overview.xml:70
msgid "<placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:143
+#: en/about/manual.xml:147
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -356,31 +372,31 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para><screen>
-#: en/about_manual.xml:145
+#: en/about/manual.xml:149
#, no-wrap
msgid "# apt-get install dblatex docbook-xml docbook-xsl make po4a w3m"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:147
+#: en/about/manual.xml:151
msgid ""
"You may build the live-manual from the top level directory of your git "
"checkout by executing:"
msgstr ""
#. type: Content of: <sect1><sect2><para><screen>
-#: en/about_manual.xml:149
+#: en/about/manual.xml:153
#, no-wrap
msgid "$ make build"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_manual.xml:152
+#: en/about/manual.xml:156
msgid "Applying patches"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_manual.xml:153
+#: en/about/manual.xml:157
msgid ""
"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 "
@@ -388,40 +404,40 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:156
+#: en/about/manual.xml:160
msgid "Fetch the public commit key:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:158
+#: en/about/manual.xml:162
#, no-wrap
msgid "$ 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*"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:162
+#: en/about/manual.xml:166
msgid "Add the following section to your openssh-client config:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:164
+#: en/about/manual.xml:168
#, no-wrap
msgid " $ cat >> ~/.ssh/config << EOF Host live.debian.net Hostname live.debian.net User gitosis IdentityFile ~/.ssh/identity.d/live-manual at debian-live EOF"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:168
+#: en/about/manual.xml:172
msgid "Checkout a clone of the manual through ssh:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:170
+#: en/about/manual.xml:174
#, no-wrap
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:174
+#: en/about/manual.xml:178
msgid ""
"Commit the file after editing. Write commit messages, that consist of full "
"useful sentences, starting with a capital letter and ending with a full "
@@ -429,18 +445,18 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:176
+#: en/about/manual.xml:180
#, no-wrap
msgid "$ git commit -a"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:180
+#: en/about/manual.xml:184
msgid "Push the commit to the server:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:182
+#: en/about/manual.xml:186
#, no-wrap
msgid "$ git push"
msgstr ""
diff --git a/manual/po/de/about.xml.po b/manual/po/de/other.xml.po
similarity index 57%
copy from manual/po/de/about.xml.po
copy to manual/po/de/other.xml.po
index c509561..de95361 100644
--- a/manual/po/de/about.xml.po
+++ b/manual/po/de/other.xml.po
@@ -1,12 +1,13 @@
# German translations for live-manual package
-# Copyright (C) 2006-2010 Debian Live Project <debian-live at lists.debian.org>
+# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-06-18 18:53+0300\n"
+"PO-Revision-Date: 2010-06-18 18:28+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: de\n"
@@ -15,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. type: Content of: <chapter><title>
-#: en/chapters/about.xml:9
-msgid "About"
+#. type: Content of: <part><title>
+#: en/other.xml:4
+msgid "Other"
msgstr ""
diff --git a/manual/po/de/about_project.xml.po b/manual/po/de/project.xml.po
similarity index 85%
copy from manual/po/de/about_project.xml.po
copy to manual/po/de/project.xml.po
index 264c389..c0708e2 100644
--- a/manual/po/de/about_project.xml.po
+++ b/manual/po/de/project.xml.po
@@ -1,12 +1,13 @@
# German translations for live-manual package
-# Copyright (C) 2006-2010 Debian Live Project <debian-live at lists.debian.org>
+# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-18 17:51+0300\n"
-"PO-Revision-Date: 2010-06-06 17:46+0300\n"
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-06-18 18:28+0300\n"
+"PO-Revision-Date: 2010-06-18 18:28+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: de\n"
@@ -16,22 +17,24 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <sect1><title>
-#: en/about_project.xml:4
+#: en/about/project.xml:4
+#, fuzzy
+#| msgid "Debian Live Project"
msgid "About the Debian Live Project"
-msgstr ""
+msgstr "Debian Live Projekt"
#. type: Content of: <sect1><sect2><title>
-#: en/about_project.xml:6
+#: en/about/project.xml:6
msgid "Motivation"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:8
+#: en/about/project.xml:8
msgid "What is wrong with current live systems"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:9
+#: en/about/project.xml:9
msgid ""
"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 "
@@ -39,59 +42,59 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:12
+#: en/about/project.xml:12
msgid "They are unofficial projects, developed outside of Debian."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:15
+#: en/about/project.xml:15
msgid "They mix different distributions, e.g. testing and unstable."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:18
+#: en/about/project.xml:18
msgid "They support i386 only."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:21
+#: en/about/project.xml:21
msgid ""
"They modify the behaviour and/or appearance of packages by stripping them "
"down to save space."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:24
+#: en/about/project.xml:24
msgid "They include unofficial packages."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:27
+#: en/about/project.xml:27
msgid ""
"They ship custom kernels with additional patches that are not part of Debian."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:30
+#: en/about/project.xml:30
msgid ""
"They are large and slow due to their sheer size and thus not suitable for "
"rescue issues."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:33
+#: en/about/project.xml:33
msgid ""
"They are not available in different flavours, e.g. CDs, DVDs, USB-stick and "
"netboot images."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:38
+#: en/about/project.xml:38
msgid "Why create our own live system?"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:39
+#: en/about/project.xml:39
msgid ""
"Debian is the Universal Operating System: Debian should have an official "
"live system for showing around and to officially represent the true, one and "
@@ -99,47 +102,47 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:42
+#: en/about/project.xml:42
msgid "It would be an official Debian subproject."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:45
+#: en/about/project.xml:45
msgid "It reflects the (current) state of one distribution."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:48
+#: en/about/project.xml:48
msgid "It runs on as many architectures as possible."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:51
+#: en/about/project.xml:51
msgid "It consists of unchanged Debian packages only."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:54
+#: en/about/project.xml:54
msgid "It does not contain any unofficial packages."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:57
+#: en/about/project.xml:57
msgid "It uses an unaltered Debian kernel-image with no additional patches."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/about_project.xml:63
+#: en/about/project.xml:63
msgid "Philosophy"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:65
+#: en/about/project.xml:65
msgid "Only unchanged, official packages"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:66
+#: en/about/project.xml:66
msgid ""
"We will only use official packages from the Debian repository in the \"main"
"\" section (possibly contrib, although not decided yet). The non-free "
@@ -148,14 +151,14 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:67
+#: en/about/project.xml:67
msgid ""
"We will not change any packages. Whenever we need to change something, we "
"will do that in coordination with its package maintainer in Debian."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:68
+#: en/about/project.xml:68
msgid ""
"As an exception, our own packages such as <filename>live-helper</filename> "
"or <filename>live-initramfs</filename> may temporarily be used from our own "
@@ -164,12 +167,12 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:71
+#: en/about/project.xml:71
msgid "No package configuration of the live system"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:72
+#: en/about/project.xml:72
msgid ""
"In this phase we will not ship or install sample or alternative "
"configurations. All packages are used in their default configuration as they "
@@ -177,14 +180,14 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:73
+#: en/about/project.xml:73
msgid ""
"Whenever we need a different default configuration, we will do that in "
"coordination with its package maintainer in Debian."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:74
+#: en/about/project.xml:74
msgid ""
"A system for configuring packages is provided using debconf in <command>lh "
"config</command> (use --preseed FILE) allowing custom configured packages to "
@@ -194,7 +197,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:75
+#: en/about/project.xml:75
msgid ""
"Exception: There are a few essential changes needed to bring a live system "
"to life (e.g. configuring pam to allow empty passwords). These essential "
@@ -203,12 +206,12 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:78
+#: en/about/project.xml:78
msgid "Live system to hard disk installer"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:79
+#: en/about/project.xml:79
msgid ""
"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 "
@@ -218,7 +221,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:80
+#: en/about/project.xml:80
msgid ""
"Therefore, we will ship a copy of the regular DebianInstaller (resp. Debian "
"Installer, Graphical Installer) instead, to allow users to perform a regular "
@@ -227,17 +230,17 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/about_project.xml:84
+#: en/about/project.xml:84
msgid "Contact"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:87
+#: en/about/project.xml:87
msgid "Mailing list"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:89
+#: en/about/project.xml:89
msgid ""
"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 "
@@ -247,12 +250,12 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:93
+#: en/about/project.xml:93
msgid "IRC"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:95
+#: en/about/project.xml:95
msgid ""
"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="
@@ -262,12 +265,12 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:99
+#: en/about/project.xml:99
msgid "BTS"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:101
+#: en/about/project.xml:101
msgid ""
"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 "
@@ -276,12 +279,12 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:105
+#: en/about/project.xml:105
msgid "Wiki"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:107
+#: en/about/project.xml:107
msgid ""
"The <ulink url=\"http://wiki.debian.org/DebianLive\">Debian Live wiki</"
"ulink> is a place to gather information, discuss applied technologies, and "
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index 2d5f74c..3abc960 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -1,30 +1,31 @@
[po4a_langs] de
[po4a_paths] pot/$master.pot $lang:po/$lang/$master.po
-[type: docbook] en/about_manual.xml $lang:$lang/about_manual.xml
-[type: docbook] en/about_project.xml $lang:$lang/about_project.xml
[type: docbook] en/about.xml $lang:$lang/about.xml
-[type: docbook] en/appendices_configuration-files.xml $lang:$lang/appendices_configuration-files.xml
-[type: docbook] en/appendices_configuration-layout.xml $lang:$lang/appendices_configuration-layout.xml
-[type: docbook] en/basics.xml $lang:$lang/basics.xml
-[type: docbook] en/coding-style.xml $lang:$lang/coding-style.xml
-[type: docbook] en/common-tasks.xml $lang:$lang/common-tasks.xml
-[type: docbook] en/customization_backports.xml $lang:$lang/customization_backports.xml
-[type: docbook] en/customization_binary.xml $lang:$lang/customization_binary.xml
-[type: docbook] en/customization_bootup.xml $lang:$lang/customization_bootup.xml
-[type: docbook] en/customization_contents.xml $lang:$lang/customization_contents.xml
-[type: docbook] en/customization_internationalization.xml $lang:$lang/customization_internationalization.xml
-[type: docbook] en/customization_packages.xml $lang:$lang/customization_packages.xml
-[type: docbook] en/customization.xml $lang:$lang/customization.xml
-[type: docbook] en/faq.xml $lang:$lang/faq.xml
-[type: docbook] en/howtos.xml $lang:$lang/howtos.xml
[type: docbook] en/index.xml $lang:$lang/index.xml
-[type: docbook] en/installation.xml $lang:$lang/installation.xml
-[type: docbook] en/live-environment.xml $lang:$lang/live-environment.xml
-[type: docbook] en/overview.xml $lang:$lang/overview.xml
-[type: docbook] en/procedures.xml $lang:$lang/procedures.xml
-[type: docbook] en/reporting-bugs.xml $lang:$lang/reporting-bugs.xml
-[type: docbook] en/resources.xml $lang:$lang/resources.xml
-[type: docbook] en/success-stories.xml $lang:$lang/success-stories.xml
-[type: docbook] en/troubleshooting.xml $lang:$lang/troubleshooting.xml
-[type: docbook] en/use-cases.xml $lang:$lang/use-cases.xml
+[type: docbook] en/other.xml $lang:$lang/other.xml
+[type: docbook] en/about/manual.xml $lang:$lang/about/manual.xml
+[type: docbook] en/about/project.xml $lang:$lang/about/project.xml
+[type: docbook] en/other/appendices_configuration-files.xml $lang:$lang/other/appendices_configuration-files.xml
+[type: docbook] en/other/appendices_configuration-layout.xml $lang:$lang/other/appendices_configuration-layout.xml
+[type: docbook] en/other/basics.xml $lang:$lang/other/basics.xml
+[type: docbook] en/other/coding-style.xml $lang:$lang/other/coding-style.xml
+[type: docbook] en/other/common-tasks.xml $lang:$lang/other/common-tasks.xml
+[type: docbook] en/other/customization_backports.xml $lang:$lang/other/customization_backports.xml
+[type: docbook] en/other/customization_binary.xml $lang:$lang/other/customization_binary.xml
+[type: docbook] en/other/customization_bootup.xml $lang:$lang/other/customization_bootup.xml
+[type: docbook] en/other/customization_contents.xml $lang:$lang/other/customization_contents.xml
+[type: docbook] en/other/customization_internationalization.xml $lang:$lang/other/customization_internationalization.xml
+[type: docbook] en/other/customization_packages.xml $lang:$lang/other/customization_packages.xml
+[type: docbook] en/other/customization.xml $lang:$lang/other/customization.xml
+[type: docbook] en/other/faq.xml $lang:$lang/other/faq.xml
+[type: docbook] en/other/howtos.xml $lang:$lang/other/howtos.xml
+[type: docbook] en/other/installation.xml $lang:$lang/other/installation.xml
+[type: docbook] en/other/live-environment.xml $lang:$lang/other/live-environment.xml
+[type: docbook] en/other/overview.xml $lang:$lang/other/overview.xml
+[type: docbook] en/other/procedures.xml $lang:$lang/other/procedures.xml
+[type: docbook] en/other/reporting-bugs.xml $lang:$lang/other/reporting-bugs.xml
+[type: docbook] en/other/resources.xml $lang:$lang/other/resources.xml
+[type: docbook] en/other/success-stories.xml $lang:$lang/other/success-stories.xml
+[type: docbook] en/other/troubleshooting.xml $lang:$lang/other/troubleshooting.xml
+[type: docbook] en/other/use-cases.xml $lang:$lang/other/use-cases.xml
[type: xhtml] en/index.html.in $lang:$lang/index.html.in
diff --git a/manual/pot/manual.xml.pot b/manual/pot/manual.xml.pot
index 64890ac..d0571bb 100644
--- a/manual/pot/manual.xml.pot
+++ b/manual/pot/manual.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2010-06-18 18:28+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -15,81 +15,13 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: ENCODING"
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/basics.xml:113 en/chapters/basics.xml:128
-#: en/chapters/basics.xml:144 en/chapters/basics.xml:158
-#: en/chapters/basics.xml:194 en/chapters/basics.xml:220
-#: en/chapters/basics.xml:230 en/chapters/basics.xml:239
-#: en/chapters/basics.xml:253 en/chapters/basics.xml:275
-#: en/chapters/basics.xml:302 en/chapters/basics.xml:312
-#: en/chapters/basics.xml:320 en/chapters/basics.xml:354
-#: en/chapters/basics.xml:364 en/chapters/basics.xml:382
-#: en/chapters/basics.xml:429 en/chapters/basics.xml:498
-#: en/chapters/basics.xml:530 en/chapters/basics.xml:539
-#: en/chapters/basics.xml:590 en/chapters/basics.xml:646
-#: en/chapters/faq.xml:64 en/chapters/faq.xml:241 en/chapters/faq.xml:244
-#: en/chapters/faq.xml:252 en/chapters/faq.xml:256 en/chapters/faq.xml:264
-#: en/chapters/faq.xml:279 en/chapters/faq.xml:287 en/chapters/faq.xml:334
-#: en/chapters/faq.xml:424 en/chapters/faq.xml:430 en/chapters/faq.xml:481
-#: en/chapters/faq.xml:483 en/chapters/faq.xml:487 en/chapters/faq.xml:491
-#: en/chapters/overview.xml:181 en/chapters/overview.xml:230
-#: en/chapters/overview.xml:240 en/chapters/about/manual.xml:298
-#: en/chapters/about/manual.xml:308 en/chapters/about/manual.xml:318
-#: en/chapters/about/manual.xml:338 en/chapters/about/manual.xml:351
-#: en/chapters/about/manual.xml:366 en/chapters/about/manual.xml:379
-#: en/chapters/about/manual.xml:389 en/chapters/customization/packages.xml:50
-#: en/chapters/customization/packages.xml:58
-#: en/chapters/customization/packages.xml:71
-#: en/chapters/customization/packages.xml:80
-#: en/chapters/customization/packages.xml:104
-#: en/chapters/customization/packages.xml:222
-#: en/chapters/customization/packages.xml:230
-#: en/chapters/customization/packages.xml:265
-#: en/chapters/customization/packages.xml:310
-#: en/chapters/customization/packages.xml:330
-#: en/chapters/customization/packages.xml:341
-#: en/chapters/customization/packages.xml:352
-#: en/chapters/customization/packages.xml:362
-msgid "<placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/installation.xml:76 en/chapters/about/manual.xml:90
-msgid "&live-initramfs;"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/live-environment.xml:11 en/chapters/resources.xml:11
-#: en/chapters/success-stories.xml:11 en/chapters/about/manual.xml:125
-#: en/chapters/customization/bootup.xml:11
-#: en/chapters/customization/bootup.xml:20
-#: en/chapters/customization/bootup.xml:26
-#: en/chapters/customization/bootup.xml:38
-#: en/chapters/customization/bootup.xml:85
-#: en/chapters/customization/bootup.xml:92
-#: en/chapters/customization/bootup.xml:99
-#: en/chapters/customization/bootup.xml:106
-#: en/chapters/customization/packages.xml:36
-#: en/chapters/customization/packages.xml:306
-#: en/chapters/customization/packages.xml:326
-#: en/chapters/customization/packages.xml:384
-#: en/chapters/customization/packages.xml:492
-#: en/chapters/customization/packages.xml:535
-msgid "FIXME"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/overview.xml:17 en/chapters/about/manual.xml:80
-msgid "&live-helper;"
-msgstr ""
-
#. type: Content of: <sect1><title>
-#: en/chapters/about/manual.xml:9
+#: en/about/manual.xml:4
msgid "About this manual"
msgstr ""
#. type: Content of: <sect1><para>
-#: en/chapters/about/manual.xml:12
+#: en/about/manual.xml:5
msgid ""
"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-"
@@ -97,7 +29,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><para>
-#: en/chapters/about/manual.xml:18
+#: en/about/manual.xml:6
msgid ""
"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</"
@@ -108,44 +40,44 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/manual.xml:28
+#: en/about/manual.xml:8
msgid "Terms"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:33
+#: en/about/manual.xml:11
msgid "Live system"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:37
+#: en/about/manual.xml:13
msgid ""
-"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)."
+"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)."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:47
+#: en/about/manual.xml:17
msgid "Debian Live"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:51
+#: en/about/manual.xml:19
msgid ""
-"The Debian sub-project which maintains the &live-helper; and &live-"
-"initramfs; utilities."
+"The Debian sub-project which maintains the <filename>live-helper</filename> "
+"and <filename>live-initramfs</filename> utilities."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:58
+#: en/about/manual.xml:23
msgid "Debian Live system"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:62
+#: en/about/manual.xml:25
msgid ""
"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), "
@@ -153,95 +85,122 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:70
+#: en/about/manual.xml:29
msgid "Build system / host system"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:74
+#: en/about/manual.xml:31
msgid "The environment used to create the live system."
msgstr ""
+#. type: Content of: <chapter><section><title>
+#: en/about/manual.xml:36 en/other/overview.xml:8
+msgid "<filename>live-helper</filename>"
+msgstr ""
+
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:84
+#: en/about/manual.xml:39
msgid "A collection of scripts used to build customised Debian Live systems."
msgstr ""
+#. type: Content of: <chapter><section><section><title>
+#: en/about/manual.xml:44 en/other/installation.xml:70
+msgid "<filename>live-initramfs</filename>"
+msgstr ""
+
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:94
+#: en/about/manual.xml:47
msgid ""
-"A collection of scripts used to boot live systems. &live-initramfs; is a "
-"fork of <filename>casper</filename> by Canonical, Ltd."
+"A collection of scripts used to boot live systems. <filename>live-initramfs</"
+"filename> is a fork of <filename>casper</filename> by Canonical, Ltd."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:101
+#: en/about/manual.xml:52
msgid "<filename>live-package</filename>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:105
-msgid "The former name of &live-helper;."
+#: en/about/manual.xml:55
+msgid "The former name of <filename>live-helper</filename>."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:111
+#: en/about/manual.xml:59
msgid "Debian Installer / (d-i)"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:115
+#: en/about/manual.xml:61
msgid "The official installation system for the Debian distribution."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/manual.xml:121 en/chapters/customization/bootup.xml:104
+#: en/about/manual.xml:65 en/other/customization_bootup.xml:46
msgid "Cheat codes"
msgstr ""
+#. type: Content of: <chapter><para>
+#: en/about/manual.xml:67 en/other/customization_bootup.xml:6
+#: en/other/customization_bootup.xml:12 en/other/customization_bootup.xml:15
+#: en/other/customization_bootup.xml:23 en/other/customization_bootup.xml:35
+#: en/other/customization_bootup.xml:39 en/other/customization_bootup.xml:43
+#: en/other/customization_bootup.xml:47 en/other/customization_packages.xml:16
+#: en/other/customization_packages.xml:128
+#: en/other/customization_packages.xml:136
+#: en/other/customization_packages.xml:158
+#: en/other/customization_packages.xml:196
+#: en/other/customization_packages.xml:207 en/other/live-environment.xml:7
+#: en/other/resources.xml:7 en/other/success-stories.xml:6
+msgid "FIXME"
+msgstr ""
+
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:131
+#: en/about/manual.xml:71
msgid "chroot"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:135
+#: en/about/manual.xml:73
msgid ""
"The chroot program, chroot(8), enables us to run different instances of the "
"GNU/Linux environment on a single system simultaneously without rebooting."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:143
+#: en/about/manual.xml:77
msgid "binary image"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:147
+#: en/about/manual.xml:79
msgid ""
"On a live system, binary image refers to the binary filesystem and the "
"respective extension, such as binary.iso or binary.img."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:154
+#: en/about/manual.xml:83
msgid "Target distribution"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:158
+#: en/about/manual.xml:85
msgid ""
"The distribution upon which your live system will be based. This can differ "
"from the distribution of your Build System."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:165
-msgid "&lenny;/&squeeze;/&sid; stable/testing/unstable"
+#: en/about/manual.xml:89
+msgid ""
+"<emphasis>lenny</emphasis>/<emphasis>squeeze</emphasis>/<emphasis>sid</"
+"emphasis> stable/testing/unstable"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:169
+#: en/about/manual.xml:91
msgid ""
"The \"stable\" distribution contains the latest officially released "
"distribution of Debian. The \"testing\" distribution is the staging area for "
@@ -253,99 +212,100 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:179
+#: en/about/manual.xml:92
msgid ""
-"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."
+"At the time of writing, <emphasis>lenny</emphasis> is the current \"stable\" "
+"release and <emphasis>squeeze</emphasis> is the current \"testing\" release. "
+"<emphasis>sid</emphasis> will always be a synonym for the \"unstable\" "
+"release."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/manual.xml:191
+#: en/about/manual.xml:98
msgid "Authors"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:194
+#: en/about/manual.xml:99
msgid "A list of authors (in alphabetical order):"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:201
+#: en/about/manual.xml:102
msgid "Ben Armstrong"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:207
+#: en/about/manual.xml:105
msgid "Brendan Sleight"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:213
+#: en/about/manual.xml:108
msgid "Chris Lamb"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:219
+#: en/about/manual.xml:111
msgid "Daniel Baumann"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:225
+#: en/about/manual.xml:114
msgid "Franklin Piat"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:231
+#: en/about/manual.xml:117
msgid "Jonas Stein"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:237
+#: en/about/manual.xml:120
msgid "Kai Hendry"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:243
+#: en/about/manual.xml:123
msgid "Marco Amadori"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:249
+#: en/about/manual.xml:126
msgid "Mathieu Geli"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:255
+#: en/about/manual.xml:129
msgid "Matthias Kirschner"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:261
+#: en/about/manual.xml:132
msgid "Richard Nelson"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:267
+#: en/about/manual.xml:135
msgid "Trent W. Buck"
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/manual.xml:276
+#: en/about/manual.xml:140
msgid "Contributing to this document"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:279
+#: en/about/manual.xml:141
msgid ""
"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."
+"linkend=\"contact\"/> for more information."
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:286
+#: en/about/manual.xml:142
msgid ""
"When submitting a contribution please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted the "
@@ -354,20 +314,52 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:293
+#: en/about/manual.xml:143
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can checkout the latest copy by executing:"
msgstr ""
#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/about/manual.xml:298
+#: en/about/manual.xml:145
#, no-wrap
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr ""
+#. type: Content of: <chapter><section><section><para>
+#: en/about/manual.xml:145 en/about/manual.xml:149 en/about/manual.xml:153
+#: en/about/manual.xml:162 en/about/manual.xml:168 en/about/manual.xml:174
+#: en/about/manual.xml:180 en/about/manual.xml:186 en/other/basics.xml:43
+#: en/other/basics.xml:48 en/other/basics.xml:55 en/other/basics.xml:58
+#: en/other/basics.xml:70 en/other/basics.xml:79 en/other/basics.xml:83
+#: en/other/basics.xml:87 en/other/basics.xml:93 en/other/basics.xml:103
+#: en/other/basics.xml:116 en/other/basics.xml:120 en/other/basics.xml:124
+#: en/other/basics.xml:137 en/other/basics.xml:141 en/other/basics.xml:146
+#: en/other/basics.xml:158 en/other/basics.xml:168 en/other/basics.xml:180
+#: en/other/basics.xml:184 en/other/basics.xml:203 en/other/basics.xml:218
+#: en/other/customization_packages.xml:23
+#: en/other/customization_packages.xml:27
+#: en/other/customization_packages.xml:32
+#: en/other/customization_packages.xml:36
+#: en/other/customization_packages.xml:46
+#: en/other/customization_packages.xml:100
+#: en/other/customization_packages.xml:104
+#: en/other/customization_packages.xml:114
+#: en/other/customization_packages.xml:130
+#: en/other/customization_packages.xml:138
+#: en/other/customization_packages.xml:142
+#: en/other/customization_packages.xml:146
+#: en/other/customization_packages.xml:150 en/other/faq.xml:34
+#: en/other/faq.xml:126 en/other/faq.xml:129 en/other/faq.xml:136
+#: en/other/faq.xml:139 en/other/faq.xml:161 en/other/faq.xml:186
+#: en/other/faq.xml:208 en/other/howtos.xml:17 en/other/howtos.xml:23
+#: en/other/howtos.xml:29 en/other/overview.xml:61 en/other/overview.xml:66
+#: en/other/overview.xml:70
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr ""
+
#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:302
+#: en/about/manual.xml:147
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -375,84 +367,72 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/about/manual.xml:308
+#: en/about/manual.xml:149
#, no-wrap
-msgid ""
-"# apt-get install dblatex docbook-xml docbook-xsl make po4a\n"
-"\tw3m"
+msgid "# apt-get install dblatex docbook-xml docbook-xsl make po4a w3m"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:313
+#: en/about/manual.xml:151
msgid ""
"You may build the live-manual from the top level directory of your git "
"checkout by executing:"
msgstr ""
#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/about/manual.xml:318
+#: en/about/manual.xml:153
#, no-wrap
msgid "$ make build"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/manual.xml:322
+#: en/about/manual.xml:156
msgid "Applying patches"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/manual.xml:325
+#: en/about/manual.xml:157
msgid ""
"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 "
+"you to send bigger changes to the mailinglist to discuss them first. In "
"order to push to the repository, the following steps are required."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:334
+#: en/about/manual.xml:160
msgid "Fetch the public commit key:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/chapters/about/manual.xml:338
+#: en/about/manual.xml:162
#, no-wrap
-msgid ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ 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\n"
-"$ 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\n"
-"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*"
+msgid "$ 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*"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:347
+#: en/about/manual.xml:166
msgid "Add the following section to your openssh-client config:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/chapters/about/manual.xml:351
+#: en/about/manual.xml:168
#, no-wrap
-msgid ""
-" $ cat >> ~/.ssh/config << EOF\n"
-"Host live.debian.net\n"
-"\tHostname live.debian.net\n"
-"\tUser gitosis\n"
-"\tIdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
-"EOF"
+msgid " $ cat >> ~/.ssh/config << EOF Host live.debian.net Hostname live.debian.net User gitosis IdentityFile ~/.ssh/identity.d/live-manual at debian-live EOF"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:362
+#: en/about/manual.xml:172
msgid "Checkout a clone of the manual through ssh:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/chapters/about/manual.xml:366
+#: en/about/manual.xml:174
#, no-wrap
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:372
+#: en/about/manual.xml:178
msgid ""
"Commit the file after editing. Write commit messages, that consist of full "
"useful sentences, starting with a capital letter and ending with a full "
@@ -460,18 +440,18 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/chapters/about/manual.xml:379
+#: en/about/manual.xml:180
#, no-wrap
msgid "$ git commit -a"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:385
+#: en/about/manual.xml:184
msgid "Push the commit to the server:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/chapters/about/manual.xml:389
+#: en/about/manual.xml:186
#, no-wrap
msgid "$ git push"
msgstr ""
diff --git a/manual/pot/about.xml.pot b/manual/pot/other.xml.pot
similarity index 80%
copy from manual/pot/about.xml.pot
copy to manual/pot/other.xml.pot
index f9f38b9..e4d2f4b 100644
--- a/manual/pot/about.xml.pot
+++ b/manual/pot/other.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2010-06-18 18:53+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: ENCODING"
-#. type: Content of: <chapter><title>
-#: en/chapters/about.xml:9
-msgid "About"
+#. type: Content of: <part><title>
+#: en/other.xml:4
+msgid "Other"
msgstr ""
diff --git a/manual/pot/project.xml.pot b/manual/pot/project.xml.pot
index 07296ab..a6b7e7b 100644
--- a/manual/pot/project.xml.pot
+++ b/manual/pot/project.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2010-06-18 18:28+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,22 +16,22 @@ msgstr ""
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <sect1><title>
-#: en/chapters/about/project.xml:7
+#: en/about/project.xml:4
msgid "About the Debian Live Project"
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/project.xml:10
+#: en/about/project.xml:6
msgid "Motivation"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/project.xml:13
+#: en/about/project.xml:8
msgid "What is wrong with current live systems"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:15
+#: en/about/project.xml:9
msgid ""
"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 "
@@ -39,59 +39,59 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:18
+#: en/about/project.xml:12
msgid "They are unofficial projects, developed outside of Debian."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:19
+#: en/about/project.xml:15
msgid "They mix different distributions, e.g. testing and unstable."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:20
+#: en/about/project.xml:18
msgid "They support i386 only."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:21
+#: en/about/project.xml:21
msgid ""
"They modify the behaviour and/or appearance of packages by stripping them "
"down to save space."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:22
+#: en/about/project.xml:24
msgid "They include unofficial packages."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:23
+#: en/about/project.xml:27
msgid ""
"They ship custom kernels with additional patches that are not part of Debian."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:24
+#: en/about/project.xml:30
msgid ""
"They are large and slow due to their sheer size and thus not suitable for "
"rescue issues."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:25
+#: en/about/project.xml:33
msgid ""
"They are not available in different flavours, e.g. CDs, DVDs, USB-stick and "
-"netboot images"
+"netboot images."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/project.xml:30
+#: en/about/project.xml:38
msgid "Why create our own live system?"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:32
+#: en/about/project.xml:39
msgid ""
"Debian is the Universal Operating System: Debian should have an official "
"live system for showing around and to officially represent the true, one and "
@@ -99,47 +99,47 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:35
+#: en/about/project.xml:42
msgid "It would be an official Debian subproject."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:36
+#: en/about/project.xml:45
msgid "It reflects the (current) state of one distribution."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:37
+#: en/about/project.xml:48
msgid "It runs on as many architectures as possible."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:38
+#: en/about/project.xml:51
msgid "It consists of unchanged Debian packages only."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:39
+#: en/about/project.xml:54
msgid "It does not contain any unofficial packages."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:40
+#: en/about/project.xml:57
msgid "It uses an unaltered Debian kernel-image with no additional patches."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/project.xml:48
+#: en/about/project.xml:63
msgid "Philosophy"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/project.xml:51
+#: en/about/project.xml:65
msgid "Only unchanged, official packages"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:52
+#: en/about/project.xml:66
msgid ""
"We will only use official packages from the Debian repository in the \"main"
"\" section (possibly contrib, although not decided yet). The non-free "
@@ -148,28 +148,28 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:54
+#: en/about/project.xml:67
msgid ""
"We will not change any packages. Whenever we need to change something, we "
"will do that in coordination with its package maintainer in Debian."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:56
+#: en/about/project.xml:68
msgid ""
-"As an exception, our own packages such as &live-helper; or &live-initramfs; "
-"may temporarily be used from our own repository for development reasons (e."
-"g. to create development snapshots). They will be uploaded to Debian on a "
-"regular basis."
+"As an exception, our own packages such as <filename>live-helper</filename> "
+"or <filename>live-initramfs</filename> may temporarily be used from our own "
+"repository for development reasons (e.g. to create development snapshots). "
+"They will be uploaded to Debian on a regular basis."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/project.xml:60
+#: en/about/project.xml:71
msgid "No package configuration of the live system"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:61
+#: en/about/project.xml:72
msgid ""
"In this phase we will not ship or install sample or alternative "
"configurations. All packages are used in their default configuration as they "
@@ -177,14 +177,14 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:63
+#: en/about/project.xml:73
msgid ""
"Whenever we need a different default configuration, we will do that in "
"coordination with its package maintainer in Debian."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:65
+#: en/about/project.xml:74
msgid ""
"A system for configuring packages is provided using debconf in <command>lh "
"config</command> (use --preseed FILE) allowing custom configured packages to "
@@ -194,7 +194,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:67
+#: en/about/project.xml:75
msgid ""
"Exception: There are a few essential changes needed to bring a live system "
"to life (e.g. configuring pam to allow empty passwords). These essential "
@@ -203,12 +203,12 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/project.xml:71
+#: en/about/project.xml:78
msgid "Live system to hard disk installer"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:72
+#: en/about/project.xml:79
msgid ""
"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 "
@@ -218,7 +218,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:74
+#: en/about/project.xml:80
msgid ""
"Therefore, we will ship a copy of the regular DebianInstaller (resp. Debian "
"Installer, Graphical Installer) instead, to allow users to perform a regular "
@@ -227,17 +227,17 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/project.xml:80
+#: en/about/project.xml:84
msgid "Contact"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/project.xml:83
+#: en/about/project.xml:87
msgid "Mailing list"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/project.xml:84
+#: en/about/project.xml:89
msgid ""
"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 "
@@ -247,12 +247,12 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/project.xml:87
+#: en/about/project.xml:93
msgid "IRC"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/project.xml:88
+#: en/about/project.xml:95
msgid ""
"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="
@@ -262,12 +262,12 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/project.xml:91
+#: en/about/project.xml:99
msgid "BTS"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/project.xml:92
+#: en/about/project.xml:101
msgid ""
"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 "
@@ -276,12 +276,12 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/project.xml:95
+#: en/about/project.xml:105
msgid "Wiki"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/project.xml:96
+#: en/about/project.xml:107
msgid ""
"The <ulink url=\"http://wiki.debian.org/DebianLive\">Debian Live wiki</"
"ulink> is a place to gather information, discuss applied technologies, and "
--
live-manual
More information about the debian-live-changes
mailing list