[SCM] live-manual branch, debian, updated. debian/2.0_a1-1-10-g9a1c73e
Daniel Baumann
daniel at debian.org
Fri Jun 18 15:54:50 UTC 2010
The following commit has been merged in the debian branch:
commit 9a1c73e43797a203274d33aa6e83620dae642c6c
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Jun 18 17:54:02 2010 +0200
Dropping external entities to workaround an alleged bug caused by xmlproc.
diff --git a/Makefile b/Makefile
index 2de1305..29ed63b 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,6 @@ build:
for LANGUAGE in $(LANGUAGES); \
do \
cp -a $(CURDIR)/manual/$${LANGUAGE} $(CURDIR)/build; \
- cp -a $(CURDIR)/xml/*.ent $(CURDIR)/build/$${LANGUAGE}; \
mkdir -p $(CURDIR)/build/$${LANGUAGE}/html; \
cd $(CURDIR)/build/$${LANGUAGE}/html; \
xsltproc --nonet --novalid --xinclude $(CURDIR)/xsl/html.xsl ../index.xml; \
@@ -44,7 +43,7 @@ build:
done
autobuild: clean build
- rm -f build/*/*.xml build/*/*.ent
+ rm -f build/*/*.xml
cp html/* build
for LANGUAGE in $(LANGUAGES); \
diff --git a/manual/de/about.xml b/manual/de/about.xml
index ef8ec09..3ade429 100644
--- a/manual/de/about.xml
+++ b/manual/de/about.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!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"/>
diff --git a/manual/de/about_manual.xml b/manual/de/about_manual.xml
index 674d4d0..1386722 100644
--- a/manual/de/about_manual.xml
+++ b/manual/de/about_manual.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="meta">
<title>About this manual</title>
<para> The main goal of this manual is to serve as a single access point to all
@@ -30,8 +28,8 @@ sticks or over the network (via netboot images). </para>
<varlistentry>
<term>Debian Live</term>
<listitem>
- <para> The Debian sub-project which maintains the &live-helper; and
-&live-initramfs; utilities. </para>
+ <para> The Debian sub-project which maintains the <filename>live-helper</filename>
+and <filename>live-initramfs</filename> utilities. </para>
</listitem>
</varlistentry>
<varlistentry>
@@ -49,16 +47,17 @@ and over the internet (via boot parameter fetch=URL) </para>
</listitem>
</varlistentry>
<varlistentry>
- <term>&live-helper;</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>&live-initramfs;</term>
+ <term><filename>live-initramfs</filename></term>
<listitem>
- <para> A collection of scripts used to boot live systems. &live-initramfs; is a
-fork of <filename>casper</filename> by Canonical, Ltd. </para>
+ <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>
</varlistentry>
<varlistentry>
@@ -66,7 +65,7 @@ fork of <filename>casper</filename> by Canonical, Ltd. </para>
<filename>live-package</filename>
</term>
<listitem>
- <para> The former name of &live-helper;. </para>
+ <para> The former name of <filename>live-helper</filename>. </para>
</listitem>
</varlistentry>
<varlistentry>
@@ -103,7 +102,8 @@ from the distribution of your Build System. </para>
</listitem>
</varlistentry>
<varlistentry>
- <term>&lenny;/&squeeze;/&sid; stable/testing/unstable</term>
+ <term><emphasis>lenny</emphasis>/<emphasis>squeeze</emphasis>/<emphasis>sid</emphasis>
+stable/testing/unstable</term>
<listitem>
<para> The "stable" distribution contains the latest officially released
distribution of Debian. The "testing" distribution is the staging area for
@@ -112,9 +112,10 @@ that it has more recent versions of software relative to the "stable"
release. The "unstable" distribution is where active development of Debian
occurs. Generally, this distribution is run by developers and those who like
to live on the edge. </para>
- <para> At the time of writing, &lenny; is the current "stable" release and
-&squeeze; is the current "testing" release. &sid; will always be a synonym
-for the "unstable" release. </para>
+ <para> 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. </para>
</listitem>
</varlistentry>
</variablelist>
diff --git a/manual/de/about_project.xml b/manual/de/about_project.xml
index 6747b4a..6756b0f 100644
--- a/manual/de/about_project.xml
+++ b/manual/de/about_project.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="about">
<title>About the Debian Live Project</title>
<sect2 id="motivation">
@@ -78,10 +76,10 @@ section (possibly contrib, although not decided yet). The non-free section
is not part of Debian and therefore cannot be used at all for live systems. </para>
<para> We will not change any packages. Whenever we need to change something, we
will do that in coordination with its package maintainer in Debian. </para>
- <para> 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. </para>
+ <para> 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. </para>
</sect3>
<sect3>
<title>No package configuration of the live system</title>
diff --git a/manual/de/appendices_configuration-files.xml b/manual/de/appendices_configuration-files.xml
index 6316541..ff4358c 100644
--- a/manual/de/appendices_configuration-files.xml
+++ b/manual/de/appendices_configuration-files.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="configuration-files">
<title>Configuration files</title>
<section id="config-binary">
diff --git a/manual/de/appendices_configuration-layout.xml b/manual/de/appendices_configuration-layout.xml
index 3e8d475..be5c697 100644
--- a/manual/de/appendices_configuration-layout.xml
+++ b/manual/de/appendices_configuration-layout.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="configuration-layout">
<title>Configuration layout</title>
<variablelist>
diff --git a/manual/de/basics.xml b/manual/de/basics.xml
index a347305..7bfacbc 100644
--- a/manual/de/basics.xml
+++ b/manual/de/basics.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="basics">
<title>The basics</title>
<para> This chapter contains a brief overview of the build process as well as
@@ -60,9 +58,10 @@ media-dependant format(ISO9660 image, disk image, etc.) </para>
</section>
<section>
<title>First steps: building an ISO image</title>
- <para> The following sequence of helper commands, provided by &live-helper;, will
-create a basic ISO image containing just the Debian standard system without
-X.org. It is suitable for burning to CD or DVD media. </para>
+ <para> The following sequence of helper commands, provided by
+<filename>live-helper</filename>, will create a basic ISO image containing
+just the Debian standard system without X.org. It is suitable for burning to
+CD or DVD media. </para>
<para> First, we run the <filename>lh config</filename> helper command which will
create a <filename>"config/"</filename> hierarchy in the current directory
for use by other helper commands: </para>
diff --git a/manual/de/coding-style.xml b/manual/de/coding-style.xml
index eea7357..2fd4cbf 100644
--- a/manual/de/coding-style.xml
+++ b/manual/de/coding-style.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="coding-style">
<title>Coding Style</title>
- <para>This chapter documents the coding style used in &live-helper; and (ideally)
-in &live-initramfs;.</para>
+ <para>This chapter documents the coding style used in
+<filename>live-helper</filename> and (ideally) in
+<filename>live-initramfs</filename>.</para>
<sect1 id="compatibilty">
<title>Compatibility</title>
<itemizedlist>
diff --git a/manual/de/common-tasks.xml b/manual/de/common-tasks.xml
index 198b755..e340c99 100644
--- a/manual/de/common-tasks.xml
+++ b/manual/de/common-tasks.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="common-tasks">
<title>Common tasks</title>
<section id="debian-installer">
@@ -33,7 +31,7 @@ network, resulting in a standard Debian system being installed to the hard
disk. </para>
<para> This whole process can be preseeded and customised in a number of ways; see
the relevant "DebianInstaller" wiki page and installation guide for
-more. This is operational now withing &live-helper;. </para>
+more. This is operational now withing <filename>live-helper</filename>. </para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/manual/de/customization.xml b/manual/de/customization.xml
index 19e3940..923cbfa 100644
--- a/manual/de/customization.xml
+++ b/manual/de/customization.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="customization">
<title>Customization</title>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization_packages.xml"/>
diff --git a/manual/de/customization_backports.xml b/manual/de/customization_backports.xml
index d1f8ef6..5fcdb7c 100644
--- a/manual/de/customization_backports.xml
+++ b/manual/de/customization_backports.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="backports">
<title>Using a newer kernel with Lenny</title>
<para>The backports repository, backports.org, lacks the necessary module packages
diff --git a/manual/de/customization_binary.xml b/manual/de/customization_binary.xml
index e1a5dc4..89971c1 100644
--- a/manual/de/customization_binary.xml
+++ b/manual/de/customization_binary.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="binary">
<title>Customising the binary image</title>
<para>This chapter discusses FIXME</para>
@@ -24,9 +22,9 @@ length for this field is 128 characters. </para>
<replaceable>NAME</replaceable></command></term>
<listitem>
<para> This should describe the preparer of the image, usually with some contact
-details. The default for this option is the &live-helper; version you are
-using, which may help with debugging later. The maximum length for this
-field is 128 characters. </para>
+details. The default for this option is the <filename>live-helper</filename>
+version you are using, which may help with debugging later. The maximum
+length for this field is 128 characters. </para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/manual/de/customization_bootup.xml b/manual/de/customization_bootup.xml
index ac840db..4d84765 100644
--- a/manual/de/customization_bootup.xml
+++ b/manual/de/customization_bootup.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="bootup">
<title>Customising the bootup process</title>
<para>This chapter discusses customisation of bootup process of a live system,
diff --git a/manual/de/customization_contents.xml b/manual/de/customization_contents.xml
index 8d31729..ff864e1 100644
--- a/manual/de/customization_contents.xml
+++ b/manual/de/customization_contents.xml
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="contents">
<title>Customising contents</title>
<para>This chapter discusses further customisation of the live system.</para>
<sect2>
<title>Includes</title>
<para>Using includes, it is possible to add (or replace) arbitrary files in your
-Debian Live image. &live-helper; provides three mechanisms for using them:</para>
+Debian Live image. <filename>live-helper</filename> provides three
+mechanisms for using them:</para>
<variablelist>
<varlistentry>
<term> Chroot local includes </term>
@@ -81,8 +80,9 @@ installed by packages are overwritten. </para>
<title>Preseeding Debconf questions</title>
<para>Files in the <filename
class="directory">config/chroot_local-preseed</filename> directory are
-considered to be debconf preseed files and are installed by &live-helper;
-using <filename>debconf-set-selections</filename>.</para>
+considered to be debconf preseed files and are installed by
+<filename>live-helper</filename> using
+<filename>debconf-set-selections</filename>.</para>
<para>For more information about debconf, please see debconf(7) in the
<command>debconf</command> package.</para>
</sect2>
diff --git a/manual/de/customization_internationalization.xml b/manual/de/customization_internationalization.xml
index d1c7f1f..518ff2e 100644
--- a/manual/de/customization_internationalization.xml
+++ b/manual/de/customization_internationalization.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="internalization">
<title>Customising Locale And Language</title>
<para>This chapter discusses customisation for language specific parameters.</para>
diff --git a/manual/de/customization_packages.xml b/manual/de/customization_packages.xml
index 47edc42..2b7c209 100644
--- a/manual/de/customization_packages.xml
+++ b/manual/de/customization_packages.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="packages">
<title>Customising package installation</title>
<para> This chapter discusses the customisation of package installation. This
@@ -96,8 +94,8 @@ may not be the desired behaviour. </para>
</sect2>
<sect2>
<title>Installing additional packages</title>
- <para> &live-helper; 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>
@@ -124,8 +122,8 @@ packages should be installed, including: </para>
<para>
<screen>$ lh config --packages "package1 package2 package3"</screen>
</para>
- <para> The behaviour of &live-helper; when specifying a package that does not exist
-is determined by your choice of APT utility. See <xref
+ <para> The behaviour of <filename>live-helper</filename> when specifying a package
+that does not exist is determined by your choice of APT utility. See <xref
linkend="package-installation"/> for more details. </para>
<para> If you need to specify a large number of packages to be installed or you
need flexibility regarding which packages to install, you should probably be
@@ -135,25 +133,26 @@ information. </para>
<sect3 id="package-lists">
<title>Package lists</title>
<para> Package lists are a powerful way of expressing which packages should be
-installed. &live-helper; ships with a number of predefined package lists
-which provide sensible default package selections for the GNOME and KDE
-desktop environments, as well as standard systems. </para>
+installed. <filename>live-helper</filename> ships with a number of
+predefined package lists which provide sensible default package selections
+for the GNOME and KDE desktop environments, as well as standard systems. </para>
<para> To specify a package list, add the name of the list to the
<command>LH_PACKAGES_LISTS</command> variable in
<filename>config/chroot</filename>. For example: </para>
<para>
<screen>LH_PACKAGES_LISTS="gnome"</screen>
</para>
- <para> Package lists that are distributed with &live-helper; reside in the
-<command>/usr/share/live-helper/lists</command> directory. </para>
+ <para> Package lists that are distributed with <filename>live-helper</filename>
+reside in the <command>/usr/share/live-helper/lists</command> directory. </para>
<sect4>
<title>Local packages lists</title>
<para> You may supplement the supplied lists using local package lists stored in
<command>config/chroot_local-packageslists</command>. </para>
<para> Package lists that exist in this directory always override package lists
-distributed with &live-helper;. This can cause undesired effects when. </para>
+distributed with <filename>live-helper</filename>. This can cause undesired
+effects when. </para>
<note>
- <title>&live-helper; 2.x change</title>
+ <title><filename>live-helper</filename> 2.x change</title>
<para> Any file with <command>.list</command> suffix in
<command>config/chroot_local-packageslists</command> is automatically
enabled, the variable LH_PACKAGES_LISTS should only be used referencing
@@ -167,8 +166,8 @@ packages lists included in live-helper (at
<para>
<screen>#include <gnome> iceweasel</screen>
</para>
- <para> The package lists that are included with &live-helper; make extensive use of
-includes. They are available to view in the
+ <para> The package lists that are included with <filename>live-helper</filename>
+make extensive use of includes. They are available to view in the
<command>/usr/share/live-helper/lists</command> directory. </para>
</sect4>
<sect4>
@@ -191,7 +190,7 @@ or <command>amd64</command>: </para>
<para>
<screen>#if ARCHITECTURE amd64 #include <gnome-full> #endif</screen>
</para>
- <para> Any &live-helper; configuration variable that begins with
+ <para> Any <filename>live-helper</filename> configuration variable that begins with
<command>LH_</command> can be tested in this way. </para>
<para> The nesting of conditionals is not supported. </para>
</sect4>
@@ -266,11 +265,11 @@ offer updates of the modified packages. </para>
</sect3>
<sect3 id="custom-packages-apt">
<title>Custom packages and APT</title>
- <para> &live-helper; 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
diff --git a/manual/de/faq.xml b/manual/de/faq.xml
index b9ed3df..5ea34ed 100644
--- a/manual/de/faq.xml
+++ b/manual/de/faq.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="faq">
<title>Frequently asked questions (FAQ)</title>
<itemizedlist>
diff --git a/manual/de/howtos.xml b/manual/de/howtos.xml
index 31e3be9..82d9e34 100644
--- a/manual/de/howtos.xml
+++ b/manual/de/howtos.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "../entities/common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="howtos">
<title>Howtos</title>
<sect1 id="iso">
diff --git a/manual/de/index.xml b/manual/de/index.xml
index 8c9a4e4..a69dcf7 100644
--- a/manual/de/index.xml
+++ b/manual/de/index.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-<!ENTITY pubdate "2010-06-12">
+<!ENTITY pubdate "2010-06-18">
<!ENTITY version "2.0~a1">
]>
<book lang="en">
diff --git a/manual/de/installation.xml b/manual/de/installation.xml
index 73043c8..ec0d442 100644
--- a/manual/de/installation.xml
+++ b/manual/de/installation.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="installation">
<title>Installation</title>
<section>
@@ -12,7 +10,7 @@
<para>Super user (root) access</para>
</listitem>
<listitem>
- <para>An up-to-date version of &live-helper;</para>
+ <para>An up-to-date version of <filename>live-helper</filename></para>
</listitem>
<listitem>
<para>A POSIX-compliant shell, such as <command>bash</command> or
@@ -26,12 +24,13 @@
</listitem>
</orderedlist>
<para>Note that using Debian or a Debian-derived distribution is not required -
-&live-helper; will run on almost any operating system with the above
-requirements.</para>
+<filename>live-helper</filename> will run on almost any operating system
+with the above requirements.</para>
</section>
<section>
- <title>Installing &live-helper;</title>
- <para>You can install &live-helper; in a number of different ways:</para>
+ <title>Installing <filename>live-helper</filename></title>
+ <para>You can install <filename>live-helper</filename> in a number of different
+ways:</para>
<orderedlist>
<listitem>
<para>From the Debian repository</para>
@@ -46,52 +45,55 @@ requirements.</para>
<para>From backports.org</para>
</listitem>
</orderedlist>
- <para>If you are using &lenny; or &sid; the recommended way is to install
-&live-helper; via the Debian repository.</para>
+ <para>If you are using <emphasis>lenny</emphasis> or <emphasis>sid</emphasis> the
+recommended way is to install <filename>live-helper</filename> via the
+Debian repository.</para>
<section>
<title>From the Debian repository</title>
- <para>Simply install &live-helper; like any other package:</para>
+ <para>Simply install <filename>live-helper</filename> like any other package:</para>
<screen># apt-get install live-helper</screen>
<para>or</para>
<screen># aptitude install live-helper</screen>
</section>
<section>
<title>From source</title>
- <para>&live-helper; is developed using the Git version control system. On Debian
-systems, this is provided by the <command>git-core</command> package. To
-check out the latest code, execute:</para>
+ <para><filename>live-helper</filename> is developed using the Git version control
+system. On Debian systems, this is provided by the
+<command>git-core</command> package. To check out the latest code, execute:</para>
<screen>$ git clone git://live.debian.net/git/live-helper.git</screen>
<para>You can build and install your own Debian package by executing:</para>
<screen> $ cd live-helper $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .. # dpkg -i live-helper*.deb </screen>
- <para>You can also use a local version of &live-helper; without installation:</para>
+ <para>You can also use a local version of <filename>live-helper</filename> without
+installation:</para>
<screen># live-helper/helpers/lh_local</screen>
<para>Subsequent calls to <filename>lh_</filename>-prefixed helpers in that shell
environment will then use the version located in the directory you executed
<filename>lh_local</filename> from.</para>
- <para>You can also install &live-helper; directly to your system by executing:</para>
+ <para>You can also install <filename>live-helper</filename> directly to your
+system by executing:</para>
<screen># make install</screen>
</section>
<section>
<title>From 'snapshots'</title>
- <para>If you do not wish to build or install &live-helper; from source, you can
-use snapshots. These are built automatically from the latest version in Git
-and are available on <ulink
+ <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>&live-initramfs;</title>
+ <title><filename>live-initramfs</filename></title>
<para>
- <emphasis>N.B. You do not need to install &live-initramfs; on your system to
-create customised Debian Live systems. However, doing so will do no
-harm.</emphasis>
+ <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>
<section>
- <title>Using a customised &live-initramfs;</title>
+ <title>Using a customised <filename>live-initramfs</filename></title>
<para>To modify the code you can follow the process below. Please ensure you are
familiar with the terms mentioned in <xref linkend="terms"/>.</para>
<orderedlist>
<listitem>
- <para>Checkout the &live-initramfs; source</para>
+ <para>Checkout the <filename>live-initramfs</filename> source</para>
<screen>$ git clone git://live.debian.net/git/live-initramfs.git</screen>
</listitem>
<listitem>
@@ -101,7 +103,7 @@ should name it without dashes '-', e.g: call it "81new_feature" and not
"81new-feature".</para>
</listitem>
<listitem>
- <para>Build a &live-initramfs; <command>.deb</command></para>
+ <para>Build a <filename>live-initramfs</filename> <command>.deb</command></para>
<para>You must build either on your target distribution or in a chroot containing
your target platform: this means if your target is lenny then you should
build against lenny. You can use a personal builder such as
@@ -112,21 +114,23 @@ build directly on the target platform, use
<screen> $ cd live-initramfs $ dpkg-buildpackage -rfakeroot -b -uc -us </screen>
</listitem>
<listitem>
- <para>Use the generated &live-initramfs; <command>.deb</command></para>
- <para>As &live-initramfs; is installed by the build system, installing the package
-in the host system is not sufficient: you should treat the generated
-<command>.deb</command> like another custom package. Please see <xref
-linkend="custom-packages"/> for more information. You should pay particular
-attention to <xref linkend="custom-packages-apt"/>.</para>
+ <para>Use the generated <filename>live-initramfs</filename>
+<command>.deb</command></para>
+ <para>As <filename>live-initramfs</filename> is installed by the build system,
+installing the package in the host system is not sufficient: you should
+treat the generated <command>.deb</command> like another custom
+package. Please see <xref linkend="custom-packages"/> for more
+information. You should pay particular attention to <xref
+linkend="custom-packages-apt"/>.</para>
</listitem>
</orderedlist>
</section>
<section>
- <title>Using &live-initramfs; snapshots</title>
- <para>You can let &live-helper; automatically use the latest snapshot of
-&live-initramfs; by configuring a third-party repository in your live-system
-configuration. Assuming you have already created a configuration tree with
-<command>lh config</command>:</para>
+ <title>Using <filename>live-initramfs</filename> snapshots</title>
+ <para>You can let <filename>live-helper</filename> automatically use the latest
+snapshot of <filename>live-initramfs</filename> by configuring a third-party
+repository in your live-system configuration. Assuming you have already
+created a configuration tree with <command>lh config</command>:</para>
<orderedlist>
<listitem>
<para>Create a sources.list entry for the chroot stage:</para>
diff --git a/manual/de/live-environment.xml b/manual/de/live-environment.xml
index e82ecd8..c000d34 100644
--- a/manual/de/live-environment.xml
+++ b/manual/de/live-environment.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="live-environment">
<title>The Live environment</title>
<section>
@@ -20,8 +18,8 @@ This parameter can also be used in kernel command line.</para>
<title>The Live user</title>
<para>Username FIXME.</para>
<para>One important consideration is that the live user is created by
-&live-initramfs; during bootup, it is not created by &live-helper; when
-building the image.</para>
+<filename>live-initramfs</filename> during bootup, it is not created by
+<filename>live-helper</filename> when building the image.</para>
<para>You can specify additional groups that the live user will belong to by
preseeding the <command>passwd/user-default-groups</command> debconf
value. For example, to add the live user to the <command>fuse</command>
diff --git a/manual/de/overview.xml b/manual/de/overview.xml
index 9a9a8c4..d7d4ba0 100644
--- a/manual/de/overview.xml
+++ b/manual/de/overview.xml
@@ -1,18 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="overview">
<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>&live-helper;</title>
- <para> &live-helper; is a collection of scripts to build Debian Live systems. These
-scripts are also referred to as "helpers". </para>
- <para> The idea behind &live-helper; is to be a framework that uses a configuration
-directory to completely automate and customize all aspects of building a
-Live image. </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>
@@ -23,23 +21,23 @@ class="directory">debian</filename> subdirectory of a package tree. For
example, <command>dh_install</command> will look for a file called
<filename>debian/<packagename>.install</filename> to determine which
files should exist in a particular binary package. In much the same way,
-&live-helper; stores its configuration entirely under a <filename
-class="directory">config/</filename> subdirectory. </para>
+<filename>live-helper</filename> stores its configuration entirely under a
+<filename class="directory">config/</filename> subdirectory. </para>
</listitem>
<listitem>
<para> The scripts are independent - that is to say, it is always safe to run each
command. </para>
</listitem>
</orderedlist>
- <para> Unlike <command>debhelper</command>, &live-helper; contains a tool to
-generate a skeleton configuration directory, <filename>lh
+ <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
-&live-helper; 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
+<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>
@@ -47,17 +45,19 @@ helper). </para>
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 &live-helper; use pairs of values or
-slightly more complicated variable assignments. </para>
- <para> &live-helper; 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), &live-helper; will automatically
-set it to a default value. </para>
- <para> All config files are shell scripts which are sourced by a &live-helper;
-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>
+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> 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
@@ -68,7 +68,7 @@ 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
-&live-helper;. </para>
+<filename>live-helper</filename>. </para>
<para> The remainder of this section discusses the three most important helpers: </para>
<variablelist>
<varlistentry>
@@ -102,10 +102,11 @@ linkend="lh-clean"/> for more information. </para>
<section id="lh-config">
<title>The <filename>lh config</filename> helper</title>
<para> As discussed in <xref linkend="live-helper"/>, the scripts that make up
-&live-helper; source their configuration from a single directory named
-<command>config/</command>. As constructing this directory by hand would be
-time-consuming and error-prone, the <filename>lh config</filename> helper
-can be used to create skeleton configuration folders. </para>
+<filename>live-helper</filename> source their configuration from a single
+directory named <command>config/</command>. As constructing this directory
+by hand would be time-consuming and error-prone, the <filename>lh
+config</filename> helper can be used to create skeleton configuration
+folders. </para>
<para> Issuing <filename>lh config</filename> without any arguments creates a
<command>config</command> subdirectory which it populates with some default
settings: </para>
@@ -146,17 +147,17 @@ state. </para>
</section>
</section>
<section id="live-initramfs">
- <title>The &live-initramfs; package</title>
- <para> &live-initramfs; 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
+ <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> 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> &live-initramfs; 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/procedures.xml
index 1ab1aeb..89e1df4 100644
--- a/manual/de/procedures.xml
+++ b/manual/de/procedures.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="procedures">
<title>Procedures</title>
<para>This chapter documents the procedures within the Debian Live project for
diff --git a/manual/de/reporting-bugs.xml b/manual/de/reporting-bugs.xml
index f1e8acd..6fa8146 100644
--- a/manual/de/reporting-bugs.xml
+++ b/manual/de/reporting-bugs.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="bugs">
<title>Reporting bugs</title>
<para>Debian Live is far from being perfect, but we want to make it as close as
@@ -16,14 +14,15 @@ url="http://live.debian.net/">our homepage</ulink> for known issues. </para>
</listitem>
<listitem>
<para> Always try to reproduce the bug with the <emphasis>most recent version of
-&live-helper; and &live-initramfs;</emphasis> before submitting a bug
+<filename>live-helper</filename> and
+<filename>live-initramfs</filename></emphasis> before submitting a bug
report. </para>
</listitem>
<listitem>
<para> Try to give <emphasis>as specific information as possible</emphasis> about
-the bug. This includes (at least) the version of &live-helper; and
-&live-initramfs; used and the distribution of the live system you are
-building. </para>
+the bug. This includes (at least) the version of
+<filename>live-helper</filename> and <filename>live-initramfs</filename>
+used and the distribution of the live system you are building. </para>
</listitem>
</itemizedlist>
<section id="known-issues">
@@ -59,10 +58,10 @@ problem.</para>
<section id="collect-information">
<title>Collect information</title>
<para>Please provide enough information with your report. At a minimum, it should
-contain the exact version of &live-helper; version where the bug is
-encountered, and steps to reproduce it. Please use common sense and include
-other relevant information if you think that it might help in solving the
-problem.</para>
+contain the exact version of <filename>live-helper</filename> version where
+the bug is encountered, and steps to reproduce it. Please use common sense
+and include other relevant information if you think that it might help in
+solving the problem.</para>
<para>To make the most out of your bug report, we require at least the following
information:</para>
<itemizedlist>
@@ -70,10 +69,10 @@ information:</para>
<para>Architecture of the host system</para>
</listitem>
<listitem>
- <para>Version of &live-helper; on the host system</para>
+ <para>Version of <filename>live-helper</filename> on the host system</para>
</listitem>
<listitem>
- <para>Version of &live-initramfs; on the live system</para>
+ <para>Version of <filename>live-initramfs</filename> on the live system</para>
</listitem>
<listitem>
<para>Version of <filename>debootstrap</filename> and/or
@@ -109,7 +108,7 @@ settings, e.g. run your live-helper commands with a leading
<term>At build time whilst bootstrapping</term>
<listitem>
<para>
- <para>&live-helper; first bootstraps a basic Debian system with
+ <para><filename>live-helper</filename> first bootstraps a basic Debian system with
<command>debootstrap</command> or <command>cdebootstrap</command>. Depending
on the bootstrapping tool used and the Debian distribution it is
bootstrapping, it may fail. If a bug appears here, check if the error is
@@ -125,10 +124,10 @@ failing package.</para>
<varlistentry>
<term>At build time whilst installing packages</term>
<listitem>
- <para>&live-helper; installs additional packages from the Debian archive and
-depending on the Debian distribution used and the daily archive state, it
-can fail. If a bug appears here, check if the error is also reproducible on
-a normal system.</para>
+ <para><filename>live-helper</filename> installs additional packages from the
+Debian archive and depending on the Debian distribution used and the daily
+archive state, it can fail. If a bug appears here, check if the error is
+also reproducible on a normal system.</para>
<para>If this is the case, this is not a bug in Debian Live, but rather in Debian
- please report it against the failing package. Running
<filename>debootstrap</filename> seperately from the Live system build or
@@ -173,7 +172,7 @@ information. If such information exists, always include the references to it
in your bug report.</para>
<para>In addition, you should check the <ulink
url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper">current
-bug list for &live-helper;</ulink> and the <ulink
+bug list for <filename>live-helper</filename></ulink> and the <ulink
url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-initramfs">current
bug list for live-initramfs</ulink> to see whether something similar has
been reported already.</para>
diff --git a/manual/de/resources.xml b/manual/de/resources.xml
index 697c87c..ecff95a 100644
--- a/manual/de/resources.xml
+++ b/manual/de/resources.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="resources">
<title>Resources and links</title>
<section>
diff --git a/manual/de/success-stories.xml b/manual/de/success-stories.xml
index 26685bb..13af456 100644
--- a/manual/de/success-stories.xml
+++ b/manual/de/success-stories.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="success-stories">
<title>Success Stories</title>
<para>This chapter documents success stories with Debian Live applied.</para>
diff --git a/manual/de/troubleshooting.xml b/manual/de/troubleshooting.xml
index 1b6455e..59377a1 100644
--- a/manual/de/troubleshooting.xml
+++ b/manual/de/troubleshooting.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="troubleshooting">
<title>Hints for troubleshooting</title>
<para>To check on the client </para>
diff --git a/manual/de/use-cases.xml b/manual/de/use-cases.xml
index 973da6e..06c68cf 100644
--- a/manual/de/use-cases.xml
+++ b/manual/de/use-cases.xml
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="use-cases">
<title>Use Cases</title>
<para>This chapter is for users to document their use cases with Debian Live.</para>
<sect1 id="vnc-kiosk-client">
<title>VNC Kiosk Client</title>
- <para>Create an image with &live-helper; to boot directly to a VNC server.</para>
+ <para>Create an image with <filename>live-helper</filename> to boot directly to a
+VNC server.</para>
<itemizedlist>
<listitem>
<para>Make a build directory: <screen>$ mkdir vncBuild</screen> </para>
diff --git a/manual/en/about.xml b/manual/en/about.xml
index af2b97b..ebab097 100644
--- a/manual/en/about.xml
+++ b/manual/en/about.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!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"/>
diff --git a/manual/en/about_manual.xml b/manual/en/about_manual.xml
index 442912b..82baf27 100644
--- a/manual/en/about_manual.xml
+++ b/manual/en/about_manual.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="meta">
<title>About this manual</title>
<para> The main goal of this manual is to serve as a single access point to all documentation related to the Debian Live project. It does not include end-user documentation for using a Debian Live system. </para>
@@ -18,7 +16,7 @@
<varlistentry>
<term>Debian Live</term>
<listitem>
- <para> The Debian sub-project which maintains the &live-helper; and &live-initramfs; utilities. </para>
+ <para> The Debian sub-project which maintains the <filename>live-helper</filename> and <filename>live-initramfs</filename> utilities. </para>
</listitem>
</varlistentry>
<varlistentry>
@@ -34,15 +32,15 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>&live-helper;</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>&live-initramfs;</term>
+ <term><filename>live-initramfs</filename></term>
<listitem>
- <para> A collection of scripts used to boot live systems. &live-initramfs; is a fork of <filename>casper</filename> by Canonical, Ltd. </para>
+ <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>
</varlistentry>
<varlistentry>
@@ -50,7 +48,7 @@
<filename>live-package</filename>
</term>
<listitem>
- <para> The former name of &live-helper;. </para>
+ <para> The former name of <filename>live-helper</filename>. </para>
</listitem>
</varlistentry>
<varlistentry>
@@ -84,10 +82,10 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>&lenny;/&squeeze;/&sid; stable/testing/unstable</term>
+ <term><emphasis>lenny</emphasis>/<emphasis>squeeze</emphasis>/<emphasis>sid</emphasis> stable/testing/unstable</term>
<listitem>
<para> The "stable" distribution contains the latest officially released distribution of Debian. The "testing" distribution is the staging area for the next stable release. A major advantage of using this distribution is that it has more recent versions of software relative to the "stable" release. The "unstable" distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge. </para>
- <para> At the time of writing, &lenny; is the current "stable" release and &squeeze; is the current "testing" release. &sid; will always be a synonym for the "unstable" release. </para>
+ <para> 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. </para>
</listitem>
</varlistentry>
</variablelist>
diff --git a/manual/en/about_project.xml b/manual/en/about_project.xml
index 003cb58..1866111 100644
--- a/manual/en/about_project.xml
+++ b/manual/en/about_project.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="about">
<title>About the Debian Live Project</title>
<sect2 id="motivation">
@@ -67,7 +65,7 @@
<title>Only unchanged, official packages</title>
<para> We will only use official packages from the Debian repository in the "main" section (possibly contrib, although not decided yet). The non-free section is not part of Debian and therefore cannot be used at all for live systems. </para>
<para> We will not change any packages. Whenever we need to change something, we will do that in coordination with its package maintainer in Debian. </para>
- <para> 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. </para>
+ <para> 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. </para>
</sect3>
<sect3>
<title>No package configuration of the live system</title>
diff --git a/manual/en/appendices_configuration-files.xml b/manual/en/appendices_configuration-files.xml
index ee07a94..dbc9cf0 100644
--- a/manual/en/appendices_configuration-files.xml
+++ b/manual/en/appendices_configuration-files.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="configuration-files">
<title>Configuration files</title>
<section id="config-binary">
diff --git a/manual/en/appendices_configuration-layout.xml b/manual/en/appendices_configuration-layout.xml
index 847029b..d67c379 100644
--- a/manual/en/appendices_configuration-layout.xml
+++ b/manual/en/appendices_configuration-layout.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="configuration-layout">
<title>Configuration layout</title>
<variablelist>
diff --git a/manual/en/basics.xml b/manual/en/basics.xml
index 9b186e0..a40d472 100644
--- a/manual/en/basics.xml
+++ b/manual/en/basics.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="basics">
<title>The basics</title>
<para> This chapter contains a brief overview of the build process as well as containing instructions on how to boot the various binary image types. </para>
@@ -39,7 +37,7 @@
</section>
<section>
<title>First steps: building an ISO image</title>
- <para> The following sequence of helper commands, provided by &live-helper;, will create a basic ISO image containing just the Debian standard system without X.org. It is suitable for burning to CD or DVD media. </para>
+ <para> The following sequence of helper commands, provided by <filename>live-helper</filename>, will create a basic ISO image containing just the Debian standard system without X.org. It is suitable for burning to CD or DVD media. </para>
<para> First, we run the <filename>lh config</filename> helper command which will create a <filename>"config/"</filename> hierarchy in the current directory for use by other helper commands: </para>
<para>
<screen>$ lh config</screen>
diff --git a/manual/en/coding-style.xml b/manual/en/coding-style.xml
index 4c31b84..3e9445a 100644
--- a/manual/en/coding-style.xml
+++ b/manual/en/coding-style.xml
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="coding-style">
<title>Coding Style</title>
- <para>This chapter documents the coding style used in &live-helper; and (ideally) in &live-initramfs;.</para>
+ <para>This chapter documents the coding style used in <filename>live-helper</filename> and (ideally) in <filename>live-initramfs</filename>.</para>
<sect1 id="compatibilty">
<title>Compatibility</title>
<itemizedlist>
diff --git a/manual/en/common-tasks.xml b/manual/en/common-tasks.xml
index 0672a3f..a4546ed 100644
--- a/manual/en/common-tasks.xml
+++ b/manual/en/common-tasks.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="common-tasks">
<title>Common tasks</title>
<section id="debian-installer">
@@ -18,7 +16,7 @@
<listitem>
<para> This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. </para>
<para> This means that Debian is installed by fetching and installing <command>.deb</command> packages using <filename>debootstrap</filename> or <filename>cdebootstrap</filename>, from the local media or some network-base network, resulting in a standard Debian system being installed to the hard disk. </para>
- <para> This whole process can be preseeded and customised in a number of ways; see the relevant "DebianInstaller" wiki page and installation guide for more. This is operational now withing &live-helper;. </para>
+ <para> This whole process can be preseeded and customised in a number of ways; see the relevant "DebianInstaller" wiki page and installation guide for more. This is operational now withing <filename>live-helper</filename>. </para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/manual/en/customization.xml b/manual/en/customization.xml
index 1396cc0..de954d2 100644
--- a/manual/en/customization.xml
+++ b/manual/en/customization.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="customization">
<title>Customization</title>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization_packages.xml"/>
diff --git a/manual/en/customization_backports.xml b/manual/en/customization_backports.xml
index 943bb16..97a9a97 100644
--- a/manual/en/customization_backports.xml
+++ b/manual/en/customization_backports.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="backports">
<title>Using a newer kernel with Lenny</title>
<para>The backports repository, backports.org, lacks the necessary module packages (linux-modules-extra-2.6, aufs, etc.) so an alternative repository has been set up, in order to build Lenny live images with a later kernel. Shown here is one way of doing it.</para>
diff --git a/manual/en/customization_binary.xml b/manual/en/customization_binary.xml
index d291269..c38daf6 100644
--- a/manual/en/customization_binary.xml
+++ b/manual/en/customization_binary.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="binary">
<title>Customising the binary image</title>
<para>This chapter discusses FIXME</para>
@@ -18,7 +16,7 @@
<varlistentry>
<term><command>LH_ISO_PREPARER</command> / <command>--iso-preparer <replaceable>NAME</replaceable></command></term>
<listitem>
- <para> This should describe the preparer of the image, usually with some contact details. The default for this option is the &live-helper; version you are using, which may help with debugging later. The maximum length for this field is 128 characters. </para>
+ <para> This should describe the preparer of the image, usually with some contact details. The default for this option is the <filename>live-helper</filename> version you are using, which may help with debugging later. The maximum length for this field is 128 characters. </para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/manual/en/customization_bootup.xml b/manual/en/customization_bootup.xml
index a45f9b2..ee7000c 100644
--- a/manual/en/customization_bootup.xml
+++ b/manual/en/customization_bootup.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="bootup">
<title>Customising the bootup process</title>
<para>This chapter discusses customisation of bootup process of a live system, including kernel options, modifications to the bootloader, "splash" screens and startup scripts.</para>
diff --git a/manual/en/customization_contents.xml b/manual/en/customization_contents.xml
index 4a5dade..4275d76 100644
--- a/manual/en/customization_contents.xml
+++ b/manual/en/customization_contents.xml
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="contents">
<title>Customising contents</title>
<para>This chapter discusses further customisation of the live system.</para>
<sect2>
<title>Includes</title>
- <para>Using includes, it is possible to add (or replace) arbitrary files in your Debian Live image. &live-helper; provides three mechanisms for using them:</para>
+ <para>Using includes, it is possible to add (or replace) arbitrary files in your Debian Live image. <filename>live-helper</filename> provides three mechanisms for using them:</para>
<variablelist>
<varlistentry>
<term> Chroot local includes </term>
@@ -62,7 +60,7 @@
</sect2>
<sect2 id="debconf-preseed">
<title>Preseeding Debconf questions</title>
- <para>Files in the <filename class="directory">config/chroot_local-preseed</filename> directory are considered to be debconf preseed files and are installed by &live-helper; using <filename>debconf-set-selections</filename>.</para>
+ <para>Files in the <filename class="directory">config/chroot_local-preseed</filename> directory are considered to be debconf preseed files and are installed by <filename>live-helper</filename> using <filename>debconf-set-selections</filename>.</para>
<para>For more information about debconf, please see debconf(7) in the <command>debconf</command> package.</para>
</sect2>
<sect2 id="symlinks">
diff --git a/manual/en/customization_internationalization.xml b/manual/en/customization_internationalization.xml
index cc06833..01eaffb 100644
--- a/manual/en/customization_internationalization.xml
+++ b/manual/en/customization_internationalization.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="internalization">
<title>Customising Locale And Language</title>
<para>This chapter discusses customisation for language specific parameters.</para>
diff --git a/manual/en/customization_packages.xml b/manual/en/customization_packages.xml
index c4d6063..397fe96 100644
--- a/manual/en/customization_packages.xml
+++ b/manual/en/customization_packages.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sect1 id="packages">
<title>Customising package installation</title>
<para> This chapter discusses the customisation of package installation. This involves: </para>
@@ -80,7 +78,7 @@
</sect2>
<sect2>
<title>Installing additional packages</title>
- <para> &live-helper; 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>
@@ -105,23 +103,23 @@
<para>
<screen>$ lh config --packages "package1 package2 package3"</screen>
</para>
- <para> The behaviour of &live-helper; when specifying a package that does not exist is determined by your choice of APT utility. See <xref linkend="package-installation"/> for more details. </para>
+ <para> The behaviour of <filename>live-helper</filename> when specifying a package that does not exist is determined by your choice of APT utility. See <xref linkend="package-installation"/> for more details. </para>
<para> If you need to specify a large number of packages to be installed or you need flexibility regarding which packages to install, you should probably be using package lists. See <xref linkend="package-lists"/> for more information. </para>
</sect3>
<sect3 id="package-lists">
<title>Package lists</title>
- <para> Package lists are a powerful way of expressing which packages should be installed. &live-helper; ships with a number of predefined package lists which provide sensible default package selections for the GNOME and KDE desktop environments, as well as standard systems. </para>
+ <para> Package lists are a powerful way of expressing which packages should be installed. <filename>live-helper</filename> ships with a number of predefined package lists which provide sensible default package selections for the GNOME and KDE desktop environments, as well as standard systems. </para>
<para> To specify a package list, add the name of the list to the <command>LH_PACKAGES_LISTS</command> variable in <filename>config/chroot</filename>. For example: </para>
<para>
<screen>LH_PACKAGES_LISTS="gnome"</screen>
</para>
- <para> Package lists that are distributed with &live-helper; reside in the <command>/usr/share/live-helper/lists</command> directory. </para>
+ <para> Package lists that are distributed with <filename>live-helper</filename> reside in the <command>/usr/share/live-helper/lists</command> directory. </para>
<sect4>
<title>Local packages lists</title>
<para> You may supplement the supplied lists using local package lists stored in <command>config/chroot_local-packageslists</command>. </para>
- <para> Package lists that exist in this directory always override package lists distributed with &live-helper;. This can cause undesired effects when. </para>
+ <para> Package lists that exist in this directory always override package lists distributed with <filename>live-helper</filename>. This can cause undesired effects when. </para>
<note>
- <title>&live-helper; 2.x change</title>
+ <title><filename>live-helper</filename> 2.x change</title>
<para> Any file with <command>.list</command> suffix in <command>config/chroot_local-packageslists</command> is automatically enabled, the variable LH_PACKAGES_LISTS should only be used referencing packages lists included in live-helper (at <command>/usr/share/live-helper/lists/</command>. </para>
</note>
</sect4>
@@ -131,7 +129,7 @@
<para>
<screen>#include <gnome> iceweasel</screen>
</para>
- <para> The package lists that are included with &live-helper; make extensive use of includes. They are available to view in the <command>/usr/share/live-helper/lists</command> directory. </para>
+ <para> The package lists that are included with <filename>live-helper</filename> make extensive use of includes. They are available to view in the <command>/usr/share/live-helper/lists</command> directory. </para>
</sect4>
<sect4>
<title>Using conditionals inside packages lists</title>
@@ -151,7 +149,7 @@
<para>
<screen>#if ARCHITECTURE amd64 #include <gnome-full> #endif</screen>
</para>
- <para> Any &live-helper; configuration variable that begins with <command>LH_</command> can be tested in this way. </para>
+ <para> Any <filename>live-helper</filename> configuration variable that begins with <command>LH_</command> can be tested in this way. </para>
<para> The nesting of conditionals is not supported. </para>
</sect4>
</sect3>
@@ -201,7 +199,7 @@
</sect3>
<sect3 id="custom-packages-apt">
<title>Custom packages and APT</title>
- <para> &live-helper; 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/faq.xml
index 637ed61..a39fa8c 100644
--- a/manual/en/faq.xml
+++ b/manual/en/faq.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="faq">
<title>Frequently asked questions (FAQ)</title>
<itemizedlist>
diff --git a/manual/en/howtos.xml b/manual/en/howtos.xml
index 89b3665..dabc599 100644
--- a/manual/en/howtos.xml
+++ b/manual/en/howtos.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "../entities/common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="howtos">
<title>Howtos</title>
<sect1 id="iso">
diff --git a/manual/en/index.xml b/manual/en/index.xml
index 616daca..b6cb251 100644
--- a/manual/en/index.xml
+++ b/manual/en/index.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-<!ENTITY pubdate "2010-06-12">
+<!ENTITY pubdate "2010-06-18">
<!ENTITY version "2.0~a1">
]>
<book lang="en">
diff --git a/manual/en/installation.xml b/manual/en/installation.xml
index db07f5b..e74cbc6 100644
--- a/manual/en/installation.xml
+++ b/manual/en/installation.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="installation">
<title>Installation</title>
<section>
@@ -12,7 +10,7 @@
<para>Super user (root) access</para>
</listitem>
<listitem>
- <para>An up-to-date version of &live-helper;</para>
+ <para>An up-to-date version of <filename>live-helper</filename></para>
</listitem>
<listitem>
<para>A POSIX-compliant shell, such as <command>bash</command> or <command>dash</command>.</para>
@@ -24,11 +22,11 @@
<para>Linux 2.6.x</para>
</listitem>
</orderedlist>
- <para>Note that using Debian or a Debian-derived distribution is not required - &live-helper; will run on almost any operating system with the above requirements.</para>
+ <para>Note that using Debian or a Debian-derived distribution is not required - <filename>live-helper</filename> will run on almost any operating system with the above requirements.</para>
</section>
<section>
- <title>Installing &live-helper;</title>
- <para>You can install &live-helper; in a number of different ways:</para>
+ <title>Installing <filename>live-helper</filename></title>
+ <para>You can install <filename>live-helper</filename> in a number of different ways:</para>
<orderedlist>
<listitem>
<para>From the Debian repository</para>
@@ -43,41 +41,41 @@
<para>From backports.org</para>
</listitem>
</orderedlist>
- <para>If you are using &lenny; or &sid; the recommended way is to install &live-helper; via the Debian repository.</para>
+ <para>If you are using <emphasis>lenny</emphasis> or <emphasis>sid</emphasis> the recommended way is to install <filename>live-helper</filename> via the Debian repository.</para>
<section>
<title>From the Debian repository</title>
- <para>Simply install &live-helper; like any other package:</para>
+ <para>Simply install <filename>live-helper</filename> like any other package:</para>
<screen># apt-get install live-helper</screen>
<para>or</para>
<screen># aptitude install live-helper</screen>
</section>
<section>
<title>From source</title>
- <para>&live-helper; is developed using the Git version control system. On Debian systems, this is provided by the <command>git-core</command> package. To check out the latest code, execute:</para>
+ <para><filename>live-helper</filename> is developed using the Git version control system. On Debian systems, this is provided by the <command>git-core</command> package. To check out the latest code, execute:</para>
<screen>$ git clone git://live.debian.net/git/live-helper.git</screen>
<para>You can build and install your own Debian package by executing:</para>
<screen> $ cd live-helper $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .. # dpkg -i live-helper*.deb </screen>
- <para>You can also use a local version of &live-helper; without installation:</para>
+ <para>You can also use a local version of <filename>live-helper</filename> without installation:</para>
<screen># live-helper/helpers/lh_local</screen>
<para>Subsequent calls to <filename>lh_</filename>-prefixed helpers in that shell environment will then use the version located in the directory you executed <filename>lh_local</filename> from.</para>
- <para>You can also install &live-helper; directly to your system by executing:</para>
+ <para>You can also install <filename>live-helper</filename> directly to your system by executing:</para>
<screen># make install</screen>
</section>
<section>
<title>From 'snapshots'</title>
- <para>If you do not wish to build or install &live-helper; 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>
+ <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>&live-initramfs;</title>
+ <title><filename>live-initramfs</filename></title>
<para>
- <emphasis>N.B. You do not need to install &live-initramfs; on your system to create customised Debian Live systems. However, doing so will do no harm.</emphasis>
+ <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>
<section>
- <title>Using a customised &live-initramfs;</title>
+ <title>Using a customised <filename>live-initramfs</filename></title>
<para>To modify the code you can follow the process below. Please ensure you are familiar with the terms mentioned in <xref linkend="terms"/>.</para>
<orderedlist>
<listitem>
- <para>Checkout the &live-initramfs; source</para>
+ <para>Checkout the <filename>live-initramfs</filename> source</para>
<screen>$ git clone git://live.debian.net/git/live-initramfs.git</screen>
</listitem>
<listitem>
@@ -85,19 +83,19 @@
<para>And beware that if you want to add your pre-init script in live-bottom, you should name it without dashes '-', e.g: call it "81new_feature" and not "81new-feature".</para>
</listitem>
<listitem>
- <para>Build a &live-initramfs; <command>.deb</command></para>
+ <para>Build a <filename>live-initramfs</filename> <command>.deb</command></para>
<para>You must build either on your target distribution or in a chroot containing your target platform: this means if your target is lenny then you should build against lenny. You can use a personal builder such as <command>pbuilder</command> to automate building packages in chroot. To build directly on the target platform, use <command>dpkg-buildpackage</command> (provided by the <command>dpkg-dev</command> package):</para>
<screen> $ cd live-initramfs $ dpkg-buildpackage -rfakeroot -b -uc -us </screen>
</listitem>
<listitem>
- <para>Use the generated &live-initramfs; <command>.deb</command></para>
- <para>As &live-initramfs; is installed by the build system, installing the package in the host system is not sufficient: you should treat the generated <command>.deb</command> like another custom package. Please see <xref linkend="custom-packages"/> for more information. You should pay particular attention to <xref linkend="custom-packages-apt"/>.</para>
+ <para>Use the generated <filename>live-initramfs</filename> <command>.deb</command></para>
+ <para>As <filename>live-initramfs</filename> is installed by the build system, installing the package in the host system is not sufficient: you should treat the generated <command>.deb</command> like another custom package. Please see <xref linkend="custom-packages"/> for more information. You should pay particular attention to <xref linkend="custom-packages-apt"/>.</para>
</listitem>
</orderedlist>
</section>
<section>
- <title>Using &live-initramfs; snapshots</title>
- <para>You can let &live-helper; automatically use the latest snapshot of &live-initramfs; by configuring a third-party repository in your live-system configuration. Assuming you have already created a configuration tree with <command>lh config</command>:</para>
+ <title>Using <filename>live-initramfs</filename> snapshots</title>
+ <para>You can let <filename>live-helper</filename> automatically use the latest snapshot of <filename>live-initramfs</filename> by configuring a third-party repository in your live-system configuration. Assuming you have already created a configuration tree with <command>lh config</command>:</para>
<orderedlist>
<listitem>
<para>Create a sources.list entry for the chroot stage:</para>
diff --git a/manual/en/live-environment.xml b/manual/en/live-environment.xml
index 68d3585..6fea0c7 100644
--- a/manual/en/live-environment.xml
+++ b/manual/en/live-environment.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="live-environment">
<title>The Live environment</title>
<section>
@@ -15,7 +13,7 @@
<section id="live-user">
<title>The Live user</title>
<para>Username FIXME.</para>
- <para>One important consideration is that the live user is created by &live-initramfs; during bootup, it is not created by &live-helper; when building the image.</para>
+ <para>One important consideration is that the live user is created by <filename>live-initramfs</filename> during bootup, it is not created by <filename>live-helper</filename> when building the image.</para>
<para>You can specify additional groups that the live user will belong to by preseeding the <command>passwd/user-default-groups</command> debconf value. For example, to add the live user to the <command>fuse</command> group, add the following to a file in the <filename class="directory">config/chroot_local-preseed</filename> directory:</para>
<screen> debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse </screen>
<para>For more information about debconf preseeding, please see <xref linkend="debconf-preseed"/>.</para>
diff --git a/manual/en/overview.xml b/manual/en/overview.xml
index 579186d..1dacd45 100644
--- a/manual/en/overview.xml
+++ b/manual/en/overview.xml
@@ -1,31 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="overview">
<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>&live-helper;</title>
- <para> &live-helper; is a collection of scripts to build Debian Live systems. These scripts are also referred to as "helpers". </para>
- <para> The idea behind &live-helper; is to be a framework that uses a configuration directory to completely automate and customize all aspects of building a Live image. </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>
<listitem>
<para> The scripts have a central location for configuring their operation. </para>
- <para> In <command>debhelper</command>, this is the <filename class="directory">debian</filename> subdirectory of a package tree. For example, <command>dh_install</command> will look for a file called <filename>debian/<packagename>.install</filename> to determine which files should exist in a particular binary package. In much the same way, &live-helper; stores its configuration entirely under a <filename class="directory">config/</filename> subdirectory. </para>
+ <para> In <command>debhelper</command>, this is the <filename class="directory">debian</filename> subdirectory of a package tree. For example, <command>dh_install</command> will look for a file called <filename>debian/<packagename>.install</filename> to determine which files should exist in a particular binary package. In much the same way, <filename>live-helper</filename> stores its configuration entirely under a <filename class="directory">config/</filename> subdirectory. </para>
</listitem>
<listitem>
<para> The scripts are independent - that is to say, it is always safe to run each command. </para>
</listitem>
</orderedlist>
- <para> Unlike <command>debhelper</command>, &live-helper; 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 &live-helper; 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 &live-helper; use pairs of values or slightly more complicated variable assignments. </para>
- <para> &live-helper; 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), &live-helper; will automatically set it to a default value. </para>
- <para> All config files are shell scripts which are sourced by a &live-helper; 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> 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> 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 &live-helper;. </para>
+ <para> Please see <xref linkend="installation"/> for information on how to install <filename>live-helper</filename>. </para>
<para> The remainder of this section discusses the three most important helpers: </para>
<variablelist>
<varlistentry>
@@ -55,7 +53,7 @@
</variablelist>
<section id="lh-config">
<title>The <filename>lh config</filename> helper</title>
- <para> As discussed in <xref linkend="live-helper"/>, the scripts that make up &live-helper; source their configuration from a single directory named <command>config/</command>. As constructing this directory by hand would be time-consuming and error-prone, the <filename>lh config</filename> helper can be used to create skeleton configuration folders. </para>
+ <para> As discussed in <xref linkend="live-helper"/>, the scripts that make up <filename>live-helper</filename> source their configuration from a single directory named <command>config/</command>. As constructing this directory by hand would be time-consuming and error-prone, the <filename>lh config</filename> helper can be used to create skeleton configuration folders. </para>
<para> Issuing <filename>lh config</filename> without any arguments creates a <command>config</command> subdirectory which it populates with some default settings: </para>
<para>
<screen>$ lh config $ ls -l total 4.1k drwxr-xr-x 19 user group 4.1k 2008-05-09 21:37 config $ ls -l config/ total 104 -rw-r--r-- 1 user group 4175 2010-04-11 12:16 binary drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_grub drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-debs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-hooks drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-packageslists drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-udebs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_rootfs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_syslinux -rw-r--r-- 1 user group 2205 2010-04-11 12:16 bootstrap -rw-r--r-- 1 user group 1599 2010-04-11 12:16 chroot drwxr-xr-x 2 user group 4096 2010-04
-11 12:16 chroot_apt drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-hooks drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packages drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packageslists drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-patches drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-preseed drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_sources -rw-r--r-- 1 user group 2938 2010-04-11 12:16 common drwxr-xr-x 2 user group 4096 2010-04-11 12:16 includes -rw-r--r-- 1 user group 206 2010-04-11 12:16 source drwxr-xr-x 2 user group 4096 2010-04-11 12:16 templates </screen>
@@ -81,10 +79,10 @@
</section>
</section>
<section id="live-initramfs">
- <title>The &live-initramfs; package</title>
- <para> &live-initramfs; 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>
+ <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> 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> &live-initramfs; 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/procedures.xml
index 78047b9..43c013d 100644
--- a/manual/en/procedures.xml
+++ b/manual/en/procedures.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="procedures">
<title>Procedures</title>
<para>This chapter documents the procedures within the Debian Live project for various tasks that need cooperation with other teams in Debian.</para>
diff --git a/manual/en/reporting-bugs.xml b/manual/en/reporting-bugs.xml
index bbad8d0..5b95088 100644
--- a/manual/en/reporting-bugs.xml
+++ b/manual/en/reporting-bugs.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="bugs">
<title>Reporting bugs</title>
<para>Debian Live is far from being perfect, but we want to make it as close as possible to perfect - with your help. Do not hesitate to report a bug: it is better to fill a report twice than never. However, this chapter includes recommendations how to file good bug reports.</para>
@@ -11,10 +9,10 @@
<para> Always check first the image status updates on <ulink url="http://live.debian.net/">our homepage</ulink> for known issues. </para>
</listitem>
<listitem>
- <para> Always try to reproduce the bug with the <emphasis>most recent version of &live-helper; and &live-initramfs;</emphasis> before submitting a bug report. </para>
+ <para> Always try to reproduce the bug with the <emphasis>most recent version of <filename>live-helper</filename> and <filename>live-initramfs</filename></emphasis> before submitting a bug report. </para>
</listitem>
<listitem>
- <para> Try to give <emphasis>as specific information as possible</emphasis> about the bug. This includes (at least) the version of &live-helper; and &live-initramfs; used and the distribution of the live system you are building. </para>
+ <para> Try to give <emphasis>as specific information as possible</emphasis> about the bug. This includes (at least) the version of <filename>live-helper</filename> and <filename>live-initramfs</filename> used and the distribution of the live system you are building. </para>
</listitem>
</itemizedlist>
<section id="known-issues">
@@ -35,17 +33,17 @@
</section>
<section id="collect-information">
<title>Collect information</title>
- <para>Please provide enough information with your report. At a minimum, it should contain the exact version of &live-helper; version where the bug is encountered, and steps to reproduce it. Please use common sense and include other relevant information if you think that it might help in solving the problem.</para>
+ <para>Please provide enough information with your report. At a minimum, it should contain the exact version of <filename>live-helper</filename> version where the bug is encountered, and steps to reproduce it. Please use common sense and include other relevant information if you think that it might help in solving the problem.</para>
<para>To make the most out of your bug report, we require at least the following information:</para>
<itemizedlist>
<listitem>
<para>Architecture of the host system</para>
</listitem>
<listitem>
- <para>Version of &live-helper; on the host system</para>
+ <para>Version of <filename>live-helper</filename> on the host system</para>
</listitem>
<listitem>
- <para>Version of &live-initramfs; on the live system</para>
+ <para>Version of <filename>live-initramfs</filename> on the live system</para>
</listitem>
<listitem>
<para>Version of <filename>debootstrap</filename> and/or <filename>cdebootstrap</filename> on the host system</para>
@@ -74,7 +72,7 @@
<term>At build time whilst bootstrapping</term>
<listitem>
<para>
- <para>&live-helper; first bootstraps a basic Debian system with <command>debootstrap</command> or <command>cdebootstrap</command>. Depending on the bootstrapping tool used and the Debian distribution it is bootstrapping, it may fail. If a bug appears here, check if the error is related to a specific Debian package (most likely), or if it is related to cdebootstrap itself.</para>
+ <para><filename>live-helper</filename> first bootstraps a basic Debian system with <command>debootstrap</command> or <command>cdebootstrap</command>. Depending on the bootstrapping tool used and the Debian distribution it is bootstrapping, it may fail. If a bug appears here, check if the error is related to a specific Debian package (most likely), or if it is related to cdebootstrap itself.</para>
<para>In both cases, this is not a bug in Debian Live, but rather in Debian itself which we can not fix this directly. Please report such a bug against <command>debootstrap</command>, <command>cdebootstrap</command> or the failing package.</para>
</para>
</listitem>
@@ -82,7 +80,7 @@
<varlistentry>
<term>At build time whilst installing packages</term>
<listitem>
- <para>&live-helper; installs additional packages from the Debian archive and depending on the Debian distribution used and the daily archive state, it can fail. If a bug appears here, check if the error is also reproducible on a normal system.</para>
+ <para><filename>live-helper</filename> installs additional packages from the Debian archive and depending on the Debian distribution used and the daily archive state, it can fail. If a bug appears here, check if the error is also reproducible on a normal system.</para>
<para>If this is the case, this is not a bug in Debian Live, but rather in Debian - please report it against the failing package. Running <filename>debootstrap</filename> seperately from the Live system build or running <filename>lh_bootstrap</filename> with <command>--debug</command> will give you more information.</para>
<para>Also, if you are using a local mirror and/or any of sort of proxy and you are experiencing a problem, please always reproduce it first by bootstrapping from an official mirror.</para>
</listitem>
@@ -106,7 +104,7 @@
<title>Do the research</title>
<para>Before filing the bug, please search the web for the particular error message or symptom you are getting. As it is highly unlikely that you are the only person experiencing a particular problem, there is always a chance that it has been discussed elsewhere, and a possible solution, patch, or workaround has been proposed.</para>
<para>You should pay particular attention to the Debian Live mailing list, as well as the homepage, as these are likely to contain the most up-to-date information. If such information exists, always include the references to it in your bug report.</para>
- <para>In addition, you should check the <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper">current bug list for &live-helper;</ulink> and the <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-initramfs">current bug list for live-initramfs</ulink> to see whether something similar has been reported already.</para>
+ <para>In addition, you should check the <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper">current bug list for <filename>live-helper</filename></ulink> and the <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-initramfs">current bug list for live-initramfs</ulink> to see whether something similar has been reported already.</para>
</section>
<section id="where">
<title>Where to report bugs</title>
diff --git a/manual/en/resources.xml b/manual/en/resources.xml
index c9fc55a..c6615b6 100644
--- a/manual/en/resources.xml
+++ b/manual/en/resources.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="resources">
<title>Resources and links</title>
<section>
diff --git a/manual/en/success-stories.xml b/manual/en/success-stories.xml
index 4db8208..583cab0 100644
--- a/manual/en/success-stories.xml
+++ b/manual/en/success-stories.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="success-stories">
<title>Success Stories</title>
<para>This chapter documents success stories with Debian Live applied.</para>
diff --git a/manual/en/troubleshooting.xml b/manual/en/troubleshooting.xml
index db415d8..ed489f3 100644
--- a/manual/en/troubleshooting.xml
+++ b/manual/en/troubleshooting.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="troubleshooting">
<title>Hints for troubleshooting</title>
<para>To check on the client </para>
diff --git a/manual/en/use-cases.xml b/manual/en/use-cases.xml
index 23ca078..4717ac7 100644
--- a/manual/en/use-cases.xml
+++ b/manual/en/use-cases.xml
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % commondata SYSTEM "common.ent">
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="use-cases">
<title>Use Cases</title>
<para>This chapter is for users to document their use cases with Debian Live.</para>
<sect1 id="vnc-kiosk-client">
<title>VNC Kiosk Client</title>
- <para>Create an image with &live-helper; to boot directly to a VNC server.</para>
+ <para>Create an image with <filename>live-helper</filename> to boot directly to a VNC server.</para>
<itemizedlist>
<listitem>
<para>Make a build directory: <screen>$ mkdir vncBuild</screen> </para>
diff --git a/manual/po/de/about_manual.xml.po b/manual/po/de/about_manual.xml.po
index 3793929..d765bde 100644
--- a/manual/po/de/about_manual.xml.po
+++ b/manual/po/de/about_manual.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+0300\n"
"PO-Revision-Date: 2010-06-06 17:46+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,12 +16,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <sect1><title>
-#: en/about_manual.xml:6
+#: en/about_manual.xml:4
msgid "About this manual"
msgstr ""
#. type: Content of: <sect1><para>
-#: en/about_manual.xml:7
+#: 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 +29,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><para>
-#: en/about_manual.xml:8
+#: 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 +40,17 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:10
+#: en/about_manual.xml:8
msgid "Terms"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:13
+#: en/about_manual.xml:11
msgid "Live system"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:15
+#: 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 +60,24 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:19
+#: en/about_manual.xml:17
msgid "Debian Live"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:21
+#: 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/about_manual.xml:25
+#: en/about_manual.xml:23
msgid "Debian Live system"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:27
+#: 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,118 +85,120 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:31
+#: en/about_manual.xml:29
msgid "Build system / host system"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:33
+#: 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:37 en/overview.xml:9
-msgid "&live-helper;"
+#: en/about_manual.xml:35 en/overview.xml:7
+msgid "<filename>live-helper</filename>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:39
+#: en/about_manual.xml:37
msgid "A collection of scripts used to build customised Debian Live systems."
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/about_manual.xml:43 en/installation.xml:71
-msgid "&live-initramfs;"
+#: en/about_manual.xml:41 en/installation.xml:69
+msgid "<filename>live-initramfs</filename>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:45
+#: en/about_manual.xml:43
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/about_manual.xml:50
+#: en/about_manual.xml:48
msgid "<filename>live-package</filename>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:53
-msgid "The former name of &live-helper;."
+#: en/about_manual.xml:51
+msgid "The former name of <filename>live-helper</filename>."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:57
+#: en/about_manual.xml:55
msgid "Debian Installer / (d-i)"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:59
+#: en/about_manual.xml:57
msgid "The official installation system for the Debian distribution."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:63 en/customization_bootup.xml:48
+#: en/about_manual.xml:61 en/customization_bootup.xml:46
msgid "Cheat codes"
msgstr ""
#. type: Content of: <chapter><para>
-#: en/about_manual.xml:65 en/customization_bootup.xml:8
-#: en/customization_bootup.xml:14 en/customization_bootup.xml:17
-#: en/customization_bootup.xml:25 en/customization_bootup.xml:37
-#: en/customization_bootup.xml:41 en/customization_bootup.xml:45
-#: en/customization_bootup.xml:49 en/customization_packages.xml:18
-#: en/customization_packages.xml:130 en/customization_packages.xml:138
-#: en/customization_packages.xml:160 en/customization_packages.xml:198
-#: en/customization_packages.xml:209 en/live-environment.xml:9
-#: en/resources.xml:9 en/success-stories.xml:8
+#: 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
msgid "FIXME"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:69
+#: en/about_manual.xml:67
msgid "chroot"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:71
+#: en/about_manual.xml:69
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:75
+#: en/about_manual.xml:73
msgid "binary image"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:77
+#: en/about_manual.xml:75
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:81
+#: en/about_manual.xml:79
msgid "Target distribution"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:83
+#: en/about_manual.xml:81
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:87
-msgid "&lenny;/&squeeze;/&sid; stable/testing/unstable"
+#: en/about_manual.xml:85
+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:89
+#: en/about_manual.xml:87
msgid ""
"The \"stable\" distribution contains the latest officially released "
"distribution of Debian. The \"testing\" distribution is the staging area for "
@@ -208,90 +210,91 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:90
+#: en/about_manual.xml:88
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/about_manual.xml:96
+#: en/about_manual.xml:94
msgid "Authors"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:97
+#: en/about_manual.xml:95
msgid "A list of authors (in alphabetical order):"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:100
+#: en/about_manual.xml:98
msgid "Ben Armstrong"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:103
+#: en/about_manual.xml:101
msgid "Brendan Sleight"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:106
+#: en/about_manual.xml:104
msgid "Chris Lamb"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:109
+#: en/about_manual.xml:107
msgid "Daniel Baumann"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:112
+#: en/about_manual.xml:110
msgid "Franklin Piat"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:115
+#: en/about_manual.xml:113
msgid "Jonas Stein"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:118
+#: en/about_manual.xml:116
msgid "Kai Hendry"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:121
+#: en/about_manual.xml:119
msgid "Marco Amadori"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:124
+#: en/about_manual.xml:122
msgid "Mathieu Geli"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:127
+#: en/about_manual.xml:125
msgid "Matthias Kirschner"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:130
+#: en/about_manual.xml:128
msgid "Richard Nelson"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:133
+#: en/about_manual.xml:131
msgid "Trent W. Buck"
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:138
+#: en/about_manual.xml:136
msgid "Contributing to this document"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:139
+#: en/about_manual.xml:137
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -300,7 +303,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:140
+#: en/about_manual.xml:138
msgid ""
"When submitting a contribution please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted the "
@@ -309,42 +312,43 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:141
+#: en/about_manual.xml:139
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:143
+#: en/about_manual.xml:141
#, 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:143 en/about_manual.xml:147 en/about_manual.xml:151
-#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
-#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
-#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
-#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
-#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
-#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
-#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
-#: en/basics.xml:220 en/customization_packages.xml:25
-#: en/customization_packages.xml:29 en/customization_packages.xml:34
-#: en/customization_packages.xml:38 en/customization_packages.xml:48
-#: en/customization_packages.xml:102 en/customization_packages.xml:106
-#: en/customization_packages.xml:116 en/customization_packages.xml:132
-#: en/customization_packages.xml:140 en/customization_packages.xml:144
-#: en/customization_packages.xml:148 en/customization_packages.xml:152
-#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
-#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
-#: en/overview.xml:66 en/overview.xml:70
+#: 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
msgid "<placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:145
+#: en/about_manual.xml:143
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -352,31 +356,31 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para><screen>
-#: en/about_manual.xml:147
+#: en/about_manual.xml:145
#, 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:149
+#: en/about_manual.xml:147
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:151
+#: en/about_manual.xml:149
#, no-wrap
msgid "$ make build"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_manual.xml:154
+#: en/about_manual.xml:152
msgid "Applying patches"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_manual.xml:155
+#: en/about_manual.xml:153
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 "
@@ -384,40 +388,40 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:158
+#: en/about_manual.xml:156
msgid "Fetch the public commit key:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:160
+#: en/about_manual.xml:158
#, 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:164
+#: en/about_manual.xml:162
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:166
+#: en/about_manual.xml:164
#, 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:170
+#: en/about_manual.xml:168
msgid "Checkout a clone of the manual through ssh:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:172
+#: en/about_manual.xml:170
#, 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:176
+#: en/about_manual.xml:174
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 "
@@ -425,18 +429,18 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:178
+#: en/about_manual.xml:176
#, no-wrap
msgid "$ git commit -a"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:182
+#: en/about_manual.xml:180
msgid "Push the commit to the server:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:184
+#: en/about_manual.xml:182
#, no-wrap
msgid "$ git push"
msgstr ""
diff --git a/manual/po/de/about_project.xml.po b/manual/po/de/about_project.xml.po
index 67cf55c..264c389 100644
--- a/manual/po/de/about_project.xml.po
+++ b/manual/po/de/about_project.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+0300\n"
"PO-Revision-Date: 2010-06-06 17:46+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,22 +16,22 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <sect1><title>
-#: en/about_project.xml:6
+#: en/about_project.xml:4
msgid "About the Debian Live Project"
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/about_project.xml:8
+#: en/about_project.xml:6
msgid "Motivation"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:10
+#: 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:11
+#: 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/about_project.xml:14
+#: 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:17
+#: 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:20
+#: en/about_project.xml:18
msgid "They support i386 only."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:23
+#: 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:26
+#: en/about_project.xml:24
msgid "They include unofficial packages."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:29
+#: 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:32
+#: 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:35
+#: 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:40
+#: en/about_project.xml:38
msgid "Why create our own live system?"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:41
+#: 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/about_project.xml:44
+#: 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:47
+#: 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:50
+#: 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:53
+#: 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:56
+#: 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:59
+#: 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:65
+#: en/about_project.xml:63
msgid "Philosophy"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:67
+#: en/about_project.xml:65
msgid "Only unchanged, official packages"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:68
+#: 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/about_project.xml:69
+#: 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:70
+#: 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/about_project.xml:73
+#: 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:74
+#: 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/about_project.xml:75
+#: 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:76
+#: 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/about_project.xml:77
+#: 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/about_project.xml:80
+#: en/about_project.xml:78
msgid "Live system to hard disk installer"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:81
+#: 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/about_project.xml:82
+#: 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/about_project.xml:86
+#: en/about_project.xml:84
msgid "Contact"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:89
+#: en/about_project.xml:87
msgid "Mailing list"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:91
+#: 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/about_project.xml:95
+#: en/about_project.xml:93
msgid "IRC"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:97
+#: 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/about_project.xml:101
+#: en/about_project.xml:99
msgid "BTS"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:103
+#: 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/about_project.xml:107
+#: en/about_project.xml:105
msgid "Wiki"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:109
+#: 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/po/de/basics.xml.po b/manual/po/de/basics.xml.po
index c9ec965..a4a78fa 100644
--- a/manual/po/de/basics.xml.po
+++ b/manual/po/de/basics.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+0300\n"
"PO-Revision-Date: 2010-06-06 17:46+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,46 +16,47 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
-#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
-#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
-#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
-#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
-#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
-#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
-#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
-#: en/basics.xml:220 en/customization_packages.xml:25
-#: en/customization_packages.xml:29 en/customization_packages.xml:34
-#: en/customization_packages.xml:38 en/customization_packages.xml:48
-#: en/customization_packages.xml:102 en/customization_packages.xml:106
-#: en/customization_packages.xml:116 en/customization_packages.xml:132
-#: en/customization_packages.xml:140 en/customization_packages.xml:144
-#: en/customization_packages.xml:148 en/customization_packages.xml:152
-#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
-#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
-#: en/overview.xml:66 en/overview.xml:70
+#: 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
msgid "<placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><title>
-#: en/basics.xml:6
+#: en/basics.xml:4
msgid "The basics"
msgstr ""
#. type: Content of: <chapter><para>
-#: en/basics.xml:7
+#: en/basics.xml:5
msgid ""
"This chapter contains a brief overview of the build process as well as "
"containing instructions on how to boot the various binary image types."
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/basics.xml:9
+#: en/basics.xml:7
msgid "What is a live system?"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:10
+#: en/basics.xml:8
msgid ""
"A live system usually means an OS booted on a computer from a removable "
"medium (such as CD-ROM, USB stick, or network), ready to use without any "
@@ -64,7 +65,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:11
+#: en/basics.xml:9
msgid ""
"With Debian Live, it's a Debian GNU/Linux OS, built for one of the supported "
"architectures (currently amd64, i386, powerpc and sparc). It is made from "
@@ -72,34 +73,34 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:14
+#: en/basics.xml:12
msgid "Linux kernel"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:16
+#: en/basics.xml:14
msgid "The Linux image, usually named <filename>vmlinuz*</filename>."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:20
+#: en/basics.xml:18
msgid "Initial RAM disk image (initrd)"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:22
+#: en/basics.xml:20
msgid ""
"RAM disk setup for the Linux boot, containing modules possibly needed to "
"mount the filesystem's image and some scripts to do it."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:26
+#: en/basics.xml:24
msgid "System image"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:28
+#: en/basics.xml:26
msgid ""
"The OS filesystem image. Debian Live uses SquashFS, a compressed filesystem, "
"to minimize its image size. Note that it's read-only. So, during boot the "
@@ -110,12 +111,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:32
+#: en/basics.xml:30
msgid "Bootloader"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:34
+#: en/basics.xml:32
msgid ""
"A small piece of code, crafted to boot up from the chosen media, possibly "
"presenting a prompt or menu to allow selection of options/configuration. It "
@@ -128,7 +129,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:38
+#: en/basics.xml:36
msgid ""
"The Debian Live tools will build the system image from your specifications, "
"setup a Linux kernel and its initrd, a bootloader to run them, all in one "
@@ -136,20 +137,20 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/basics.xml:41
+#: en/basics.xml:39
msgid "First steps: building an ISO image"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:42
+#: en/basics.xml:40
msgid ""
-"The following sequence of helper commands, provided by &live-helper;, will "
-"create a basic ISO image containing just the Debian standard system without "
-"X.org. It is suitable for burning to CD or DVD media."
+"The following sequence of helper commands, provided by <filename>live-"
+"helper</filename>, will create a basic ISO image containing just the Debian "
+"standard system without X.org. It is suitable for burning to CD or DVD media."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:43
+#: en/basics.xml:41
msgid ""
"First, we run the <filename>lh config</filename> helper command which will "
"create a <filename>\"config/\"</filename> hierarchy in the current directory "
@@ -157,13 +158,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:45
+#: en/basics.xml:43
#, no-wrap
msgid "$ lh config"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:47
+#: en/basics.xml:45
msgid ""
"By passing no parameters to <filename>lh config</filename> we indicated that "
"we wish to use the defaults. This will create an image of type binary (see "
@@ -171,125 +172,125 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:48
+#: en/basics.xml:46
msgid ""
"Now that we have a <filename>\"config/\"</filename> hierarchy, we may build "
"the image with the <filename>lh build</filename> helper command:"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/basics.xml:50 en/basics.xml:89 en/basics.xml:148 en/use-cases.xml:31
+#: en/basics.xml:48 en/basics.xml:87 en/basics.xml:146 en/use-cases.xml:29
#, no-wrap
msgid "# lh build"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:52
+#: en/basics.xml:50
msgid ""
"This process can take a while, depending on the speed of your network "
"connection (see <xref linkend=\"lh-build\"/>)."
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:54
+#: en/basics.xml:52
msgid "Testing an ISO image with Qemu"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:55
+#: en/basics.xml:53
msgid "Testing an ISO is simple:"
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:57
+#: en/basics.xml:55
#, no-wrap
msgid "# apt-get install qemu $ qemu -cdrom binary.iso"
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid "Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid "In order to test the ISO with virtualbox-ose:"
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:60
+#: en/basics.xml:58
#, no-wrap
msgid "# apt-get install virtualbox-ose"
msgstr ""
#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid ""
"the modules package for a stock kernel eg virtualbox-ose-"
"modules-2.6.26-1-486 or"
msgstr ""
#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid ""
"the modules package compiled for your kernel using module-assistant from the "
"package virtualbox-ose-source"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid "Run Virtualbox:"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid "{{{Applications -> System Tools -> VirtualBox OSE }}}"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid "Create a virtual machine from your Live ISO"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid ""
"To create a virtual machine \"mylive\" from A CDROM ISO \"binary.iso\" in "
"VirtualBox:"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid "{{{Machine -> New }}}"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid "In the Wizard: FIXME"
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:62
+#: en/basics.xml:60
msgid "Testing an ISO image with VMware Workstation"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:63
+#: en/basics.xml:61
msgid "In order to test the ISO with VMware Workstation:"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:64 en/basics.xml:111
+#: en/basics.xml:62 en/basics.xml:109
msgid "Run VMware Workstation:"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:65
+#: en/basics.xml:63
msgid "Click on Edit virtual machine settings in the VM summary page."
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:66
+#: en/basics.xml:64
msgid ""
"Then, click on the CD-ROM device and select Use ISO image. Remeber to "
"connect the CD-ROM device at power on and remeber to adjust the boot order "
@@ -297,28 +298,28 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:69
+#: en/basics.xml:67
msgid "Burning an ISO image to a physical medium"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:70
+#: en/basics.xml:68
msgid "Burning an ISO image is easy:"
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:72
+#: en/basics.xml:70
#, no-wrap
msgid "# apt-get install wodim $ wodim binary.iso"
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/basics.xml:77
+#: en/basics.xml:75
msgid "Building an USB/HDD image"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:78
+#: en/basics.xml:76
msgid ""
"The following sequence of helper commands will create a basic USB/HDD image "
"containing just the Debian standard system without X.org. It is suitable for "
@@ -327,7 +328,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:79
+#: en/basics.xml:77
msgid ""
"Note if you created an iso image with the previous example, you will need to "
"clean up your working directory with the <filename>lh clean</filename> "
@@ -335,13 +336,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:81 en/basics.xml:139
+#: en/basics.xml:79 en/basics.xml:137
#, no-wrap
msgid "$ lh clean --binary"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:83
+#: en/basics.xml:81
msgid ""
"Run the <filename>lh config</filename> helper command with the parameters to "
"configure the <filename>\"config/\"</filename> hierarchy to create a USB/HDD "
@@ -349,24 +350,24 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:85
+#: en/basics.xml:83
#, no-wrap
msgid "$ lh config -b usb-hdd"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:87 en/basics.xml:146
+#: en/basics.xml:85 en/basics.xml:144
msgid ""
"Now build the image with the <filename>lh build</filename> helper command:"
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:92
+#: en/basics.xml:90
msgid "Copying USB/HDD image to a USB stick"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:93
+#: en/basics.xml:91
msgid ""
"The generated binary image contains a <acronym>VFAT</acronym> partition and "
"the <command>syslinux</command> bootloader, ready to be directly written on "
@@ -375,13 +376,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:95
+#: en/basics.xml:93
#, no-wrap
msgid "$ dd if=binary.img of=${USBSTICK}"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:97
+#: en/basics.xml:95
msgid ""
"where <replaceable>${USBSTICK}</replaceable> is the device file of your key, "
"like <filename>/dev/sdb</filename> (not a partition like <filename>/dev/"
@@ -390,28 +391,28 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:103
+#: en/basics.xml:101
msgid "Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:105
+#: en/basics.xml:103
#, no-wrap
msgid "# apt-get install qemu $ qemu -hda binary.img"
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:109
+#: en/basics.xml:107
msgid "Testing an USB/HDD image with VMware Workstation"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:110
+#: en/basics.xml:108
msgid "In order to test the USB/HDD image with VMware Workstation:"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:112
+#: en/basics.xml:110
msgid ""
"Write the image to an usb stick. In VMware, click on Edit virtual machine "
"settings in VM summary page. Then, add a new physical harddisk device and "
@@ -419,12 +420,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:115
+#: en/basics.xml:113
msgid "Using the space left on a USB stick"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:116
+#: en/basics.xml:114
msgid ""
"If you want to use the remaining free space after you have installed the "
"<filename>binary.img</filename>, you can use a partitioning tool such as "
@@ -433,13 +434,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:118
+#: en/basics.xml:116
#, no-wrap
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:120
+#: en/basics.xml:118
msgid ""
"After the creation of the partition you have to create a filsystem on it. "
"One possible choice would be ext2 (ext3 isn't recommended because the "
@@ -447,36 +448,36 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:122
+#: en/basics.xml:120
#, no-wrap
msgid "# mkfs.ext2 ${USBSTICK}"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:124
+#: en/basics.xml:122
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:126
+#: en/basics.xml:124
#, no-wrap
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:131
+#: en/basics.xml:129
msgid ""
"FIXME: Describe installing Debian Live to a partition (e.g. /dev/sdc1) AND "
"using a bootloader to boot this."
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/basics.xml:135
+#: en/basics.xml:133
msgid "Building a netboot image"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:136
+#: en/basics.xml:134
msgid ""
"The following sequence of helper commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -484,14 +485,14 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:137
+#: en/basics.xml:135
msgid ""
"Note if you performed any previous examples, you will need to clean up your "
"working directory with the <filename>lh clean</filename> helper command:"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:141
+#: en/basics.xml:139
msgid ""
"Run the <filename>lh config</filename> helper command with the parameters to "
"configure the <filename>\"config/\"</filename> hierarchy to create our "
@@ -499,13 +500,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:143
+#: en/basics.xml:141
#, no-wrap
msgid "$ lh config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:145
+#: en/basics.xml:143
msgid ""
"In contrast with the ISO and USB hdd images, netbooting does not support "
"serving a filesystem image with the client so the files must be served via "
@@ -515,7 +516,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:150
+#: en/basics.xml:148
msgid ""
"In a network boot the client runs a small piece of software, which usually "
"resides on the <acronym>EEPROM</acronym> of the Ethernet card. This program "
@@ -528,7 +529,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:151
+#: en/basics.xml:149
msgid ""
"For example, if you unpack the generated <filename>binary-net.tar.gz</"
"filename> archive in the <filename>/srv/debian-live</filename> directory, "
@@ -538,17 +539,17 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:152
+#: en/basics.xml:150
msgid "We must now configure three services on the server to enable netboot:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:155
+#: en/basics.xml:153
msgid "DHCP server"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:157
+#: en/basics.xml:155
msgid ""
"We must configure our network's DHCP server to be sure to give an "
"<abbrev>IP</abbrev> address to the computer netbooting, and to advertise the "
@@ -556,7 +557,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:158
+#: en/basics.xml:156
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server (package "
"<literal>dhcp3-server</literal>) in the <filename>/etc/dhcp3/dhcpd.conf</"
@@ -564,23 +565,23 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:160
+#: en/basics.xml:158
#, no-wrap
msgid "# Options DHCP spécifiques à Pxelinux: option space pxelinux; option pxelinux.magic code 208 = string; option pxelinux.configfile code 209 = text; option pxelinux.pathprefix code 210 = text; option pxelinux.reboottime code 211 = unsigned integer 32; subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24 # IP addresses available for guests range 192.168.1.100 192.168.1.149; # allow booting from the net allow bootp; # for net booting, server where the first file to be loaded (by TFTP # protocol) (\"filename\" following definition) lies : so the TFTP # server's name. next-server myserver; # net boot configuration for guests with a PXE client : if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" { # Note : all files for PXE are relatives to the TFTP server's root # path, as usually defined in /etc/inetd.conf. # PXE boot loader (first program to be loaded, by TFTP) filename \"pxelinux.0\"; # describe some specific pxelinux's options through DHCP o
ptions : site-option-space \"pxelinux\"; option pxelinux.magic f1:00:74:7e; if exists dhcp-parameter-request-list { # Always send the PXELINUX options (specified in hexadecimal) option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3); } # For a PXE boot menu, different versions are available : simple # text, text with curses, graphic (VESA) #option pxelinux.configfile \"pxelinux/config_simple\"; #option pxelinux.configfile \"pxelinux/config_curses\"; option pxelinux.configfile \"pxelinux/config_vesa\"; # automatically reboot after 10 minutes of no activity option pxelinux.reboottime 600; } }"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:165
+#: en/basics.xml:163
msgid "TFTPd server"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:167
+#: en/basics.xml:165
msgid "This serves the kernel and initial ramdisk to the system at run-time."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:168
+#: en/basics.xml:166
msgid ""
"You should install the <command>tftpd-hpa</command> package. It can serve "
"all files contained inside a root directory, usually <filename>/var/lib/"
@@ -590,25 +591,25 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:170
+#: en/basics.xml:168
#, no-wrap
msgid "tftp dgram udp wait root /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:172
+#: en/basics.xml:170
msgid ""
"and reload the super server with <command>/etc/init.d/openbsd-inetd reload</"
"command>."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:176
+#: en/basics.xml:174
msgid "NFS server"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:178
+#: en/basics.xml:176
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -616,39 +617,39 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:179
+#: en/basics.xml:177
msgid ""
"You should install the <command>nfs-kernel-server</command> package -- "
"<command>nfs-user-server</command> does not function correctly with netboot."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:180
+#: en/basics.xml:178
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to <filename>/etc/exports</filename>:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:182
+#: en/basics.xml:180
#, no-wrap
msgid "/srv/debian-live *(ro,async,subtree_check,no_root_squash)"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:184
+#: en/basics.xml:182
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:186
+#: en/basics.xml:184
#, no-wrap
msgid "# exportfs -rv"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:191
+#: en/basics.xml:189
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -657,93 +658,93 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/basics.xml:194
+#: en/basics.xml:192
msgid "Netboot testing HowTo"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:195
+#: en/basics.xml:193
msgid ""
"Netboot image creation is made easy with live-helper magic, but testing the "
"images on physical machines can be really time consuming."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:196
+#: en/basics.xml:194
msgid ""
"To make our life easier, we can use virtualization. There are two solutions:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:199
+#: en/basics.xml:197
msgid "VMWare Player"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:201
+#: en/basics.xml:199
msgid "Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:202
+#: en/basics.xml:200
msgid ""
"Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:203
+#: en/basics.xml:201
msgid "Paste this text inside:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:205
+#: en/basics.xml:203
#, no-wrap
msgid "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = \"512\" MemAllowAutoScaleDown = \"FALSE\" ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = \"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\" ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\" displayName = \"Test Boot PXE\" guestOS = \"other\" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" ethernet0.generatedAddressOffset = \"0\""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:207
+#: en/basics.xml:205
msgid ""
"You can play with this configuration file (i.e. change memory limit to 256)"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:208
+#: en/basics.xml:206
msgid "Double click on this file (or run VMWare player and selecet this file)."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:209
+#: en/basics.xml:207
msgid "When running just press space if that strange question comes up..."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:215
+#: en/basics.xml:213
msgid "Qemu"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:217
+#: en/basics.xml:215
msgid "Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:218
+#: en/basics.xml:216
msgid "Edit <filename>/etc/qemu-ifup</filename>:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:220
+#: en/basics.xml:218
#, no-wrap
msgid "#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo \"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo \"Adding $1 to br0...\" sudo /usr/sbin/brctl addif br0 $1 sleep 2"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:222
+#: en/basics.xml:220
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:223
+#: en/basics.xml:221
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
diff --git a/manual/po/de/coding-style.xml.po b/manual/po/de/coding-style.xml.po
index 83780fd..aff901e 100644
--- a/manual/po/de/coding-style.xml.po
+++ b/manual/po/de/coding-style.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+0300\n"
"PO-Revision-Date: 2010-06-06 17:46+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,92 +16,92 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <chapter><title>
-#: en/coding-style.xml:6
+#: en/coding-style.xml:4
msgid "Coding Style"
msgstr ""
#. type: Content of: <chapter><para>
-#: en/coding-style.xml:7
+#: en/coding-style.xml:5
msgid ""
-"This chapter documents the coding style used in &live-helper; and (ideally) "
-"in &live-initramfs;."
+"This chapter documents the coding style used in <filename>live-helper</"
+"filename> and (ideally) in <filename>live-initramfs</filename>."
msgstr ""
#. type: Content of: <chapter><sect1><title>
-#: en/coding-style.xml:9
+#: en/coding-style.xml:7
msgid "Compatibility"
msgstr ""
#. type: Content of: <chapter><sect1><title>
-#: en/coding-style.xml:17
+#: en/coding-style.xml:15
msgid "Indenting"
msgstr ""
#. type: Content of: <chapter><sect1><title>
-#: en/coding-style.xml:23
+#: en/coding-style.xml:21
msgid "Wrapping"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/coding-style.xml:26
+#: en/coding-style.xml:24
#, no-wrap
msgid " if foo; then bar fi "
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/coding-style.xml:26 en/coding-style.xml:27 en/coding-style.xml:39
-#: en/coding-style.xml:40
+#: en/coding-style.xml:24 en/coding-style.xml:25 en/coding-style.xml:37
+#: en/coding-style.xml:38
msgid "Bad: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/coding-style.xml:26
+#: en/coding-style.xml:24
#, no-wrap
msgid " if foo then bar fi "
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/coding-style.xml:26 en/coding-style.xml:27 en/coding-style.xml:39
-#: en/coding-style.xml:40
+#: en/coding-style.xml:24 en/coding-style.xml:25 en/coding-style.xml:37
+#: en/coding-style.xml:38
msgid "Good: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/coding-style.xml:27
+#: en/coding-style.xml:25
#, no-wrap
msgid " foo () { bar } "
msgstr ""
#. type: Content of: <chapter><sect1><title>
-#: en/coding-style.xml:31
+#: en/coding-style.xml:29
msgid "Variables"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/coding-style.xml:39
+#: en/coding-style.xml:37
#, no-wrap
msgid " FOO=bar "
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/coding-style.xml:39
+#: en/coding-style.xml:37
#, no-wrap
msgid " FOO=\"bar\" "
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/coding-style.xml:40
+#: en/coding-style.xml:38
#, no-wrap
msgid " if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ] then foobar fi "
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/coding-style.xml:40
+#: en/coding-style.xml:38
#, no-wrap
msgid " if [ -f \"${FOO}/foo/${BAR}/bar\" ] then foobar fi "
msgstr ""
#. type: Content of: <chapter><sect1><title>
-#: en/coding-style.xml:44
+#: en/coding-style.xml:42
msgid "Miscellaneous"
msgstr ""
diff --git a/manual/po/de/common-tasks.xml.po b/manual/po/de/common-tasks.xml.po
index 0ccdc85..b511b52 100644
--- a/manual/po/de/common-tasks.xml.po
+++ b/manual/po/de/common-tasks.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+0300\n"
"PO-Revision-Date: 2010-06-06 17:46+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,17 +16,17 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <chapter><title>
-#: en/common-tasks.xml:6
+#: en/common-tasks.xml:4
msgid "Common tasks"
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/common-tasks.xml:8
+#: en/common-tasks.xml:6
msgid "The Debian Installer"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/common-tasks.xml:9
+#: en/common-tasks.xml:7
msgid ""
"Although Debian Live is mostly concerned with avoiding permanent "
"installation, integrating some form of installer to your image is possible. "
@@ -35,12 +35,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><note><title>
-#: en/common-tasks.xml:11
+#: en/common-tasks.xml:9
msgid "The \"Debian Installer\""
msgstr ""
#. type: Content of: <chapter><section><note><para>
-#: en/common-tasks.xml:12
+#: en/common-tasks.xml:10
msgid ""
"Please note the careful use of capital letters when referring to the "
"\"Debian Installer\" in this section - when used like this we refer "
@@ -49,17 +49,17 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/common-tasks.xml:14
+#: en/common-tasks.xml:12
msgid "The three main types of installer are:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/common-tasks.xml:17
+#: en/common-tasks.xml:15
msgid "\"Normal\" Debian Installer"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:19
+#: en/common-tasks.xml:17
msgid ""
"This is a normal Debian Live image with a seperate kernel and initrd which "
"(when selected from the appropriate bootloader) launches into a standard "
@@ -68,7 +68,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:20
+#: en/common-tasks.xml:18
msgid ""
"This means that Debian is installed by fetching and installing <command>."
"deb</command> packages using <filename>debootstrap</filename> or "
@@ -78,20 +78,20 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:21
+#: en/common-tasks.xml:19
msgid ""
"This whole process can be preseeded and customised in a number of ways; see "
"the relevant \"DebianInstaller\" wiki page and installation guide for more. "
-"This is operational now withing &live-helper;."
+"This is operational now withing <filename>live-helper</filename>."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/common-tasks.xml:25
+#: en/common-tasks.xml:23
msgid "\"Live\" Debian Installer"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:27
+#: en/common-tasks.xml:25
msgid ""
"This is a Debian Live image with a seperate kernel and initrd which (when "
"selected from the appropriate bootloader) launches into an instance of the "
@@ -99,7 +99,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:28
+#: en/common-tasks.xml:26
msgid ""
"Installation will proceed in an identical fashion to the \"Normal\" "
"installation described above, but at the actual package installation stage, "
@@ -110,17 +110,17 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:29
+#: en/common-tasks.xml:27
msgid "This is working now."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/common-tasks.xml:33
+#: en/common-tasks.xml:31
msgid "\"Ubuntu\"-style installer"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:35
+#: en/common-tasks.xml:33
msgid ""
"This is where you boot into a graphical Debian Live system and run a wizard-"
"based program which installs and configures the live system, all the time "
@@ -128,18 +128,18 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:36
+#: en/common-tasks.xml:34
msgid "This is currently NOT possible with Debian Live."
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/common-tasks.xml:40
+#: en/common-tasks.xml:38
#, no-wrap
msgid " $ lh_config --help ... [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled] [--debian-installer-distribution CODENAME|daily] [--debian-installer-preseedfile FILE|URL] ... "
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/common-tasks.xml:40
+#: en/common-tasks.xml:38
msgid ""
"By default, no installer will be included in the Debian Live image. You can "
"enable it by using <filename>lh_config</filename> : <placeholder type="
@@ -147,29 +147,29 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/common-tasks.xml:41
+#: en/common-tasks.xml:39
msgid "The values \"Normal\", \"Live\" and \"Ubuntu\" are not valid values for"
msgstr ""
#. type: Content of: <chapter><section><para><term>
-#: en/common-tasks.xml:41
+#: en/common-tasks.xml:39
msgid "LH_BINARY_DEBIAN_INSTALLER"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/common-tasks.xml:41
+#: en/common-tasks.xml:39
msgid ""
". Refer to the output of <filename>lh_config</filename> cited above to "
"choose the appropriate values."
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/common-tasks.xml:44
+#: en/common-tasks.xml:42
msgid "WiFi Connection"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/common-tasks.xml:45
+#: en/common-tasks.xml:43
msgid ""
"Depending on the Debian Live image you are using and the given tools "
"configured with your Debian Live image you may need to only attach to an "
diff --git a/manual/po/de/customization_binary.xml.po b/manual/po/de/customization_binary.xml.po
index a71fa68..8abea42 100644
--- a/manual/po/de/customization_binary.xml.po
+++ b/manual/po/de/customization_binary.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+0300\n"
"PO-Revision-Date: 2010-06-06 12:16+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,22 +16,22 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <sect1><title>
-#: en/customization_binary.xml:7
+#: en/customization_binary.xml:4
msgid "Customising the binary image"
msgstr ""
#. type: Content of: <sect1><para>
-#: en/customization_binary.xml:9
+#: en/customization_binary.xml:5
msgid "This chapter discusses FIXME"
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_binary.xml:12
+#: en/customization_binary.xml:7
msgid "ISO metadata"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_binary.xml:14
+#: en/customization_binary.xml:8
msgid ""
"When creating an ISO9660 binary image, you can use the following options to "
"add various textual metadata for your image. This can help you easily "
@@ -39,58 +39,58 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_binary.xml:19
+#: en/customization_binary.xml:11
msgid ""
"<command>LH_ISO_APPLICATION</command> / <command>--iso-application "
"<replaceable>NAME</replaceable></command>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_binary.xml:22
+#: en/customization_binary.xml:13
msgid ""
"This should describe the application that will be on the image. The maximum "
"length for this field is 128 characters."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_binary.xml:27
+#: en/customization_binary.xml:17
msgid ""
"<command>LH_ISO_PREPARER</command> / <command>--iso-preparer "
"<replaceable>NAME</replaceable></command>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_binary.xml:30
+#: en/customization_binary.xml:19
msgid ""
"This should describe the preparer of the image, usually with some contact "
-"details. The default for this option is the &live-helper; version you are "
-"using, which may help with debugging later. The maximum length for this "
-"field is 128 characters."
+"details. The default for this option is the <filename>live-helper</filename> "
+"version you are using, which may help with debugging later. The maximum "
+"length for this field is 128 characters."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_binary.xml:35
+#: en/customization_binary.xml:23
msgid ""
"<command>LH_ISO_PUBLISHER</command> / <command>--iso-publisher "
"<replaceable>NAME</replaceable></command>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_binary.xml:38
+#: en/customization_binary.xml:25
msgid ""
"This should describe the publisher of the image, usually with some contact "
"details. The maximum length for this field is 128 characters."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_binary.xml:43
+#: en/customization_binary.xml:29
msgid ""
"<command>LH_ISO_VOLUME</command> / <command>--iso-volume <replaceable>NAME</"
"replaceable></command>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_binary.xml:46
+#: en/customization_binary.xml:31
msgid ""
"This should specify the volume ID of the image. This is used as a user-"
"visible label on some platforms such as Windows and Apple Mac OS. The "
diff --git a/manual/po/de/customization_contents.xml.po b/manual/po/de/customization_contents.xml.po
index a3514cb..909cdc4 100644
--- a/manual/po/de/customization_contents.xml.po
+++ b/manual/po/de/customization_contents.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+0300\n"
"PO-Revision-Date: 2010-06-06 17:46+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,58 +16,59 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <sect1><title>
-#: en/customization_contents.xml:6
+#: en/customization_contents.xml:4
msgid "Customising contents"
msgstr ""
#. type: Content of: <sect1><para>
-#: en/customization_contents.xml:7
+#: en/customization_contents.xml:5
msgid "This chapter discusses further customisation of the live system."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:9
+#: en/customization_contents.xml:7
msgid "Includes"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:10
+#: en/customization_contents.xml:8
msgid ""
"Using includes, it is possible to add (or replace) arbitrary files in your "
-"Debian Live image. &live-helper; provides three mechanisms for using them:"
+"Debian Live image. <filename>live-helper</filename> provides three "
+"mechanisms for using them:"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_contents.xml:13
+#: en/customization_contents.xml:11
msgid "Chroot local includes"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_contents.xml:15
+#: en/customization_contents.xml:13
msgid ""
"These allow you to add or replace files to the chroot/Live filesystem. "
"Please see <xref linkend=\"chroot-local-includes\"/> for more information."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:19 en/customization_contents.xml:42
+#: en/customization_contents.xml:17 en/customization_contents.xml:40
msgid "Binary local includes"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_contents.xml:21
+#: en/customization_contents.xml:19
msgid ""
"These allow you to add or replace files in the binary image. Please see "
"<xref linkend=\"binary-local-includes\"/> for more information."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:25 en/customization_contents.xml:46
+#: en/customization_contents.xml:23 en/customization_contents.xml:44
msgid "Binary includes"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_contents.xml:27
+#: en/customization_contents.xml:25
msgid ""
"These allow you to add or replace Debian specific files in the binary image, "
"such as the templates and tools directories. Please see <xref linkend="
@@ -75,19 +76,19 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:31
+#: en/customization_contents.xml:29
msgid ""
"Please see <xref linkend=\"terms\"/> for more information about the "
"distinction between the \"Live\" and \"binary\" images."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:33
+#: en/customization_contents.xml:31
msgid "Live/chroot local includes"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:34
+#: en/customization_contents.xml:32
msgid ""
"Chroot local includes can be used to add or replace files in the chroot/Live "
"filesystem so that they are visible when the Live system is booted. Typical "
@@ -98,7 +99,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:35
+#: en/customization_contents.xml:33
msgid ""
"To include files, simply add them to your <filename class=\"directory"
"\">config/chroot_local-includes</filename> directory. This directory "
@@ -108,82 +109,83 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><screen>
-#: en/customization_contents.xml:36
+#: en/customization_contents.xml:34
#, no-wrap
msgid " $ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html config/chroot_local-includes/var/www "
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:37
+#: en/customization_contents.xml:35
msgid "Your configuration will then have the following layout:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><screen>
-#: en/customization_contents.xml:38
+#: en/customization_contents.xml:36
#, no-wrap
msgid " -- config [...] |-- chroot_local-includes | `-- var | `-- www | `-- index.html [...] `-- templates "
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:39
+#: en/customization_contents.xml:37
msgid ""
"Chroot local includes are installed after package installation so that files "
"installed by packages are overwritten."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:43 en/customization_contents.xml:47
-#: en/customization_contents.xml:52 en/customization_contents.xml:56
-#: en/customization_contents.xml:60
+#: en/customization_contents.xml:41 en/customization_contents.xml:45
+#: en/customization_contents.xml:50 en/customization_contents.xml:54
+#: en/customization_contents.xml:58
msgid "FIXME."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:51
+#: en/customization_contents.xml:49
msgid "Hooks"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:53
+#: en/customization_contents.xml:51
msgid "Enabling hooks"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:55
+#: en/customization_contents.xml:53
msgid "Live/chroot local hooks"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:59
+#: en/customization_contents.xml:57
msgid "Binary local hooks"
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:64
+#: en/customization_contents.xml:62
msgid "Preseeding Debconf questions"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:65
+#: en/customization_contents.xml:63
msgid ""
"Files in the <filename class=\"directory\">config/chroot_local-preseed</"
"filename> directory are considered to be debconf preseed files and are "
-"installed by &live-helper; using <filename>debconf-set-selections</filename>."
+"installed by <filename>live-helper</filename> using <filename>debconf-set-"
+"selections</filename>."
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:66
+#: en/customization_contents.xml:64
msgid ""
"For more information about debconf, please see debconf(7) in the "
"<command>debconf</command> package."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:69
+#: en/customization_contents.xml:67
msgid "Symlink conversion"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:70
+#: en/customization_contents.xml:68
msgid "FIXME. (This is probably in the wrong section)"
msgstr ""
diff --git a/manual/po/de/customization_packages.xml.po b/manual/po/de/customization_packages.xml.po
index 5cc2ed1..e97501d 100644
--- a/manual/po/de/customization_packages.xml.po
+++ b/manual/po/de/customization_packages.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+0300\n"
"PO-Revision-Date: 2010-06-06 17:46+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,131 +16,132 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <chapter><para>
-#: en/about_manual.xml:65 en/customization_bootup.xml:8
-#: en/customization_bootup.xml:14 en/customization_bootup.xml:17
-#: en/customization_bootup.xml:25 en/customization_bootup.xml:37
-#: en/customization_bootup.xml:41 en/customization_bootup.xml:45
-#: en/customization_bootup.xml:49 en/customization_packages.xml:18
-#: en/customization_packages.xml:130 en/customization_packages.xml:138
-#: en/customization_packages.xml:160 en/customization_packages.xml:198
-#: en/customization_packages.xml:209 en/live-environment.xml:9
-#: en/resources.xml:9 en/success-stories.xml:8
+#: 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
msgid "FIXME"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
-#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
-#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
-#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
-#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
-#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
-#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
-#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
-#: en/basics.xml:220 en/customization_packages.xml:25
-#: en/customization_packages.xml:29 en/customization_packages.xml:34
-#: en/customization_packages.xml:38 en/customization_packages.xml:48
-#: en/customization_packages.xml:102 en/customization_packages.xml:106
-#: en/customization_packages.xml:116 en/customization_packages.xml:132
-#: en/customization_packages.xml:140 en/customization_packages.xml:144
-#: en/customization_packages.xml:148 en/customization_packages.xml:152
-#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
-#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
-#: en/overview.xml:66 en/overview.xml:70
+#: 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
msgid "<placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <sect1><title>
-#: en/customization_packages.xml:6
+#: en/customization_packages.xml:4
msgid "Customising package installation"
msgstr ""
#. type: Content of: <sect1><para>
-#: en/customization_packages.xml:7
+#: en/customization_packages.xml:5
msgid ""
"This chapter discusses the customisation of package installation. This "
"involves:"
msgstr ""
#. type: Content of: <sect1><orderedlist><listitem><para>
-#: en/customization_packages.xml:10
+#: en/customization_packages.xml:8
msgid "Selecting additional packages to be installed"
msgstr ""
#. type: Content of: <sect1><orderedlist><listitem><para>
-#: en/customization_packages.xml:13
+#: en/customization_packages.xml:11
msgid "Installing modified packages"
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:17
+#: en/customization_packages.xml:15
msgid "Package sources"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:21
+#: en/customization_packages.xml:19
msgid "Debian repositories"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:23
+#: en/customization_packages.xml:21
msgid "To set a local mirror (used to ''build'' the live-cd)"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:25
+#: en/customization_packages.xml:23
#, no-wrap
msgid "$ lh config --mirror-bootstrap \"http://local.intra.net/debian/\" --mirror-chroot \"http://local.intra.net/debian/\""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:27
+#: en/customization_packages.xml:25
msgid "The generic mirror is added to the live-system's /etc/apt/sources.list."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:29
+#: en/customization_packages.xml:27
#, no-wrap
msgid "$ lh config --mirror-binary \"http://ftp.debian.org/debian/\""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:31
+#: en/customization_packages.xml:29
msgid ""
"Note: It is ''not'' used for building the live-cd but to install new "
"software while using the live-cd."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:32
+#: en/customization_packages.xml:30
msgid "It can be disabled by setting binary indices parameter to disabled"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:34
+#: en/customization_packages.xml:32
#, no-wrap
msgid "$ lh config --binary-indices disabled"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:36
+#: en/customization_packages.xml:34
msgid ""
"Note: the same applies for mirror chroot security and mirror binary security"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:38
+#: en/customization_packages.xml:36
#, no-wrap
msgid "$ lh config --mirror-chroot-security {URL} $ lh config --mirror-binary-security {URL}"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:43
+#: en/customization_packages.xml:41
msgid "Own repository"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:45
+#: en/customization_packages.xml:43
msgid ""
"To add more repositories (e.g. backports, experimental packages, etc.), "
"create <filename>config/chroot_sources/your-cdd-repo.{chroot,binary}</"
@@ -148,7 +149,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:46
+#: en/customization_packages.xml:44
msgid ""
"e.g. <filename>config/chroot_sources/live.chroot</filename> allows you to "
"install packages from the debian live snapshot repository at live-cd build "
@@ -156,13 +157,13 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:48
+#: en/customization_packages.xml:46
#, no-wrap
msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:50
+#: en/customization_packages.xml:48
msgid ""
"If you add the line to <filename>config/chroot_sources/live.binary</"
"filename> the repository will be added to your live-system's <filename>/etc/"
@@ -170,24 +171,24 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:51
+#: en/customization_packages.xml:49
msgid "If such files exist, they will be picked up automatically."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:52
+#: en/customization_packages.xml:50
msgid ""
"You can also put the gpg-key used to sign the repository into config/"
"chroot_sources/foo.{binary,chroot}.gpg"
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:58
+#: en/customization_packages.xml:56
msgid "Package installation"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:59
+#: en/customization_packages.xml:57
msgid ""
"You can elect to use either <command>apt</command> or <command>aptitude</"
"command> when installing packages. Which utility is used is governed by the "
@@ -196,105 +197,105 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:63
+#: en/customization_packages.xml:61
msgid "<command>apt</command>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:66
+#: en/customization_packages.xml:64
msgid ""
"Specifying a missing package causes package installation to fail, which may "
"not be the desired behaviour."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:67
+#: en/customization_packages.xml:65
msgid "This is the default setting for building images for Lenny or later."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:72
+#: en/customization_packages.xml:70
msgid "<command>aptitude</command>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:75
+#: en/customization_packages.xml:73
msgid ""
"Specifying a missing package causes package installation to succeed, which "
"may not be the desired behaviour."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:76
+#: en/customization_packages.xml:74
msgid "This is the default setting for building images for Etch."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:82
+#: en/customization_packages.xml:80
msgid "Installing additional packages"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:83
+#: en/customization_packages.xml:81
msgid ""
-"&live-helper; has a number of mechanisms for indicating that additional "
-"packages should be installed, including:"
+"<filename>live-helper</filename> has a number of mechanisms for indicating "
+"that additional packages should be installed, including:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:86 en/customization_packages.xml:99
+#: en/customization_packages.xml:84 en/customization_packages.xml:97
msgid "The <command>LH_PACKAGES</command> variable"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:89 en/customization_packages.xml:112
+#: en/customization_packages.xml:87 en/customization_packages.xml:110
msgid "Package lists"
msgstr ""
#. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/customization_packages.xml:92
+#: en/customization_packages.xml:90
msgid "Local packages (<filename>chroot_local-packages/</filename>)"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:95 en/customization_packages.xml:159
+#: en/customization_packages.xml:93 en/customization_packages.xml:157
msgid "Tasks"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:100
+#: en/customization_packages.xml:98
msgid ""
"To install additional packages, simply add them to the <command>LH_PACKAGES</"
"command> variable in <filename>config/chroot</filename>. For example:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_packages.xml:102
+#: en/customization_packages.xml:100
#, no-wrap
msgid "LH_PACKAGES=\"package1 package2 package3 ... \""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:104
+#: en/customization_packages.xml:102
msgid "You can also specify initial values on the command line:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_packages.xml:106
+#: en/customization_packages.xml:104
#, no-wrap
msgid "$ lh config --packages \"package1 package2 package3\""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:108
+#: en/customization_packages.xml:106
msgid ""
-"The behaviour of &live-helper; when specifying a package that does not exist "
-"is determined by your choice of APT utility. See <xref linkend=\"package-"
-"installation\"/> for more details."
+"The behaviour of <filename>live-helper</filename> when specifying a package "
+"that does not exist is determined by your choice of APT utility. See <xref "
+"linkend=\"package-installation\"/> for more details."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:109
+#: en/customization_packages.xml:107
msgid ""
"If you need to specify a large number of packages to be installed or you "
"need flexibility regarding which packages to install, you should probably be "
@@ -303,16 +304,16 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:113
+#: en/customization_packages.xml:111
msgid ""
"Package lists are a powerful way of expressing which packages should be "
-"installed. &live-helper; ships with a number of predefined package lists "
-"which provide sensible default package selections for the GNOME and KDE "
-"desktop environments, as well as standard systems."
+"installed. <filename>live-helper</filename> ships with a number of "
+"predefined package lists which provide sensible default package selections "
+"for the GNOME and KDE desktop environments, as well as standard systems."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:114
+#: en/customization_packages.xml:112
msgid ""
"To specify a package list, add the name of the list to the "
"<command>LH_PACKAGES_LISTS</command> variable in <filename>config/chroot</"
@@ -320,44 +321,45 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_packages.xml:116
+#: en/customization_packages.xml:114
#, no-wrap
msgid "LH_PACKAGES_LISTS=\"gnome\""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:118
+#: en/customization_packages.xml:116
msgid ""
-"Package lists that are distributed with &live-helper; reside in the "
-"<command>/usr/share/live-helper/lists</command> directory."
+"Package lists that are distributed with <filename>live-helper</filename> "
+"reside in the <command>/usr/share/live-helper/lists</command> directory."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/customization_packages.xml:120
+#: en/customization_packages.xml:118
msgid "Local packages lists"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:121
+#: en/customization_packages.xml:119
msgid ""
"You may supplement the supplied lists using local package lists stored in "
"<command>config/chroot_local-packageslists</command>."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:122
+#: en/customization_packages.xml:120
msgid ""
"Package lists that exist in this directory always override package lists "
-"distributed with &live-helper;. This can cause undesired effects when."
+"distributed with <filename>live-helper</filename>. This can cause undesired "
+"effects when."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><note><title>
-#: en/customization_packages.xml:124
-msgid "&live-helper; 2.x change"
+#: en/customization_packages.xml:122
+msgid "<filename>live-helper</filename> 2.x change"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><note><para>
-#: en/customization_packages.xml:125
+#: en/customization_packages.xml:123
msgid ""
"Any file with <command>.list</command> suffix in <command>config/"
"chroot_local-packageslists</command> is automatically enabled, the variable "
@@ -366,91 +368,91 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/customization_packages.xml:129
+#: en/customization_packages.xml:127
msgid "Extending a provided package list using includes"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:132
+#: en/customization_packages.xml:130
#, no-wrap
msgid "#include <gnome> iceweasel"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:134
+#: en/customization_packages.xml:132
msgid ""
-"The package lists that are included with &live-helper; make extensive use of "
-"includes. They are available to view in the <command>/usr/share/live-helper/"
-"lists</command> directory."
+"The package lists that are included with <filename>live-helper</filename> "
+"make extensive use of includes. They are available to view in the <command>/"
+"usr/share/live-helper/lists</command> directory."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/customization_packages.xml:137
+#: en/customization_packages.xml:135
msgid "Using conditionals inside packages lists"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:140
+#: en/customization_packages.xml:138
#, no-wrap
msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:142
+#: en/customization_packages.xml:140
msgid ""
"or if <command>LH_ARCHITECTURE</command> is set to <command>i386</command> "
"or <command>amd64</command>:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:144
+#: en/customization_packages.xml:142
#, no-wrap
msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:146
+#: en/customization_packages.xml:144
msgid ""
"or if <command>LH_SECTIONS</command> contains either <command>contrib</"
"command> or <command>non-free</command>:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:148
+#: en/customization_packages.xml:146
#, no-wrap
msgid "#if SECTIONS contrib non-free vrms #endif"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:150
+#: en/customization_packages.xml:148
msgid "A conditional may surround an <command>#include</command> directive:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:152
+#: en/customization_packages.xml:150
#, no-wrap
msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:154
+#: en/customization_packages.xml:152
msgid ""
-"Any &live-helper; configuration variable that begins with <command>LH_</"
-"command> can be tested in this way."
+"Any <filename>live-helper</filename> configuration variable that begins with "
+"<command>LH_</command> can be tested in this way."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:155
+#: en/customization_packages.xml:153
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:164
+#: en/customization_packages.xml:162
msgid "Installing modified or third-party packages"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:165
+#: en/customization_packages.xml:163
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -461,7 +463,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:166
+#: en/customization_packages.xml:164
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's <ulink url=\"http://www.joachim-"
@@ -472,22 +474,22 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:167
+#: en/customization_packages.xml:165
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/customization_packages.xml:171
+#: en/customization_packages.xml:169
msgid "<filename>chroot_local-packages</filename>"
msgstr ""
#. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/customization_packages.xml:175
+#: en/customization_packages.xml:173
msgid "Using a custom APT repository"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:178
+#: en/customization_packages.xml:176
msgid ""
"The <filename>chroot_local-packages</filename> is simpler to achieve and "
"useful for \"one-off\" customisations but has a number of drawbacks, whilst "
@@ -495,13 +497,13 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:180
+#: en/customization_packages.xml:178
msgid ""
"Using <filename>chroot_local-packages</filename> to install custom packages"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:181
+#: en/customization_packages.xml:179
msgid ""
"To install a custom package, simply copy it to the <command>config/"
"chroot_local-packages</command> directory. Packages that are inside this "
@@ -510,45 +512,45 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:182
+#: en/customization_packages.xml:180
msgid ""
"Packages <emphasis>must</emphasis> be named in the prescribed way. One "
"simple way to do this is to use <command>dpkg-name</command>. FIXME"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:183
+#: en/customization_packages.xml:181
msgid ""
"Using <filename>chroot_local-packages</filename> for installation of custom "
"packages has disadvantages:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/customization_packages.xml:186
+#: en/customization_packages.xml:184
msgid "It is not possible to use secure APT"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/customization_packages.xml:189
+#: en/customization_packages.xml:187
msgid ""
"You must install all appropriate packages in the <command>config/"
"chroot_local-packages</command> directory"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/customization_packages.xml:192
+#: en/customization_packages.xml:190
msgid ""
"It does not lend itself to storing Debian Live configurations in revision "
"control"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:197
+#: en/customization_packages.xml:195
msgid "Using an APT repository to install custom packages"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:199
+#: en/customization_packages.xml:197
msgid ""
"Unlike using <filename>chroot_local-packages</filename>, when using a custom "
"APT repository you must ensure that you specify the packages elsewhere. See "
@@ -556,7 +558,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:200
+#: en/customization_packages.xml:198
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -564,22 +566,22 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:203
+#: en/customization_packages.xml:201
msgid "Custom packages and APT"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:204
+#: en/customization_packages.xml:202
msgid ""
-"&live-helper; 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."
+"<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."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:205
+#: en/customization_packages.xml:203
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' <command>debian/changelog</command> files to ensure that your "
@@ -589,12 +591,12 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:208
+#: en/customization_packages.xml:206
msgid "Altering APT preferences during Live system"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:210
+#: en/customization_packages.xml:208
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
diff --git a/manual/po/de/index.xml.po b/manual/po/de/index.xml.po
index da5af38..00b53cf 100644
--- a/manual/po/de/index.xml.po
+++ b/manual/po/de/index.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-12 14:29+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+0300\n"
"PO-Revision-Date: 2010-06-06 17:46+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,46 +16,46 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of the pubdate entity
-#: en/index.xml:4
-msgid "2010-06-12"
+#: en/index.xml:3
+msgid "2010-06-18"
msgstr ""
#. type: Content of the version entity
-#: en/index.xml:5
+#: en/index.xml:4
msgid "2.0~a1"
msgstr ""
#. type: Attribute 'lang' of: <book>
-#: en/index.xml:7
+#: en/index.xml:6
msgid "en"
msgstr ""
#. type: Content of: <book><title>
-#: en/index.xml:8
+#: en/index.xml:7
msgid "Debian Live Manual"
msgstr ""
#. type: Content of: <book><bookinfo>
-#: en/index.xml:10
+#: en/index.xml:9
msgid ""
"<author> <othername>Debian Live Project</othername> <email>debian-live at lists."
"debian.org</email> </author>"
msgstr ""
#. type: Content of: <book><bookinfo><releaseinfo>
-#: en/index.xml:14
+#: en/index.xml:13
msgid "&version;"
msgstr ""
#. type: Content of: <book><bookinfo>
-#: en/index.xml:15
+#: en/index.xml:14
msgid ""
"<pubdate>&pubdate;</pubdate> <copyright> <year>2006-2010</year> "
"<holder>Debian Live Project</holder> </copyright>"
msgstr ""
#. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:21
+#: en/index.xml:20
msgid ""
"This program is free software: you can redistribute it and/or modify it "
"under the terms of the GNU General Public License as published by the Free "
@@ -64,7 +64,7 @@ msgid ""
msgstr ""
#. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:22
+#: en/index.xml:21
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -73,7 +73,7 @@ msgid ""
msgstr ""
#. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:23
+#: en/index.xml:22
msgid ""
"You should have received a copy of the GNU General Public License along with "
"this program. If not, see <ulink url=\"http://www.gnu.org/licenses/\">http://"
@@ -81,7 +81,7 @@ msgid ""
msgstr ""
#. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:24
+#: en/index.xml:23
msgid ""
"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/"
diff --git a/manual/po/de/installation.xml.po b/manual/po/de/installation.xml.po
index 3b7dff3..cbf8c18 100644
--- a/manual/po/de/installation.xml.po
+++ b/manual/po/de/installation.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+0300\n"
"PO-Revision-Date: 2010-06-06 17:46+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,157 +16,162 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <chapter><section><section><title>
-#: en/about_manual.xml:43 en/installation.xml:71
-msgid "&live-initramfs;"
+#: en/about_manual.xml:41 en/installation.xml:69
+msgid "<filename>live-initramfs</filename>"
msgstr ""
#. type: Content of: <chapter><title>
-#: en/installation.xml:6
+#: en/installation.xml:4
msgid "Installation"
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/installation.xml:8
+#: en/installation.xml:6
msgid "Requirements"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/installation.xml:9
+#: en/installation.xml:7
msgid "Building Debian Live images has very few system requirements:"
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:12
+#: en/installation.xml:10
msgid "Super user (root) access"
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:15
-msgid "An up-to-date version of &live-helper;"
+#: en/installation.xml:13
+msgid "An up-to-date version of <filename>live-helper</filename>"
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:18
+#: en/installation.xml:16
msgid ""
"A POSIX-compliant shell, such as <command>bash</command> or <command>dash</"
"command>."
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:21
+#: en/installation.xml:19
msgid "<command>debootstrap</command> or <command>cdebootstrap</command>"
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:24
+#: en/installation.xml:22
msgid "Linux 2.6.x"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/installation.xml:27
+#: en/installation.xml:25
msgid ""
"Note that using Debian or a Debian-derived distribution is not required - "
-"&live-helper; will run on almost any operating system with the above "
-"requirements."
+"<filename>live-helper</filename> will run on almost any operating system "
+"with the above requirements."
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/installation.xml:30
-msgid "Installing &live-helper;"
+#: en/installation.xml:28
+msgid "Installing <filename>live-helper</filename>"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/installation.xml:31
-msgid "You can install &live-helper; in a number of different ways:"
+#: en/installation.xml:29
+msgid ""
+"You can install <filename>live-helper</filename> in a number of different "
+"ways:"
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/installation.xml:34 en/installation.xml:48
+#: en/installation.xml:32 en/installation.xml:46
msgid "From the Debian repository"
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/installation.xml:37 en/installation.xml:55
+#: en/installation.xml:35 en/installation.xml:53
msgid "From source"
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:40
+#: en/installation.xml:38
msgid "From snapshots"
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:43
+#: en/installation.xml:41
msgid "From backports.org"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/installation.xml:46
+#: en/installation.xml:44
msgid ""
-"If you are using &lenny; or &sid; the recommended way is to install &live-"
-"helper; via the Debian repository."
+"If you are using <emphasis>lenny</emphasis> or <emphasis>sid</emphasis> the "
+"recommended way is to install <filename>live-helper</filename> via the "
+"Debian repository."
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:49
-msgid "Simply install &live-helper; like any other package:"
+#: en/installation.xml:47
+msgid "Simply install <filename>live-helper</filename> like any other package:"
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:50
+#: en/installation.xml:48
#, no-wrap
msgid "# apt-get install live-helper"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:51
+#: en/installation.xml:49
msgid "or"
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:52
+#: en/installation.xml:50
#, no-wrap
msgid "# aptitude install live-helper"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:56
+#: en/installation.xml:54
msgid ""
-"&live-helper; is developed using the Git version control system. On Debian "
-"systems, this is provided by the <command>git-core</command> package. To "
-"check out the latest code, execute:"
+"<filename>live-helper</filename> is developed using the Git version control "
+"system. On Debian systems, this is provided by the <command>git-core</"
+"command> package. To check out the latest code, execute:"
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:57
+#: en/installation.xml:55
#, no-wrap
msgid "$ git clone git://live.debian.net/git/live-helper.git"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:58
+#: en/installation.xml:56
msgid "You can build and install your own Debian package by executing:"
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:59
+#: en/installation.xml:57
#, no-wrap
msgid " $ cd live-helper $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .. # dpkg -i live-helper*.deb "
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:60
-msgid "You can also use a local version of &live-helper; without installation:"
+#: en/installation.xml:58
+msgid ""
+"You can also use a local version of <filename>live-helper</filename> without "
+"installation:"
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:61
+#: en/installation.xml:59
#, no-wrap
msgid "# live-helper/helpers/lh_local"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:62
+#: en/installation.xml:60
msgid ""
"Subsequent calls to <filename>lh_</filename>-prefixed helpers in that shell "
"environment will then use the version located in the directory you executed "
@@ -174,69 +179,70 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:63
+#: en/installation.xml:61
msgid ""
-"You can also install &live-helper; directly to your system by executing:"
+"You can also install <filename>live-helper</filename> directly to your "
+"system by executing:"
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:64
+#: en/installation.xml:62
#, no-wrap
msgid "# make install"
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/installation.xml:67
+#: en/installation.xml:65
msgid "From 'snapshots'"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:68
+#: en/installation.xml:66
msgid ""
-"If you do not wish to build or install &live-helper; 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>."
+"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>."
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:73
+#: en/installation.xml:71
msgid ""
-"<emphasis>N.B. You do not need to install &live-initramfs; on your system to "
-"create customised Debian Live systems. However, doing so will do no harm.</"
-"emphasis>"
+"<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>"
msgstr ""
#. type: Content of: <chapter><section><section><section><title>
-#: en/installation.xml:76
-msgid "Using a customised &live-initramfs;"
+#: en/installation.xml:74
+msgid "Using a customised <filename>live-initramfs</filename>"
msgstr ""
#. type: Content of: <chapter><section><section><section><para>
-#: en/installation.xml:77
+#: en/installation.xml:75
msgid ""
"To modify the code you can follow the process below. Please ensure you are "
"familiar with the terms mentioned in <xref linkend=\"terms\"/>."
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:80
-msgid "Checkout the &live-initramfs; source"
+#: en/installation.xml:78
+msgid "Checkout the <filename>live-initramfs</filename> source"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:81
+#: en/installation.xml:79
#, no-wrap
msgid "$ git clone git://live.debian.net/git/live-initramfs.git"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:84
+#: en/installation.xml:82
msgid "Make changes to your local copy"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:85
+#: en/installation.xml:83
msgid ""
"And beware that if you want to add your pre-init script in live-bottom, you "
"should name it without dashes '-', e.g: call it \"81new_feature\" and not "
@@ -244,12 +250,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:88
-msgid "Build a &live-initramfs; <command>.deb</command>"
+#: en/installation.xml:86
+msgid "Build a <filename>live-initramfs</filename> <command>.deb</command>"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:89
+#: en/installation.xml:87
msgid ""
"You must build either on your target distribution or in a chroot containing "
"your target platform: this means if your target is lenny then you should "
@@ -260,69 +266,70 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:90
+#: en/installation.xml:88
#, no-wrap
msgid " $ cd live-initramfs $ dpkg-buildpackage -rfakeroot -b -uc -us "
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:93
-msgid "Use the generated &live-initramfs; <command>.deb</command>"
+#: en/installation.xml:91
+msgid ""
+"Use the generated <filename>live-initramfs</filename> <command>.deb</command>"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:94
+#: en/installation.xml:92
msgid ""
-"As &live-initramfs; is installed by the build system, installing the package "
-"in the host system is not sufficient: you should treat the generated "
-"<command>.deb</command> like another custom package. Please see <xref "
-"linkend=\"custom-packages\"/> for more information. You should pay "
-"particular attention to <xref linkend=\"custom-packages-apt\"/>."
+"As <filename>live-initramfs</filename> is installed by the build system, "
+"installing the package in the host system is not sufficient: you should "
+"treat the generated <command>.deb</command> like another custom package. "
+"Please see <xref linkend=\"custom-packages\"/> for more information. You "
+"should pay particular attention to <xref linkend=\"custom-packages-apt\"/>."
msgstr ""
#. type: Content of: <chapter><section><section><section><title>
-#: en/installation.xml:99
-msgid "Using &live-initramfs; snapshots"
+#: en/installation.xml:97
+msgid "Using <filename>live-initramfs</filename> snapshots"
msgstr ""
#. type: Content of: <chapter><section><section><section><para>
-#: en/installation.xml:100
+#: en/installation.xml:98
msgid ""
-"You can let &live-helper; automatically use the latest snapshot of &live-"
-"initramfs; by configuring a third-party repository in your live-system "
-"configuration. Assuming you have already created a configuration tree with "
-"<command>lh config</command>:"
+"You can let <filename>live-helper</filename> automatically use the latest "
+"snapshot of <filename>live-initramfs</filename> by configuring a third-party "
+"repository in your live-system configuration. Assuming you have already "
+"created a configuration tree with <command>lh config</command>:"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:103
+#: en/installation.xml:101
msgid "Create a sources.list entry for the chroot stage:"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:104
+#: en/installation.xml:102
#, no-wrap
msgid "echo \"deb http://live.debian.net/ sid-snapshots main contrib non-free\" > config/chroot_sources/debian-live_sid-snapshots.chroot"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:107
+#: en/installation.xml:105
msgid "Create a sources.list entry for the binary stage:"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:108
+#: en/installation.xml:106
#, no-wrap
msgid "cp config/chroot_sources/debian-live_sid-snapshots.chroot config/chroot_sources/debian-live_sid-snapshots.binary"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:111
+#: en/installation.xml:109
msgid "Fetch the archive signing key:"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:112
+#: en/installation.xml:110
#, no-wrap
msgid " wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O config/chroot_sources/debian-live_sid-snapshots.chroot.gpg cp config/chroot_sources/debian-live_sid-snapshots.chroot.gpg config/chroot_sources/debian-live_sid-snapshots.binary.gpg "
msgstr ""
diff --git a/manual/po/de/live-environment.xml.po b/manual/po/de/live-environment.xml.po
index b8b3c48..6129d17 100644
--- a/manual/po/de/live-environment.xml.po
+++ b/manual/po/de/live-environment.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+0300\n"
"PO-Revision-Date: 2010-06-06 17:46+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,41 +16,41 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <chapter><para>
-#: en/about_manual.xml:65 en/customization_bootup.xml:8
-#: en/customization_bootup.xml:14 en/customization_bootup.xml:17
-#: en/customization_bootup.xml:25 en/customization_bootup.xml:37
-#: en/customization_bootup.xml:41 en/customization_bootup.xml:45
-#: en/customization_bootup.xml:49 en/customization_packages.xml:18
-#: en/customization_packages.xml:130 en/customization_packages.xml:138
-#: en/customization_packages.xml:160 en/customization_packages.xml:198
-#: en/customization_packages.xml:209 en/live-environment.xml:9
-#: en/resources.xml:9 en/success-stories.xml:8
+#: 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
msgid "FIXME"
msgstr ""
#. type: Content of: <chapter><title>
-#: en/live-environment.xml:6
+#: en/live-environment.xml:4
msgid "The Live environment"
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:8
+#: en/live-environment.xml:6
msgid "Swap space"
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:12
+#: en/live-environment.xml:10
msgid "Hostname"
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:13
+#: en/live-environment.xml:11
#, no-wrap
msgid "lh_config --bootappend-live \"hostname=myhost\""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:13
+#: en/live-environment.xml:11
msgid ""
"The name of host running live system can be set with the <command>hostname</"
"command> parameter into the <command>--bootappend-live</command> option of "
@@ -59,25 +59,25 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:16
+#: en/live-environment.xml:14
msgid "The Live user"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:17
+#: en/live-environment.xml:15
msgid "Username FIXME."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:18
+#: en/live-environment.xml:16
msgid ""
-"One important consideration is that the live user is created by &live-"
-"initramfs; during bootup, it is not created by &live-helper; when building "
-"the image."
+"One important consideration is that the live user is created by "
+"<filename>live-initramfs</filename> during bootup, it is not created by "
+"<filename>live-helper</filename> when building the image."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:19
+#: en/live-environment.xml:17
msgid ""
"You can specify additional groups that the live user will belong to by "
"preseeding the <command>passwd/user-default-groups</command> debconf value. "
@@ -87,51 +87,51 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><screen>
-#: en/live-environment.xml:20
+#: en/live-environment.xml:18
#, no-wrap
msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse "
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:21
+#: en/live-environment.xml:19
msgid ""
"For more information about debconf preseeding, please see <xref linkend="
"\"debconf-preseed\"/>."
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:24
+#: en/live-environment.xml:22
msgid "Language"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:25
+#: en/live-environment.xml:23
msgid "When the live system boots, language is involved in three steps:"
msgstr ""
#. type: Content of: <chapter><section><para><itemizedlist><listitem><simpara>
-#: en/live-environment.xml:25
+#: en/live-environment.xml:23
msgid "the locale generation"
msgstr ""
#. type: Content of: <chapter><section><para><itemizedlist><listitem><simpara>
-#: en/live-environment.xml:25
+#: en/live-environment.xml:23
msgid "setting the keyboard layout for the console"
msgstr ""
#. type: Content of: <chapter><section><para><itemizedlist><listitem><simpara>
-#: en/live-environment.xml:25
+#: en/live-environment.xml:23
msgid "setting the keyboard layout for X"
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:26
+#: en/live-environment.xml:24
#, no-wrap
msgid "lh_config --bootappend-live \"locale=sv_SE.utf8\""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:26
+#: en/live-environment.xml:24
msgid ""
"To define the locale that should be generated, use the <command>locale</"
"command> parameter into the <command>--bootappend-live</command> option of "
@@ -143,19 +143,19 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:27
+#: en/live-environment.xml:25
#, no-wrap
msgid "$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name> "
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:27
+#: en/live-environment.xml:25
#, no-wrap
msgid "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se\""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:27
+#: en/live-environment.xml:25
msgid ""
"Both the console and X keyboard configuration depends on the <command>keyb</"
"command> parameter of the <command>--bootappend-live</command> option. Valid "
@@ -168,19 +168,19 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:28
+#: en/live-environment.xml:26
#, no-wrap
msgid "for i in `find /usr/share/keymaps/ -iname \"*kmap.gz\"`; do basename $i | head -c -9; echo; done | sort | less "
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:28
+#: en/live-environment.xml:26
#, no-wrap
msgid "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se-latin1\""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:28
+#: en/live-environment.xml:26
msgid ""
"A list of the valid values of the keyboards for the console can be figured "
"with the following command: <placeholder type=\"screen\" id=\"0\"/> To make "
@@ -189,13 +189,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:29
+#: en/live-environment.xml:27
#, no-wrap
msgid "lh_config --bootappend-live \\ \"locale=fr_FR.UTF-8 klayout=fr kvariant=bepo kmodel=tm2030usb\""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:29
+#: en/live-environment.xml:27
msgid ""
"Alternatively, you can use the <literal>console-setup</literal> package, a "
"tool to let you configure console layout using X (XKB) definitions; you can "
@@ -211,12 +211,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:32
+#: en/live-environment.xml:30
msgid "Persistence"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:33
+#: en/live-environment.xml:31
msgid ""
"A live cd paradigm is a preinstalled system which runs from read-only media, "
"like a cdrom, where writes and modifications do not survive reboots of the "
@@ -224,7 +224,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:34
+#: en/live-environment.xml:32
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -233,7 +233,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:35
+#: en/live-environment.xml:33
msgid ""
"Persistence is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this runtime evolution of the system. To "
@@ -244,7 +244,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:36
+#: en/live-environment.xml:34
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -254,12 +254,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:38
+#: en/live-environment.xml:36
msgid "Full persistence"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:39
+#: en/live-environment.xml:37
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -271,26 +271,26 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/live-environment.xml:40
+#: en/live-environment.xml:38
#, no-wrap
msgid " # mkfs.ext2 -L live-rw /dev/sdb1 "
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:41
+#: en/live-environment.xml:39
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/live-environment.xml:42
+#: en/live-environment.xml:40
#, no-wrap
msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/sdb1 live-rw # for a fat filesystem "
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:43
+#: en/live-environment.xml:41
msgid ""
"But since live system users cannot always use a hard drive partition, and "
"considering that most USB keys have poor write speeds, 'full' persistence "
@@ -300,25 +300,25 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/live-environment.xml:44
+#: en/live-environment.xml:42
#, no-wrap
msgid " $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /sbin/mkfs.ext2 -F live-rw "
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:45
+#: en/live-environment.xml:43
msgid ""
"Then copy the <command>live-rw</command> file to a writable partition and "
"reboot with the boot parameter 'persistent'."
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:48
+#: en/live-environment.xml:46
msgid "Home automounting"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:49
+#: en/live-environment.xml:47
msgid ""
"If during the boot a partition (filesystem) image file or a partition "
"labeled <command>home-rw</command> is discovered, this filesystem will be "
@@ -328,12 +328,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:52
+#: en/live-environment.xml:50
msgid "Snapshots"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:53
+#: en/live-environment.xml:51
msgid ""
"Snapshots are collections of files and directories which are not mounted "
"while running but which are copied from a persistent device to the system "
@@ -351,7 +351,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:54
+#: en/live-environment.xml:52
msgid ""
"A /home version of snapshot exists too and its label is <command>home-sn.*</"
"command>; it works the same as the main snapshot but it is only applied to /"
@@ -359,19 +359,19 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:55
+#: en/live-environment.xml:53
msgid ""
"Snapshots cannot currently handle file deletion but full persistence and "
"home automounting can."
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:58
+#: en/live-environment.xml:56
msgid "Persistent SubText"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:59
+#: en/live-environment.xml:57
msgid ""
"If a user would need multiple persistent storage of the same type for "
"different locations or testing, such as <command>live-rw-nonwork</command> "
@@ -385,12 +385,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:62
+#: en/live-environment.xml:60
msgid "Partial remastering"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:63
+#: en/live-environment.xml:61
msgid ""
"The runtime modification of the tmpfs could be collected using live-snapshot "
"in a squashfs and added to the cd by remastering the iso in the case of cd-r "
diff --git a/manual/po/de/overview.xml.po b/manual/po/de/overview.xml.po
index 8d28171..239d660 100644
--- a/manual/po/de/overview.xml.po
+++ b/manual/po/de/overview.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+0300\n"
"PO-Revision-Date: 2010-06-06 17:46+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,143 +16,145 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <chapter><section><title>
-#: en/about_manual.xml:37 en/overview.xml:9
-msgid "&live-helper;"
+#: en/about_manual.xml:35 en/overview.xml:7
+msgid "<filename>live-helper</filename>"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
-#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
-#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
-#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
-#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
-#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
-#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
-#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
-#: en/basics.xml:220 en/customization_packages.xml:25
-#: en/customization_packages.xml:29 en/customization_packages.xml:34
-#: en/customization_packages.xml:38 en/customization_packages.xml:48
-#: en/customization_packages.xml:102 en/customization_packages.xml:106
-#: en/customization_packages.xml:116 en/customization_packages.xml:132
-#: en/customization_packages.xml:140 en/customization_packages.xml:144
-#: en/customization_packages.xml:148 en/customization_packages.xml:152
-#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
-#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
-#: en/overview.xml:66 en/overview.xml:70
+#: 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
msgid "<placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><title>
-#: en/overview.xml:6
+#: en/overview.xml:4
msgid "Overview of tools"
msgstr ""
#. type: Content of: <chapter><para>
-#: en/overview.xml:7
+#: en/overview.xml:5
msgid ""
"This chapter contains an overview of the two main tools used in building "
"Debian Live systems."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:10
+#: en/overview.xml:8
msgid ""
-"&live-helper; is a collection of scripts to build Debian Live systems. These "
-"scripts are also referred to as \"helpers\"."
+"<filename>live-helper</filename> is a collection of scripts to build Debian "
+"Live systems. These scripts are also referred to as \"helpers\"."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:11
+#: en/overview.xml:9
msgid ""
-"The idea behind &live-helper; is to be a framework that uses a configuration "
-"directory to completely automate and customize all aspects of building a "
-"Live image."
+"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."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:12
+#: en/overview.xml:10
msgid ""
"Many concepts are similar to those in the <command>debhelper</command> "
"Debian package tools written by Joey Hess:"
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/overview.xml:15
+#: en/overview.xml:13
msgid "The scripts have a central location for configuring their operation."
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/overview.xml:16
+#: en/overview.xml:14
msgid ""
"In <command>debhelper</command>, this is the <filename class=\"directory"
"\">debian</filename> subdirectory of a package tree. For example, "
"<command>dh_install</command> will look for a file called <filename>debian/"
"<packagename>.install</filename> to determine which files should exist "
-"in a particular binary package. In much the same way, &live-helper; stores "
-"its configuration entirely under a <filename class=\"directory\">config/</"
-"filename> subdirectory."
+"in a particular binary package. In much the same way, <filename>live-helper</"
+"filename> stores its configuration entirely under a <filename class="
+"\"directory\">config/</filename> subdirectory."
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/overview.xml:19
+#: en/overview.xml:17
msgid ""
"The scripts are independent - that is to say, it is always safe to run each "
"command."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:22
+#: en/overview.xml:20
msgid ""
-"Unlike <command>debhelper</command>, &live-helper; 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\"/>."
+"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\"/>."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:23
+#: en/overview.xml:21
msgid ""
"Besides the common <filename>config/common</filename>, which is used by all "
-"&live-helper; 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)."
+"<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)."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:24
+#: en/overview.xml:22
msgid ""
"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 &live-helper; use pairs of values or slightly more "
-"complicated variable assignments."
+"Some programs in <filename>live-helper</filename> use pairs of values or "
+"slightly more complicated variable assignments."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:25
+#: en/overview.xml:23
msgid ""
-"&live-helper; 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), &live-helper; will automatically "
-"set it to a default value."
+"<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."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:26
+#: en/overview.xml:24
msgid ""
-"All config files are shell scripts which are sourced by a &live-helper; "
-"program. That means they have to follow the normal shell syntax. You can "
-"also put comments in these files; lines beginning with \"#\" are ignored."
+"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."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:27
+#: en/overview.xml:25
msgid ""
"In some rare cases you may want to have different versions of these files "
"for different architectures or distributions. If files named <command>config/"
@@ -165,71 +167,71 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:28
+#: en/overview.xml:26
msgid ""
"Please see <xref linkend=\"installation\"/> for information on how to "
-"install &live-helper;."
+"install <filename>live-helper</filename>."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:29
+#: en/overview.xml:27
msgid ""
"The remainder of this section discusses the three most important helpers:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/overview.xml:33
+#: en/overview.xml:31
msgid "<filename>lh config</filename>"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/overview.xml:36
+#: en/overview.xml:34
msgid ""
"Responsible for initialising a Live system configuration directory. See "
"<xref linkend=\"lh-config\"/> for more information."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/overview.xml:41
+#: en/overview.xml:39
msgid "<filename>lh build</filename>"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/overview.xml:44
+#: en/overview.xml:42
msgid ""
"Responsible for starting a Live system build. See <xref linkend=\"lh-build\"/"
"> for more information."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/overview.xml:49
+#: en/overview.xml:47
msgid "<filename>lh clean</filename>"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/overview.xml:52
+#: en/overview.xml:50
msgid ""
"Responsible for removing parts of a Live system build. See <xref linkend="
"\"lh-clean\"/> for more information."
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/overview.xml:57
+#: en/overview.xml:55
msgid "The <filename>lh config</filename> helper"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:58
+#: en/overview.xml:56
msgid ""
"As discussed in <xref linkend=\"live-helper\"/>, the scripts that make up "
-"&live-helper; source their configuration from a single directory named "
-"<command>config/</command>. As constructing this directory by hand would be "
-"time-consuming and error-prone, the <filename>lh config</filename> helper "
-"can be used to create skeleton configuration folders."
+"<filename>live-helper</filename> source their configuration from a single "
+"directory named <command>config/</command>. As constructing this directory "
+"by hand would be time-consuming and error-prone, the <filename>lh config</"
+"filename> helper can be used to create skeleton configuration folders."
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:59
+#: en/overview.xml:57
msgid ""
"Issuing <filename>lh config</filename> without any arguments creates a "
"<command>config</command> subdirectory which it populates with some default "
@@ -237,13 +239,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/overview.xml:61
+#: en/overview.xml:59
#, no-wrap
msgid "$ lh config $ ls -l total 4.1k drwxr-xr-x 19 user group 4.1k 2008-05-09 21:37 config $ ls -l config/ total 104 -rw-r--r-- 1 user group 4175 2010-04-11 12:16 binary drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_grub drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-debs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-hooks drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-packageslists drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-udebs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_rootfs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_syslinux -rw-r--r-- 1 user group 2205 2010-04-11 12:16 bootstrap -rw-r--r-- 1 user group 1599 2010-04-11 12:16 chroot drwxr-xr-x 2 user group 4096 2010-04-11 12:16
chroot_apt drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-hooks drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packages drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packageslists drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-patches drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-preseed drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_sources -rw-r--r-- 1 user group 2938 2010-04-11 12:16 common drwxr-xr-x 2 user group 4096 2010-04-11 12:16 includes -rw-r--r-- 1 user group 206 2010-04-11 12:16 source drwxr-xr-x 2 user group 4096 2010-04-11 12:16 templates "
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:63
+#: en/overview.xml:61
msgid ""
"Using <filename>lh config</filename> without any arguments would be suitable "
"for users who are either happy editing the generated files, or are simply "
@@ -251,7 +253,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:64
+#: en/overview.xml:62
msgid ""
"You can ask <filename>lh config</filename> to generate a <filename class="
"\"directory\">config/</filename> directory \"preseeded\" with various "
@@ -260,13 +262,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/overview.xml:66
+#: en/overview.xml:64
#, no-wrap
msgid "$ lh config -p gnome"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:68
+#: en/overview.xml:66
msgid ""
"will build a <filename class=\"directory\">config/</filename> directory "
"configured to include the '<command>gnome</command>' package list. It is "
@@ -274,13 +276,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/overview.xml:70
+#: en/overview.xml:68
#, no-wrap
msgid "$ lh config --apt aptitude --binary-images net --hostname live-machine --username live-user ..."
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:72
+#: en/overview.xml:70
msgid ""
"A full list of options is available in the <command>lh_config</command> man "
"page. Most options have a parallel with an \"<command>LH_</command>\" "
@@ -288,12 +290,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/overview.xml:75
+#: en/overview.xml:73
msgid "The <filename>lh build</filename> helper"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:76
+#: en/overview.xml:74
msgid ""
"The <filename>lh build</filename> helper reads in your configuration from "
"the <filename class=\"directory\">config/</filename> directory. It then runs "
@@ -301,12 +303,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/overview.xml:79
+#: en/overview.xml:77
msgid "The <filename>lh clean</filename> helper"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:80
+#: en/overview.xml:78
msgid ""
"It is the job of the <filename>lh clean</filename> helper to remove various "
"parts of a Live helper build so subsequent builds can start from a clean "
@@ -314,22 +316,22 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/overview.xml:84
-msgid "The &live-initramfs; package"
+#: en/overview.xml:82
+msgid "The <filename>live-initramfs</filename> package"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:85
+#: en/overview.xml:83
msgid ""
-"&live-initramfs; 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."
+"<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."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:86
+#: en/overview.xml:84
msgid ""
"At boot time it will look for read-only media containing a \"/live\" "
"directory where a root filesystem (often a compressed filesystem image like "
@@ -338,14 +340,14 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:87
+#: en/overview.xml:85
msgid ""
-"&live-initramfs; is a fork of <ulink url=\"http://packages.ubuntu.com/casper"
-"\">casper</ulink>."
+"<filename>live-initramfs</filename> is a fork of <ulink url=\"http://"
+"packages.ubuntu.com/casper\">casper</ulink>."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:88
+#: en/overview.xml:86
msgid ""
"More information on initial ramfs in Debian can be found in the <ulink url="
"\"http://kernel-handbook.alioth.debian.org/\"> Debian Linux Kernel Handbook</"
diff --git a/manual/po/de/reporting-bugs.xml.po b/manual/po/de/reporting-bugs.xml.po
index db464be..d38f619 100644
--- a/manual/po/de/reporting-bugs.xml.po
+++ b/manual/po/de/reporting-bugs.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+0300\n"
"PO-Revision-Date: 2010-06-06 17:46+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,12 +16,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <chapter><title>
-#: en/reporting-bugs.xml:6
+#: en/reporting-bugs.xml:4
msgid "Reporting bugs"
msgstr ""
#. type: Content of: <chapter><para>
-#: en/reporting-bugs.xml:7
+#: en/reporting-bugs.xml:5
msgid ""
"Debian Live is far from being perfect, but we want to make it as close as "
"possible to perfect - with your help. Do not hesitate to report a bug: it is "
@@ -30,46 +30,48 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><para>
-#: en/reporting-bugs.xml:8
+#: en/reporting-bugs.xml:6
msgid "For the impatient:"
msgstr ""
#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:11
+#: en/reporting-bugs.xml:9
msgid ""
"Always check first the image status updates on <ulink url=\"http://live."
"debian.net/\">our homepage</ulink> for known issues."
msgstr ""
#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:14
+#: en/reporting-bugs.xml:12
msgid ""
"Always try to reproduce the bug with the <emphasis>most recent version of "
-"&live-helper; and &live-initramfs;</emphasis> before submitting a bug report."
+"<filename>live-helper</filename> and <filename>live-initramfs</filename></"
+"emphasis> before submitting a bug report."
msgstr ""
#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:17
+#: en/reporting-bugs.xml:15
msgid ""
"Try to give <emphasis>as specific information as possible</emphasis> about "
-"the bug. This includes (at least) the version of &live-helper; and &live-"
-"initramfs; used and the distribution of the live system you are building."
+"the bug. This includes (at least) the version of <filename>live-helper</"
+"filename> and <filename>live-initramfs</filename> used and the distribution "
+"of the live system you are building."
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/reporting-bugs.xml:21
+#: en/reporting-bugs.xml:19
msgid "Known issues"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:22
+#: en/reporting-bugs.xml:20
msgid ""
"Due to the nature of Debian testing and Debian unstable branches being a "
"moving target, building a live system may not always be possible."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:23
+#: en/reporting-bugs.xml:21
msgid ""
"If this is a problem, do not build a system based on testing or unstable, "
"but go with stable. live-helper does always default to the current stable "
@@ -77,14 +79,14 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:24
+#: en/reporting-bugs.xml:22
msgid ""
"Currently known issues are listed under the section 'status' on <ulink url="
"\"http://live.debian.net/\">our homepage</ulink>."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:25
+#: en/reporting-bugs.xml:23
msgid ""
"It is out of the scope of this manual to train you in correctly identifying "
"and fixing problems in packages of the development branches, however, there "
@@ -94,12 +96,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/reporting-bugs.xml:28
+#: en/reporting-bugs.xml:26
msgid "Rebuild from scratch"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:29
+#: en/reporting-bugs.xml:27
msgid ""
"To ensure that a particular bug is not caused by an unclean built system, "
"please always rebuild the whole live system from scratch to see if the bug "
@@ -107,17 +109,17 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/reporting-bugs.xml:32
+#: en/reporting-bugs.xml:30
msgid "Use up-to-date packages"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:33
+#: en/reporting-bugs.xml:31
msgid "This means"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:34
+#: en/reporting-bugs.xml:32
msgid ""
"Using outdated packages can cause significant problems when trying to "
"reproduce (and ultimately fix) your problem. If a relevant package is not "
@@ -127,79 +129,79 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/reporting-bugs.xml:37
+#: en/reporting-bugs.xml:35
msgid "Collect information"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:38
+#: en/reporting-bugs.xml:36
msgid ""
"Please provide enough information with your report. At a minimum, it should "
-"contain the exact version of &live-helper; version where the bug is "
-"encountered, and steps to reproduce it. Please use common sense and include "
-"other relevant information if you think that it might help in solving the "
-"problem."
+"contain the exact version of <filename>live-helper</filename> version where "
+"the bug is encountered, and steps to reproduce it. Please use common sense "
+"and include other relevant information if you think that it might help in "
+"solving the problem."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:39
+#: en/reporting-bugs.xml:37
msgid ""
"To make the most out of your bug report, we require at least the following "
"information:"
msgstr ""
#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:42
+#: en/reporting-bugs.xml:40
msgid "Architecture of the host system"
msgstr ""
#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:45
-msgid "Version of &live-helper; on the host system"
+#: en/reporting-bugs.xml:43
+msgid "Version of <filename>live-helper</filename> on the host system"
msgstr ""
#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:48
-msgid "Version of &live-initramfs; on the live system"
+#: en/reporting-bugs.xml:46
+msgid "Version of <filename>live-initramfs</filename> on the live system"
msgstr ""
#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:51
+#: en/reporting-bugs.xml:49
msgid ""
"Version of <filename>debootstrap</filename> and/or <filename>cdebootstrap</"
"filename> on the host system"
msgstr ""
#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:54
+#: en/reporting-bugs.xml:52
msgid "Architecture of the live system"
msgstr ""
#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:57
+#: en/reporting-bugs.xml:55
msgid "Distribution of the live system"
msgstr ""
#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:60
+#: en/reporting-bugs.xml:58
msgid "Version of the kernel on the live system"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:63
+#: en/reporting-bugs.xml:61
msgid ""
"You can generate a log of the build process by using the <filename>tee</"
"filename> command:"
msgstr ""
#. type: Content of: <chapter><section><screen>
-#: en/reporting-bugs.xml:64
+#: en/reporting-bugs.xml:62
#, no-wrap
msgid " # lh_build 2>&1 | tee buildlog.txt "
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:65
+#: en/reporting-bugs.xml:63
msgid ""
"Additionally, to rule out other errors, it is always a good idea to tar up "
"your config directory and upload it somewhere (do *not* send it as an "
@@ -208,7 +210,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:66
+#: en/reporting-bugs.xml:64
msgid ""
"Remember to send in any logs that were produced with English locale "
"settings, e.g. run your live-helper commands with a leading <code>LC_ALL=C</"
@@ -216,24 +218,24 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/reporting-bugs.xml:69
+#: en/reporting-bugs.xml:67
msgid "Use the correct package to report the bug against"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:70
+#: en/reporting-bugs.xml:68
msgid "Where does the bug appear?"
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/reporting-bugs.xml:74
+#: en/reporting-bugs.xml:72
msgid "At build time whilst bootstrapping"
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para><para>
-#: en/reporting-bugs.xml:77
+#: en/reporting-bugs.xml:75
msgid ""
-"&live-helper; first bootstraps a basic Debian system with "
+"<filename>live-helper</filename> first bootstraps a basic Debian system with "
"<command>debootstrap</command> or <command>cdebootstrap</command>. Depending "
"on the bootstrapping tool used and the Debian distribution it is "
"bootstrapping, it may fail. If a bug appears here, check if the error is "
@@ -242,7 +244,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para><para>
-#: en/reporting-bugs.xml:78
+#: en/reporting-bugs.xml:76
msgid ""
"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
"which we can not fix this directly. Please report such a bug against "
@@ -251,21 +253,21 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/reporting-bugs.xml:83
+#: en/reporting-bugs.xml:81
msgid "At build time whilst installing packages"
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/reporting-bugs.xml:85
+#: en/reporting-bugs.xml:83
msgid ""
-"&live-helper; installs additional packages from the Debian archive and "
-"depending on the Debian distribution used and the daily archive state, it "
-"can fail. If a bug appears here, check if the error is also reproducible on "
-"a normal system."
+"<filename>live-helper</filename> installs additional packages from the "
+"Debian archive and depending on the Debian distribution used and the daily "
+"archive state, it can fail. If a bug appears here, check if the error is "
+"also reproducible on a normal system."
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/reporting-bugs.xml:86
+#: en/reporting-bugs.xml:84
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
"- please report it against the failing package. Running "
@@ -275,7 +277,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/reporting-bugs.xml:87
+#: en/reporting-bugs.xml:85
msgid ""
"Also, if you are using a local mirror and/or any of sort of proxy and you "
"are experiencing a problem, please always reproduce it first by "
@@ -283,12 +285,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/reporting-bugs.xml:91
+#: en/reporting-bugs.xml:89
msgid "At boot-time"
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/reporting-bugs.xml:93
+#: en/reporting-bugs.xml:91
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in <xref linkend=\"collect-information\"/>. "
@@ -299,29 +301,29 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/reporting-bugs.xml:97
+#: en/reporting-bugs.xml:95
msgid "At run-time"
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/reporting-bugs.xml:99
+#: en/reporting-bugs.xml:97
msgid ""
"If a package was successfully installed, but fails while actually running "
"the Live system, this is probably a bug in Debian Live. However,"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:72
+#: en/reporting-bugs.xml:70
msgid "<placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/reporting-bugs.xml:106
+#: en/reporting-bugs.xml:104
msgid "Do the research"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:107
+#: en/reporting-bugs.xml:105
msgid ""
"Before filing the bug, please search the web for the particular error "
"message or symptom you are getting. As it is highly unlikely that you are "
@@ -331,7 +333,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:108
+#: en/reporting-bugs.xml:106
msgid ""
"You should pay particular attention to the Debian Live mailing list, as well "
"as the homepage, as these are likely to contain the most up-to-date "
@@ -340,22 +342,22 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:109
+#: en/reporting-bugs.xml:107
msgid ""
"In addition, you should check the <ulink url=\"http://bugs.debian.org/cgi-"
-"bin/pkgreport.cgi?src=live-helper\">current bug list for &live-helper;</"
-"ulink> and the <ulink url=\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?"
-"src=live-initramfs\">current bug list for live-initramfs</ulink> to see "
-"whether something similar has been reported already."
+"bin/pkgreport.cgi?src=live-helper\">current bug list for <filename>live-"
+"helper</filename></ulink> and the <ulink url=\"http://bugs.debian.org/cgi-"
+"bin/pkgreport.cgi?src=live-initramfs\">current bug list for live-initramfs</"
+"ulink> to see whether something similar has been reported already."
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/reporting-bugs.xml:112
+#: en/reporting-bugs.xml:110
msgid "Where to report bugs"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:113
+#: en/reporting-bugs.xml:111
msgid ""
"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
"System (BTS). For information on how to use the system, please see <ulink "
@@ -365,7 +367,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:114
+#: en/reporting-bugs.xml:112
msgid ""
"In general, you should report build time errors against the <ulink url="
"\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper\">live-"
@@ -377,7 +379,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:115
+#: en/reporting-bugs.xml:113
msgid ""
"Please note that bugs found in distributions derived from Debian (such as "
"Ubuntu, Knoppix, Xandros, etc.) should <emphasis>not</emphasis> be reported "
diff --git a/manual/po/de/use-cases.xml.po b/manual/po/de/use-cases.xml.po
index 4d444b6..93ecb4e 100644
--- a/manual/po/de/use-cases.xml.po
+++ b/manual/po/de/use-cases.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+0300\n"
"PO-Revision-Date: 2010-06-06 17:46+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,106 +16,108 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/basics.xml:50 en/basics.xml:89 en/basics.xml:148 en/use-cases.xml:31
+#: en/basics.xml:48 en/basics.xml:87 en/basics.xml:146 en/use-cases.xml:29
#, no-wrap
msgid "# lh build"
msgstr ""
#. type: Content of: <chapter><title>
-#: en/use-cases.xml:6
+#: en/use-cases.xml:4
msgid "Use Cases"
msgstr ""
#. type: Content of: <chapter><para>
-#: en/use-cases.xml:7
+#: en/use-cases.xml:5
msgid "This chapter is for users to document their use cases with Debian Live."
msgstr ""
#. type: Content of: <chapter><sect1><title>
-#: en/use-cases.xml:9
+#: en/use-cases.xml:7
msgid "VNC Kiosk Client"
msgstr ""
#. type: Content of: <chapter><sect1><para>
-#: en/use-cases.xml:10
-msgid "Create an image with &live-helper; to boot directly to a VNC server."
+#: en/use-cases.xml:8
+msgid ""
+"Create an image with <filename>live-helper</filename> to boot directly to a "
+"VNC server."
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/use-cases.xml:13
+#: en/use-cases.xml:11
#, no-wrap
msgid "$ mkdir vncBuild"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/use-cases.xml:13
+#: en/use-cases.xml:11
msgid "Make a build directory: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/use-cases.xml:16
+#: en/use-cases.xml:14
#, no-wrap
msgid "$ cd vncBuild"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/use-cases.xml:16
+#: en/use-cases.xml:14
msgid "Move to the build directory: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/use-cases.xml:19
+#: en/use-cases.xml:17
#, no-wrap
msgid "$ lh config --packages \"gdm metacity xtightvncviewer\""
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/use-cases.xml:19
+#: en/use-cases.xml:17
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/use-cases.xml:22
+#: en/use-cases.xml:20
#, no-wrap
msgid "$ mkdir -p config/chroot_local-includes/etc/skel"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/use-cases.xml:22
+#: en/use-cases.xml:20
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/use-cases.xml:25
+#: en/use-cases.xml:23
#, no-wrap
msgid "$ touch config/chroot_local-includes/etc/skel/.xsession"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/use-cases.xml:25
+#: en/use-cases.xml:23
msgid ""
"Create the .xsession for the default user: <placeholder type=\"screen\" id="
"\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/use-cases.xml:28
+#: en/use-cases.xml:26
#, no-wrap
msgid " #!/bin/sh /usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT exit "
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/use-cases.xml:28
+#: en/use-cases.xml:26
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/use-cases.xml:31
+#: en/use-cases.xml:29
msgid "Build the image: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
diff --git a/manual/pot/about_manual.xml.pot b/manual/pot/about_manual.xml.pot
index ad6bf83..fc06211 100644
--- a/manual/pot/about_manual.xml.pot
+++ b/manual/pot/about_manual.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+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,12 +16,12 @@ msgstr ""
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <sect1><title>
-#: en/about_manual.xml:6
+#: en/about_manual.xml:4
msgid "About this manual"
msgstr ""
#. type: Content of: <sect1><para>
-#: en/about_manual.xml:7
+#: 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 +29,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><para>
-#: en/about_manual.xml:8
+#: 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 +40,17 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:10
+#: en/about_manual.xml:8
msgid "Terms"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:13
+#: en/about_manual.xml:11
msgid "Live system"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:15
+#: 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 +60,24 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:19
+#: en/about_manual.xml:17
msgid "Debian Live"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:21
+#: 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/about_manual.xml:25
+#: en/about_manual.xml:23
msgid "Debian Live system"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:27
+#: 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,118 +85,120 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:31
+#: en/about_manual.xml:29
msgid "Build system / host system"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:33
+#: 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:37 en/overview.xml:9
-msgid "&live-helper;"
+#: en/about_manual.xml:35 en/overview.xml:7
+msgid "<filename>live-helper</filename>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:39
+#: en/about_manual.xml:37
msgid "A collection of scripts used to build customised Debian Live systems."
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/about_manual.xml:43 en/installation.xml:71
-msgid "&live-initramfs;"
+#: en/about_manual.xml:41 en/installation.xml:69
+msgid "<filename>live-initramfs</filename>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:45
+#: en/about_manual.xml:43
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/about_manual.xml:50
+#: en/about_manual.xml:48
msgid "<filename>live-package</filename>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:53
-msgid "The former name of &live-helper;."
+#: en/about_manual.xml:51
+msgid "The former name of <filename>live-helper</filename>."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:57
+#: en/about_manual.xml:55
msgid "Debian Installer / (d-i)"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:59
+#: en/about_manual.xml:57
msgid "The official installation system for the Debian distribution."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:63 en/customization_bootup.xml:48
+#: en/about_manual.xml:61 en/customization_bootup.xml:46
msgid "Cheat codes"
msgstr ""
#. type: Content of: <chapter><para>
-#: en/about_manual.xml:65 en/customization_bootup.xml:8
-#: en/customization_bootup.xml:14 en/customization_bootup.xml:17
-#: en/customization_bootup.xml:25 en/customization_bootup.xml:37
-#: en/customization_bootup.xml:41 en/customization_bootup.xml:45
-#: en/customization_bootup.xml:49 en/customization_packages.xml:18
-#: en/customization_packages.xml:130 en/customization_packages.xml:138
-#: en/customization_packages.xml:160 en/customization_packages.xml:198
-#: en/customization_packages.xml:209 en/live-environment.xml:9
-#: en/resources.xml:9 en/success-stories.xml:8
+#: 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
msgid "FIXME"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:69
+#: en/about_manual.xml:67
msgid "chroot"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:71
+#: en/about_manual.xml:69
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:75
+#: en/about_manual.xml:73
msgid "binary image"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:77
+#: en/about_manual.xml:75
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:81
+#: en/about_manual.xml:79
msgid "Target distribution"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:83
+#: en/about_manual.xml:81
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:87
-msgid "&lenny;/&squeeze;/&sid; stable/testing/unstable"
+#: en/about_manual.xml:85
+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:89
+#: en/about_manual.xml:87
msgid ""
"The \"stable\" distribution contains the latest officially released "
"distribution of Debian. The \"testing\" distribution is the staging area for "
@@ -208,90 +210,91 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:90
+#: en/about_manual.xml:88
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/about_manual.xml:96
+#: en/about_manual.xml:94
msgid "Authors"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:97
+#: en/about_manual.xml:95
msgid "A list of authors (in alphabetical order):"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:100
+#: en/about_manual.xml:98
msgid "Ben Armstrong"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:103
+#: en/about_manual.xml:101
msgid "Brendan Sleight"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:106
+#: en/about_manual.xml:104
msgid "Chris Lamb"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:109
+#: en/about_manual.xml:107
msgid "Daniel Baumann"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:112
+#: en/about_manual.xml:110
msgid "Franklin Piat"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:115
+#: en/about_manual.xml:113
msgid "Jonas Stein"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:118
+#: en/about_manual.xml:116
msgid "Kai Hendry"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:121
+#: en/about_manual.xml:119
msgid "Marco Amadori"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:124
+#: en/about_manual.xml:122
msgid "Mathieu Geli"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:127
+#: en/about_manual.xml:125
msgid "Matthias Kirschner"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:130
+#: en/about_manual.xml:128
msgid "Richard Nelson"
msgstr ""
#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:133
+#: en/about_manual.xml:131
msgid "Trent W. Buck"
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:138
+#: en/about_manual.xml:136
msgid "Contributing to this document"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:139
+#: en/about_manual.xml:137
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -300,7 +303,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:140
+#: en/about_manual.xml:138
msgid ""
"When submitting a contribution please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted the "
@@ -309,42 +312,43 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:141
+#: en/about_manual.xml:139
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:143
+#: en/about_manual.xml:141
#, 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:143 en/about_manual.xml:147 en/about_manual.xml:151
-#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
-#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
-#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
-#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
-#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
-#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
-#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
-#: en/basics.xml:220 en/customization_packages.xml:25
-#: en/customization_packages.xml:29 en/customization_packages.xml:34
-#: en/customization_packages.xml:38 en/customization_packages.xml:48
-#: en/customization_packages.xml:102 en/customization_packages.xml:106
-#: en/customization_packages.xml:116 en/customization_packages.xml:132
-#: en/customization_packages.xml:140 en/customization_packages.xml:144
-#: en/customization_packages.xml:148 en/customization_packages.xml:152
-#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
-#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
-#: en/overview.xml:66 en/overview.xml:70
+#: 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
msgid "<placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:145
+#: en/about_manual.xml:143
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -352,31 +356,31 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para><screen>
-#: en/about_manual.xml:147
+#: en/about_manual.xml:145
#, 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:149
+#: en/about_manual.xml:147
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:151
+#: en/about_manual.xml:149
#, no-wrap
msgid "$ make build"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_manual.xml:154
+#: en/about_manual.xml:152
msgid "Applying patches"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_manual.xml:155
+#: en/about_manual.xml:153
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 "
@@ -384,40 +388,40 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:158
+#: en/about_manual.xml:156
msgid "Fetch the public commit key:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:160
+#: en/about_manual.xml:158
#, 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:164
+#: en/about_manual.xml:162
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:166
+#: en/about_manual.xml:164
#, 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:170
+#: en/about_manual.xml:168
msgid "Checkout a clone of the manual through ssh:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:172
+#: en/about_manual.xml:170
#, 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:176
+#: en/about_manual.xml:174
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 "
@@ -425,18 +429,18 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:178
+#: en/about_manual.xml:176
#, no-wrap
msgid "$ git commit -a"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:182
+#: en/about_manual.xml:180
msgid "Push the commit to the server:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:184
+#: en/about_manual.xml:182
#, no-wrap
msgid "$ git push"
msgstr ""
diff --git a/manual/pot/about_project.xml.pot b/manual/pot/about_project.xml.pot
index 64a46c3..8fb6615 100644
--- a/manual/pot/about_project.xml.pot
+++ b/manual/pot/about_project.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+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/about_project.xml:6
+#: en/about_project.xml:4
msgid "About the Debian Live Project"
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/about_project.xml:8
+#: en/about_project.xml:6
msgid "Motivation"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:10
+#: 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:11
+#: 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/about_project.xml:14
+#: 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:17
+#: 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:20
+#: en/about_project.xml:18
msgid "They support i386 only."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:23
+#: 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:26
+#: en/about_project.xml:24
msgid "They include unofficial packages."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:29
+#: 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:32
+#: 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:35
+#: 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:40
+#: en/about_project.xml:38
msgid "Why create our own live system?"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:41
+#: 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/about_project.xml:44
+#: 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:47
+#: 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:50
+#: 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:53
+#: 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:56
+#: 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:59
+#: 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:65
+#: en/about_project.xml:63
msgid "Philosophy"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:67
+#: en/about_project.xml:65
msgid "Only unchanged, official packages"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:68
+#: 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/about_project.xml:69
+#: 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:70
+#: 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/about_project.xml:73
+#: 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:74
+#: 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/about_project.xml:75
+#: 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:76
+#: 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/about_project.xml:77
+#: 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/about_project.xml:80
+#: en/about_project.xml:78
msgid "Live system to hard disk installer"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:81
+#: 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/about_project.xml:82
+#: 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/about_project.xml:86
+#: en/about_project.xml:84
msgid "Contact"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:89
+#: en/about_project.xml:87
msgid "Mailing list"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:91
+#: 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/about_project.xml:95
+#: en/about_project.xml:93
msgid "IRC"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:97
+#: 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/about_project.xml:101
+#: en/about_project.xml:99
msgid "BTS"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:103
+#: 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/about_project.xml:107
+#: en/about_project.xml:105
msgid "Wiki"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:109
+#: 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/pot/basics.xml.pot b/manual/pot/basics.xml.pot
index 792a7a2..65c93e0 100644
--- a/manual/pot/basics.xml.pot
+++ b/manual/pot/basics.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+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,46 +16,47 @@ msgstr ""
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
-#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
-#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
-#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
-#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
-#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
-#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
-#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
-#: en/basics.xml:220 en/customization_packages.xml:25
-#: en/customization_packages.xml:29 en/customization_packages.xml:34
-#: en/customization_packages.xml:38 en/customization_packages.xml:48
-#: en/customization_packages.xml:102 en/customization_packages.xml:106
-#: en/customization_packages.xml:116 en/customization_packages.xml:132
-#: en/customization_packages.xml:140 en/customization_packages.xml:144
-#: en/customization_packages.xml:148 en/customization_packages.xml:152
-#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
-#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
-#: en/overview.xml:66 en/overview.xml:70
+#: 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
msgid "<placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><title>
-#: en/basics.xml:6
+#: en/basics.xml:4
msgid "The basics"
msgstr ""
#. type: Content of: <chapter><para>
-#: en/basics.xml:7
+#: en/basics.xml:5
msgid ""
"This chapter contains a brief overview of the build process as well as "
"containing instructions on how to boot the various binary image types."
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/basics.xml:9
+#: en/basics.xml:7
msgid "What is a live system?"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:10
+#: en/basics.xml:8
msgid ""
"A live system usually means an OS booted on a computer from a removable "
"medium (such as CD-ROM, USB stick, or network), ready to use without any "
@@ -64,7 +65,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:11
+#: en/basics.xml:9
msgid ""
"With Debian Live, it's a Debian GNU/Linux OS, built for one of the supported "
"architectures (currently amd64, i386, powerpc and sparc). It is made from "
@@ -72,34 +73,34 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:14
+#: en/basics.xml:12
msgid "Linux kernel"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:16
+#: en/basics.xml:14
msgid "The Linux image, usually named <filename>vmlinuz*</filename>."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:20
+#: en/basics.xml:18
msgid "Initial RAM disk image (initrd)"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:22
+#: en/basics.xml:20
msgid ""
"RAM disk setup for the Linux boot, containing modules possibly needed to "
"mount the filesystem's image and some scripts to do it."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:26
+#: en/basics.xml:24
msgid "System image"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:28
+#: en/basics.xml:26
msgid ""
"The OS filesystem image. Debian Live uses SquashFS, a compressed filesystem, "
"to minimize its image size. Note that it's read-only. So, during boot the "
@@ -110,12 +111,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:32
+#: en/basics.xml:30
msgid "Bootloader"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:34
+#: en/basics.xml:32
msgid ""
"A small piece of code, crafted to boot up from the chosen media, possibly "
"presenting a prompt or menu to allow selection of options/configuration. It "
@@ -128,7 +129,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:38
+#: en/basics.xml:36
msgid ""
"The Debian Live tools will build the system image from your specifications, "
"setup a Linux kernel and its initrd, a bootloader to run them, all in one "
@@ -136,20 +137,20 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/basics.xml:41
+#: en/basics.xml:39
msgid "First steps: building an ISO image"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:42
+#: en/basics.xml:40
msgid ""
-"The following sequence of helper commands, provided by &live-helper;, will "
-"create a basic ISO image containing just the Debian standard system without "
-"X.org. It is suitable for burning to CD or DVD media."
+"The following sequence of helper commands, provided by <filename>live-"
+"helper</filename>, will create a basic ISO image containing just the Debian "
+"standard system without X.org. It is suitable for burning to CD or DVD media."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:43
+#: en/basics.xml:41
msgid ""
"First, we run the <filename>lh config</filename> helper command which will "
"create a <filename>\"config/\"</filename> hierarchy in the current directory "
@@ -157,13 +158,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:45
+#: en/basics.xml:43
#, no-wrap
msgid "$ lh config"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:47
+#: en/basics.xml:45
msgid ""
"By passing no parameters to <filename>lh config</filename> we indicated that "
"we wish to use the defaults. This will create an image of type binary (see "
@@ -171,125 +172,125 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:48
+#: en/basics.xml:46
msgid ""
"Now that we have a <filename>\"config/\"</filename> hierarchy, we may build "
"the image with the <filename>lh build</filename> helper command:"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/basics.xml:50 en/basics.xml:89 en/basics.xml:148 en/use-cases.xml:31
+#: en/basics.xml:48 en/basics.xml:87 en/basics.xml:146 en/use-cases.xml:29
#, no-wrap
msgid "# lh build"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:52
+#: en/basics.xml:50
msgid ""
"This process can take a while, depending on the speed of your network "
"connection (see <xref linkend=\"lh-build\"/>)."
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:54
+#: en/basics.xml:52
msgid "Testing an ISO image with Qemu"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:55
+#: en/basics.xml:53
msgid "Testing an ISO is simple:"
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:57
+#: en/basics.xml:55
#, no-wrap
msgid "# apt-get install qemu $ qemu -cdrom binary.iso"
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid "Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid "In order to test the ISO with virtualbox-ose:"
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:60
+#: en/basics.xml:58
#, no-wrap
msgid "# apt-get install virtualbox-ose"
msgstr ""
#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid ""
"the modules package for a stock kernel eg virtualbox-ose-"
"modules-2.6.26-1-486 or"
msgstr ""
#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid ""
"the modules package compiled for your kernel using module-assistant from the "
"package virtualbox-ose-source"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid "Run Virtualbox:"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid "{{{Applications -> System Tools -> VirtualBox OSE }}}"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid "Create a virtual machine from your Live ISO"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid ""
"To create a virtual machine \"mylive\" from A CDROM ISO \"binary.iso\" in "
"VirtualBox:"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid "{{{Machine -> New }}}"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:60
+#: en/basics.xml:58
msgid "In the Wizard: FIXME"
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:62
+#: en/basics.xml:60
msgid "Testing an ISO image with VMware Workstation"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:63
+#: en/basics.xml:61
msgid "In order to test the ISO with VMware Workstation:"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:64 en/basics.xml:111
+#: en/basics.xml:62 en/basics.xml:109
msgid "Run VMware Workstation:"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:65
+#: en/basics.xml:63
msgid "Click on Edit virtual machine settings in the VM summary page."
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:66
+#: en/basics.xml:64
msgid ""
"Then, click on the CD-ROM device and select Use ISO image. Remeber to "
"connect the CD-ROM device at power on and remeber to adjust the boot order "
@@ -297,28 +298,28 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:69
+#: en/basics.xml:67
msgid "Burning an ISO image to a physical medium"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:70
+#: en/basics.xml:68
msgid "Burning an ISO image is easy:"
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:72
+#: en/basics.xml:70
#, no-wrap
msgid "# apt-get install wodim $ wodim binary.iso"
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/basics.xml:77
+#: en/basics.xml:75
msgid "Building an USB/HDD image"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:78
+#: en/basics.xml:76
msgid ""
"The following sequence of helper commands will create a basic USB/HDD image "
"containing just the Debian standard system without X.org. It is suitable for "
@@ -327,7 +328,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:79
+#: en/basics.xml:77
msgid ""
"Note if you created an iso image with the previous example, you will need to "
"clean up your working directory with the <filename>lh clean</filename> "
@@ -335,13 +336,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:81 en/basics.xml:139
+#: en/basics.xml:79 en/basics.xml:137
#, no-wrap
msgid "$ lh clean --binary"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:83
+#: en/basics.xml:81
msgid ""
"Run the <filename>lh config</filename> helper command with the parameters to "
"configure the <filename>\"config/\"</filename> hierarchy to create a USB/HDD "
@@ -349,24 +350,24 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:85
+#: en/basics.xml:83
#, no-wrap
msgid "$ lh config -b usb-hdd"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:87 en/basics.xml:146
+#: en/basics.xml:85 en/basics.xml:144
msgid ""
"Now build the image with the <filename>lh build</filename> helper command:"
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:92
+#: en/basics.xml:90
msgid "Copying USB/HDD image to a USB stick"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:93
+#: en/basics.xml:91
msgid ""
"The generated binary image contains a <acronym>VFAT</acronym> partition and "
"the <command>syslinux</command> bootloader, ready to be directly written on "
@@ -375,13 +376,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:95
+#: en/basics.xml:93
#, no-wrap
msgid "$ dd if=binary.img of=${USBSTICK}"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:97
+#: en/basics.xml:95
msgid ""
"where <replaceable>${USBSTICK}</replaceable> is the device file of your key, "
"like <filename>/dev/sdb</filename> (not a partition like <filename>/dev/"
@@ -390,28 +391,28 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:103
+#: en/basics.xml:101
msgid "Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:105
+#: en/basics.xml:103
#, no-wrap
msgid "# apt-get install qemu $ qemu -hda binary.img"
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:109
+#: en/basics.xml:107
msgid "Testing an USB/HDD image with VMware Workstation"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:110
+#: en/basics.xml:108
msgid "In order to test the USB/HDD image with VMware Workstation:"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:112
+#: en/basics.xml:110
msgid ""
"Write the image to an usb stick. In VMware, click on Edit virtual machine "
"settings in VM summary page. Then, add a new physical harddisk device and "
@@ -419,12 +420,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:115
+#: en/basics.xml:113
msgid "Using the space left on a USB stick"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:116
+#: en/basics.xml:114
msgid ""
"If you want to use the remaining free space after you have installed the "
"<filename>binary.img</filename>, you can use a partitioning tool such as "
@@ -433,13 +434,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:118
+#: en/basics.xml:116
#, no-wrap
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:120
+#: en/basics.xml:118
msgid ""
"After the creation of the partition you have to create a filsystem on it. "
"One possible choice would be ext2 (ext3 isn't recommended because the "
@@ -447,36 +448,36 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:122
+#: en/basics.xml:120
#, no-wrap
msgid "# mkfs.ext2 ${USBSTICK}"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:124
+#: en/basics.xml:122
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:126
+#: en/basics.xml:124
#, no-wrap
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:131
+#: en/basics.xml:129
msgid ""
"FIXME: Describe installing Debian Live to a partition (e.g. /dev/sdc1) AND "
"using a bootloader to boot this."
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/basics.xml:135
+#: en/basics.xml:133
msgid "Building a netboot image"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:136
+#: en/basics.xml:134
msgid ""
"The following sequence of helper commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -484,14 +485,14 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:137
+#: en/basics.xml:135
msgid ""
"Note if you performed any previous examples, you will need to clean up your "
"working directory with the <filename>lh clean</filename> helper command:"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:141
+#: en/basics.xml:139
msgid ""
"Run the <filename>lh config</filename> helper command with the parameters to "
"configure the <filename>\"config/\"</filename> hierarchy to create our "
@@ -499,13 +500,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:143
+#: en/basics.xml:141
#, no-wrap
msgid "$ lh config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:145
+#: en/basics.xml:143
msgid ""
"In contrast with the ISO and USB hdd images, netbooting does not support "
"serving a filesystem image with the client so the files must be served via "
@@ -515,7 +516,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:150
+#: en/basics.xml:148
msgid ""
"In a network boot the client runs a small piece of software, which usually "
"resides on the <acronym>EEPROM</acronym> of the Ethernet card. This program "
@@ -528,7 +529,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:151
+#: en/basics.xml:149
msgid ""
"For example, if you unpack the generated <filename>binary-net.tar.gz</"
"filename> archive in the <filename>/srv/debian-live</filename> directory, "
@@ -538,17 +539,17 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:152
+#: en/basics.xml:150
msgid "We must now configure three services on the server to enable netboot:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:155
+#: en/basics.xml:153
msgid "DHCP server"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:157
+#: en/basics.xml:155
msgid ""
"We must configure our network's DHCP server to be sure to give an "
"<abbrev>IP</abbrev> address to the computer netbooting, and to advertise the "
@@ -556,7 +557,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:158
+#: en/basics.xml:156
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server (package "
"<literal>dhcp3-server</literal>) in the <filename>/etc/dhcp3/dhcpd.conf</"
@@ -564,23 +565,23 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:160
+#: en/basics.xml:158
#, no-wrap
msgid "# Options DHCP spécifiques à Pxelinux: option space pxelinux; option pxelinux.magic code 208 = string; option pxelinux.configfile code 209 = text; option pxelinux.pathprefix code 210 = text; option pxelinux.reboottime code 211 = unsigned integer 32; subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24 # IP addresses available for guests range 192.168.1.100 192.168.1.149; # allow booting from the net allow bootp; # for net booting, server where the first file to be loaded (by TFTP # protocol) (\"filename\" following definition) lies : so the TFTP # server's name. next-server myserver; # net boot configuration for guests with a PXE client : if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" { # Note : all files for PXE are relatives to the TFTP server's root # path, as usually defined in /etc/inetd.conf. # PXE boot loader (first program to be loaded, by TFTP) filename \"pxelinux.0\"; # describe some specific pxelinux's options through DHCP o
ptions : site-option-space \"pxelinux\"; option pxelinux.magic f1:00:74:7e; if exists dhcp-parameter-request-list { # Always send the PXELINUX options (specified in hexadecimal) option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3); } # For a PXE boot menu, different versions are available : simple # text, text with curses, graphic (VESA) #option pxelinux.configfile \"pxelinux/config_simple\"; #option pxelinux.configfile \"pxelinux/config_curses\"; option pxelinux.configfile \"pxelinux/config_vesa\"; # automatically reboot after 10 minutes of no activity option pxelinux.reboottime 600; } }"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:165
+#: en/basics.xml:163
msgid "TFTPd server"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:167
+#: en/basics.xml:165
msgid "This serves the kernel and initial ramdisk to the system at run-time."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:168
+#: en/basics.xml:166
msgid ""
"You should install the <command>tftpd-hpa</command> package. It can serve "
"all files contained inside a root directory, usually <filename>/var/lib/"
@@ -590,25 +591,25 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:170
+#: en/basics.xml:168
#, no-wrap
msgid "tftp dgram udp wait root /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:172
+#: en/basics.xml:170
msgid ""
"and reload the super server with <command>/etc/init.d/openbsd-inetd reload</"
"command>."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:176
+#: en/basics.xml:174
msgid "NFS server"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:178
+#: en/basics.xml:176
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -616,39 +617,39 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:179
+#: en/basics.xml:177
msgid ""
"You should install the <command>nfs-kernel-server</command> package -- "
"<command>nfs-user-server</command> does not function correctly with netboot."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:180
+#: en/basics.xml:178
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to <filename>/etc/exports</filename>:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:182
+#: en/basics.xml:180
#, no-wrap
msgid "/srv/debian-live *(ro,async,subtree_check,no_root_squash)"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:184
+#: en/basics.xml:182
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:186
+#: en/basics.xml:184
#, no-wrap
msgid "# exportfs -rv"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:191
+#: en/basics.xml:189
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -657,93 +658,93 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/basics.xml:194
+#: en/basics.xml:192
msgid "Netboot testing HowTo"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:195
+#: en/basics.xml:193
msgid ""
"Netboot image creation is made easy with live-helper magic, but testing the "
"images on physical machines can be really time consuming."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/basics.xml:196
+#: en/basics.xml:194
msgid ""
"To make our life easier, we can use virtualization. There are two solutions:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:199
+#: en/basics.xml:197
msgid "VMWare Player"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:201
+#: en/basics.xml:199
msgid "Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:202
+#: en/basics.xml:200
msgid ""
"Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:203
+#: en/basics.xml:201
msgid "Paste this text inside:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:205
+#: en/basics.xml:203
#, no-wrap
msgid "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = \"512\" MemAllowAutoScaleDown = \"FALSE\" ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = \"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\" ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\" displayName = \"Test Boot PXE\" guestOS = \"other\" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" ethernet0.generatedAddressOffset = \"0\""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:207
+#: en/basics.xml:205
msgid ""
"You can play with this configuration file (i.e. change memory limit to 256)"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:208
+#: en/basics.xml:206
msgid "Double click on this file (or run VMWare player and selecet this file)."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:209
+#: en/basics.xml:207
msgid "When running just press space if that strange question comes up..."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:215
+#: en/basics.xml:213
msgid "Qemu"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:217
+#: en/basics.xml:215
msgid "Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:218
+#: en/basics.xml:216
msgid "Edit <filename>/etc/qemu-ifup</filename>:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:220
+#: en/basics.xml:218
#, no-wrap
msgid "#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo \"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo \"Adding $1 to br0...\" sudo /usr/sbin/brctl addif br0 $1 sleep 2"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:222
+#: en/basics.xml:220
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:223
+#: en/basics.xml:221
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
diff --git a/manual/pot/coding-style.xml.pot b/manual/pot/coding-style.xml.pot
index 8776333..e5a5c4f 100644
--- a/manual/pot/coding-style.xml.pot
+++ b/manual/pot/coding-style.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+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,92 +16,92 @@ msgstr ""
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <chapter><title>
-#: en/coding-style.xml:6
+#: en/coding-style.xml:4
msgid "Coding Style"
msgstr ""
#. type: Content of: <chapter><para>
-#: en/coding-style.xml:7
+#: en/coding-style.xml:5
msgid ""
-"This chapter documents the coding style used in &live-helper; and (ideally) "
-"in &live-initramfs;."
+"This chapter documents the coding style used in <filename>live-helper</"
+"filename> and (ideally) in <filename>live-initramfs</filename>."
msgstr ""
#. type: Content of: <chapter><sect1><title>
-#: en/coding-style.xml:9
+#: en/coding-style.xml:7
msgid "Compatibility"
msgstr ""
#. type: Content of: <chapter><sect1><title>
-#: en/coding-style.xml:17
+#: en/coding-style.xml:15
msgid "Indenting"
msgstr ""
#. type: Content of: <chapter><sect1><title>
-#: en/coding-style.xml:23
+#: en/coding-style.xml:21
msgid "Wrapping"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/coding-style.xml:26
+#: en/coding-style.xml:24
#, no-wrap
msgid " if foo; then bar fi "
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/coding-style.xml:26 en/coding-style.xml:27 en/coding-style.xml:39
-#: en/coding-style.xml:40
+#: en/coding-style.xml:24 en/coding-style.xml:25 en/coding-style.xml:37
+#: en/coding-style.xml:38
msgid "Bad: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/coding-style.xml:26
+#: en/coding-style.xml:24
#, no-wrap
msgid " if foo then bar fi "
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/coding-style.xml:26 en/coding-style.xml:27 en/coding-style.xml:39
-#: en/coding-style.xml:40
+#: en/coding-style.xml:24 en/coding-style.xml:25 en/coding-style.xml:37
+#: en/coding-style.xml:38
msgid "Good: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/coding-style.xml:27
+#: en/coding-style.xml:25
#, no-wrap
msgid " foo () { bar } "
msgstr ""
#. type: Content of: <chapter><sect1><title>
-#: en/coding-style.xml:31
+#: en/coding-style.xml:29
msgid "Variables"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/coding-style.xml:39
+#: en/coding-style.xml:37
#, no-wrap
msgid " FOO=bar "
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/coding-style.xml:39
+#: en/coding-style.xml:37
#, no-wrap
msgid " FOO=\"bar\" "
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/coding-style.xml:40
+#: en/coding-style.xml:38
#, no-wrap
msgid " if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ] then foobar fi "
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/coding-style.xml:40
+#: en/coding-style.xml:38
#, no-wrap
msgid " if [ -f \"${FOO}/foo/${BAR}/bar\" ] then foobar fi "
msgstr ""
#. type: Content of: <chapter><sect1><title>
-#: en/coding-style.xml:44
+#: en/coding-style.xml:42
msgid "Miscellaneous"
msgstr ""
diff --git a/manual/pot/common-tasks.xml.pot b/manual/pot/common-tasks.xml.pot
index 0bad204..3d3bcaa 100644
--- a/manual/pot/common-tasks.xml.pot
+++ b/manual/pot/common-tasks.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+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,17 +16,17 @@ msgstr ""
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <chapter><title>
-#: en/common-tasks.xml:6
+#: en/common-tasks.xml:4
msgid "Common tasks"
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/common-tasks.xml:8
+#: en/common-tasks.xml:6
msgid "The Debian Installer"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/common-tasks.xml:9
+#: en/common-tasks.xml:7
msgid ""
"Although Debian Live is mostly concerned with avoiding permanent "
"installation, integrating some form of installer to your image is possible. "
@@ -35,12 +35,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><note><title>
-#: en/common-tasks.xml:11
+#: en/common-tasks.xml:9
msgid "The \"Debian Installer\""
msgstr ""
#. type: Content of: <chapter><section><note><para>
-#: en/common-tasks.xml:12
+#: en/common-tasks.xml:10
msgid ""
"Please note the careful use of capital letters when referring to the "
"\"Debian Installer\" in this section - when used like this we refer "
@@ -49,17 +49,17 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/common-tasks.xml:14
+#: en/common-tasks.xml:12
msgid "The three main types of installer are:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/common-tasks.xml:17
+#: en/common-tasks.xml:15
msgid "\"Normal\" Debian Installer"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:19
+#: en/common-tasks.xml:17
msgid ""
"This is a normal Debian Live image with a seperate kernel and initrd which "
"(when selected from the appropriate bootloader) launches into a standard "
@@ -68,7 +68,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:20
+#: en/common-tasks.xml:18
msgid ""
"This means that Debian is installed by fetching and installing <command>."
"deb</command> packages using <filename>debootstrap</filename> or "
@@ -78,20 +78,20 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:21
+#: en/common-tasks.xml:19
msgid ""
"This whole process can be preseeded and customised in a number of ways; see "
"the relevant \"DebianInstaller\" wiki page and installation guide for more. "
-"This is operational now withing &live-helper;."
+"This is operational now withing <filename>live-helper</filename>."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/common-tasks.xml:25
+#: en/common-tasks.xml:23
msgid "\"Live\" Debian Installer"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:27
+#: en/common-tasks.xml:25
msgid ""
"This is a Debian Live image with a seperate kernel and initrd which (when "
"selected from the appropriate bootloader) launches into an instance of the "
@@ -99,7 +99,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:28
+#: en/common-tasks.xml:26
msgid ""
"Installation will proceed in an identical fashion to the \"Normal\" "
"installation described above, but at the actual package installation stage, "
@@ -110,17 +110,17 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:29
+#: en/common-tasks.xml:27
msgid "This is working now."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/common-tasks.xml:33
+#: en/common-tasks.xml:31
msgid "\"Ubuntu\"-style installer"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:35
+#: en/common-tasks.xml:33
msgid ""
"This is where you boot into a graphical Debian Live system and run a wizard-"
"based program which installs and configures the live system, all the time "
@@ -128,18 +128,18 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/common-tasks.xml:36
+#: en/common-tasks.xml:34
msgid "This is currently NOT possible with Debian Live."
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/common-tasks.xml:40
+#: en/common-tasks.xml:38
#, no-wrap
msgid " $ lh_config --help ... [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled] [--debian-installer-distribution CODENAME|daily] [--debian-installer-preseedfile FILE|URL] ... "
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/common-tasks.xml:40
+#: en/common-tasks.xml:38
msgid ""
"By default, no installer will be included in the Debian Live image. You can "
"enable it by using <filename>lh_config</filename> : <placeholder type="
@@ -147,29 +147,29 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/common-tasks.xml:41
+#: en/common-tasks.xml:39
msgid "The values \"Normal\", \"Live\" and \"Ubuntu\" are not valid values for"
msgstr ""
#. type: Content of: <chapter><section><para><term>
-#: en/common-tasks.xml:41
+#: en/common-tasks.xml:39
msgid "LH_BINARY_DEBIAN_INSTALLER"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/common-tasks.xml:41
+#: en/common-tasks.xml:39
msgid ""
". Refer to the output of <filename>lh_config</filename> cited above to "
"choose the appropriate values."
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/common-tasks.xml:44
+#: en/common-tasks.xml:42
msgid "WiFi Connection"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/common-tasks.xml:45
+#: en/common-tasks.xml:43
msgid ""
"Depending on the Debian Live image you are using and the given tools "
"configured with your Debian Live image you may need to only attach to an "
diff --git a/manual/pot/customization_binary.xml.pot b/manual/pot/customization_binary.xml.pot
index c04fec3..132a739 100644
--- a/manual/pot/customization_binary.xml.pot
+++ b/manual/pot/customization_binary.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+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/customization_binary.xml:7
+#: en/customization_binary.xml:4
msgid "Customising the binary image"
msgstr ""
#. type: Content of: <sect1><para>
-#: en/customization_binary.xml:9
+#: en/customization_binary.xml:5
msgid "This chapter discusses FIXME"
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_binary.xml:12
+#: en/customization_binary.xml:7
msgid "ISO metadata"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_binary.xml:14
+#: en/customization_binary.xml:8
msgid ""
"When creating an ISO9660 binary image, you can use the following options to "
"add various textual metadata for your image. This can help you easily "
@@ -39,58 +39,58 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_binary.xml:19
+#: en/customization_binary.xml:11
msgid ""
"<command>LH_ISO_APPLICATION</command> / <command>--iso-application "
"<replaceable>NAME</replaceable></command>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_binary.xml:22
+#: en/customization_binary.xml:13
msgid ""
"This should describe the application that will be on the image. The maximum "
"length for this field is 128 characters."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_binary.xml:27
+#: en/customization_binary.xml:17
msgid ""
"<command>LH_ISO_PREPARER</command> / <command>--iso-preparer "
"<replaceable>NAME</replaceable></command>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_binary.xml:30
+#: en/customization_binary.xml:19
msgid ""
"This should describe the preparer of the image, usually with some contact "
-"details. The default for this option is the &live-helper; version you are "
-"using, which may help with debugging later. The maximum length for this "
-"field is 128 characters."
+"details. The default for this option is the <filename>live-helper</filename> "
+"version you are using, which may help with debugging later. The maximum "
+"length for this field is 128 characters."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_binary.xml:35
+#: en/customization_binary.xml:23
msgid ""
"<command>LH_ISO_PUBLISHER</command> / <command>--iso-publisher "
"<replaceable>NAME</replaceable></command>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_binary.xml:38
+#: en/customization_binary.xml:25
msgid ""
"This should describe the publisher of the image, usually with some contact "
"details. The maximum length for this field is 128 characters."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_binary.xml:43
+#: en/customization_binary.xml:29
msgid ""
"<command>LH_ISO_VOLUME</command> / <command>--iso-volume <replaceable>NAME</"
"replaceable></command>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_binary.xml:46
+#: en/customization_binary.xml:31
msgid ""
"This should specify the volume ID of the image. This is used as a user-"
"visible label on some platforms such as Windows and Apple Mac OS. The "
diff --git a/manual/pot/customization_contents.xml.pot b/manual/pot/customization_contents.xml.pot
index def955b..57bac6a 100644
--- a/manual/pot/customization_contents.xml.pot
+++ b/manual/pot/customization_contents.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+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,58 +16,59 @@ msgstr ""
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <sect1><title>
-#: en/customization_contents.xml:6
+#: en/customization_contents.xml:4
msgid "Customising contents"
msgstr ""
#. type: Content of: <sect1><para>
-#: en/customization_contents.xml:7
+#: en/customization_contents.xml:5
msgid "This chapter discusses further customisation of the live system."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:9
+#: en/customization_contents.xml:7
msgid "Includes"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:10
+#: en/customization_contents.xml:8
msgid ""
"Using includes, it is possible to add (or replace) arbitrary files in your "
-"Debian Live image. &live-helper; provides three mechanisms for using them:"
+"Debian Live image. <filename>live-helper</filename> provides three "
+"mechanisms for using them:"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_contents.xml:13
+#: en/customization_contents.xml:11
msgid "Chroot local includes"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_contents.xml:15
+#: en/customization_contents.xml:13
msgid ""
"These allow you to add or replace files to the chroot/Live filesystem. "
"Please see <xref linkend=\"chroot-local-includes\"/> for more information."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:19 en/customization_contents.xml:42
+#: en/customization_contents.xml:17 en/customization_contents.xml:40
msgid "Binary local includes"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_contents.xml:21
+#: en/customization_contents.xml:19
msgid ""
"These allow you to add or replace files in the binary image. Please see "
"<xref linkend=\"binary-local-includes\"/> for more information."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:25 en/customization_contents.xml:46
+#: en/customization_contents.xml:23 en/customization_contents.xml:44
msgid "Binary includes"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_contents.xml:27
+#: en/customization_contents.xml:25
msgid ""
"These allow you to add or replace Debian specific files in the binary image, "
"such as the templates and tools directories. Please see <xref linkend="
@@ -75,19 +76,19 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:31
+#: en/customization_contents.xml:29
msgid ""
"Please see <xref linkend=\"terms\"/> for more information about the "
"distinction between the \"Live\" and \"binary\" images."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:33
+#: en/customization_contents.xml:31
msgid "Live/chroot local includes"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:34
+#: en/customization_contents.xml:32
msgid ""
"Chroot local includes can be used to add or replace files in the chroot/Live "
"filesystem so that they are visible when the Live system is booted. Typical "
@@ -98,7 +99,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:35
+#: en/customization_contents.xml:33
msgid ""
"To include files, simply add them to your <filename class=\"directory"
"\">config/chroot_local-includes</filename> directory. This directory "
@@ -108,82 +109,83 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><screen>
-#: en/customization_contents.xml:36
+#: en/customization_contents.xml:34
#, no-wrap
msgid " $ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html config/chroot_local-includes/var/www "
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:37
+#: en/customization_contents.xml:35
msgid "Your configuration will then have the following layout:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><screen>
-#: en/customization_contents.xml:38
+#: en/customization_contents.xml:36
#, no-wrap
msgid " -- config [...] |-- chroot_local-includes | `-- var | `-- www | `-- index.html [...] `-- templates "
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:39
+#: en/customization_contents.xml:37
msgid ""
"Chroot local includes are installed after package installation so that files "
"installed by packages are overwritten."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:43 en/customization_contents.xml:47
-#: en/customization_contents.xml:52 en/customization_contents.xml:56
-#: en/customization_contents.xml:60
+#: en/customization_contents.xml:41 en/customization_contents.xml:45
+#: en/customization_contents.xml:50 en/customization_contents.xml:54
+#: en/customization_contents.xml:58
msgid "FIXME."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:51
+#: en/customization_contents.xml:49
msgid "Hooks"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:53
+#: en/customization_contents.xml:51
msgid "Enabling hooks"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:55
+#: en/customization_contents.xml:53
msgid "Live/chroot local hooks"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:59
+#: en/customization_contents.xml:57
msgid "Binary local hooks"
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:64
+#: en/customization_contents.xml:62
msgid "Preseeding Debconf questions"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:65
+#: en/customization_contents.xml:63
msgid ""
"Files in the <filename class=\"directory\">config/chroot_local-preseed</"
"filename> directory are considered to be debconf preseed files and are "
-"installed by &live-helper; using <filename>debconf-set-selections</filename>."
+"installed by <filename>live-helper</filename> using <filename>debconf-set-"
+"selections</filename>."
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:66
+#: en/customization_contents.xml:64
msgid ""
"For more information about debconf, please see debconf(7) in the "
"<command>debconf</command> package."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:69
+#: en/customization_contents.xml:67
msgid "Symlink conversion"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:70
+#: en/customization_contents.xml:68
msgid "FIXME. (This is probably in the wrong section)"
msgstr ""
diff --git a/manual/pot/customization_packages.xml.pot b/manual/pot/customization_packages.xml.pot
index dcba5fb..b8a2577 100644
--- a/manual/pot/customization_packages.xml.pot
+++ b/manual/pot/customization_packages.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+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,131 +16,132 @@ msgstr ""
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <chapter><para>
-#: en/about_manual.xml:65 en/customization_bootup.xml:8
-#: en/customization_bootup.xml:14 en/customization_bootup.xml:17
-#: en/customization_bootup.xml:25 en/customization_bootup.xml:37
-#: en/customization_bootup.xml:41 en/customization_bootup.xml:45
-#: en/customization_bootup.xml:49 en/customization_packages.xml:18
-#: en/customization_packages.xml:130 en/customization_packages.xml:138
-#: en/customization_packages.xml:160 en/customization_packages.xml:198
-#: en/customization_packages.xml:209 en/live-environment.xml:9
-#: en/resources.xml:9 en/success-stories.xml:8
+#: 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
msgid "FIXME"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
-#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
-#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
-#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
-#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
-#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
-#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
-#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
-#: en/basics.xml:220 en/customization_packages.xml:25
-#: en/customization_packages.xml:29 en/customization_packages.xml:34
-#: en/customization_packages.xml:38 en/customization_packages.xml:48
-#: en/customization_packages.xml:102 en/customization_packages.xml:106
-#: en/customization_packages.xml:116 en/customization_packages.xml:132
-#: en/customization_packages.xml:140 en/customization_packages.xml:144
-#: en/customization_packages.xml:148 en/customization_packages.xml:152
-#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
-#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
-#: en/overview.xml:66 en/overview.xml:70
+#: 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
msgid "<placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <sect1><title>
-#: en/customization_packages.xml:6
+#: en/customization_packages.xml:4
msgid "Customising package installation"
msgstr ""
#. type: Content of: <sect1><para>
-#: en/customization_packages.xml:7
+#: en/customization_packages.xml:5
msgid ""
"This chapter discusses the customisation of package installation. This "
"involves:"
msgstr ""
#. type: Content of: <sect1><orderedlist><listitem><para>
-#: en/customization_packages.xml:10
+#: en/customization_packages.xml:8
msgid "Selecting additional packages to be installed"
msgstr ""
#. type: Content of: <sect1><orderedlist><listitem><para>
-#: en/customization_packages.xml:13
+#: en/customization_packages.xml:11
msgid "Installing modified packages"
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:17
+#: en/customization_packages.xml:15
msgid "Package sources"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:21
+#: en/customization_packages.xml:19
msgid "Debian repositories"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:23
+#: en/customization_packages.xml:21
msgid "To set a local mirror (used to ''build'' the live-cd)"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:25
+#: en/customization_packages.xml:23
#, no-wrap
msgid "$ lh config --mirror-bootstrap \"http://local.intra.net/debian/\" --mirror-chroot \"http://local.intra.net/debian/\""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:27
+#: en/customization_packages.xml:25
msgid "The generic mirror is added to the live-system's /etc/apt/sources.list."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:29
+#: en/customization_packages.xml:27
#, no-wrap
msgid "$ lh config --mirror-binary \"http://ftp.debian.org/debian/\""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:31
+#: en/customization_packages.xml:29
msgid ""
"Note: It is ''not'' used for building the live-cd but to install new "
"software while using the live-cd."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:32
+#: en/customization_packages.xml:30
msgid "It can be disabled by setting binary indices parameter to disabled"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:34
+#: en/customization_packages.xml:32
#, no-wrap
msgid "$ lh config --binary-indices disabled"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:36
+#: en/customization_packages.xml:34
msgid ""
"Note: the same applies for mirror chroot security and mirror binary security"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:38
+#: en/customization_packages.xml:36
#, no-wrap
msgid "$ lh config --mirror-chroot-security {URL} $ lh config --mirror-binary-security {URL}"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:43
+#: en/customization_packages.xml:41
msgid "Own repository"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:45
+#: en/customization_packages.xml:43
msgid ""
"To add more repositories (e.g. backports, experimental packages, etc.), "
"create <filename>config/chroot_sources/your-cdd-repo.{chroot,binary}</"
@@ -148,7 +149,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:46
+#: en/customization_packages.xml:44
msgid ""
"e.g. <filename>config/chroot_sources/live.chroot</filename> allows you to "
"install packages from the debian live snapshot repository at live-cd build "
@@ -156,13 +157,13 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:48
+#: en/customization_packages.xml:46
#, no-wrap
msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:50
+#: en/customization_packages.xml:48
msgid ""
"If you add the line to <filename>config/chroot_sources/live.binary</"
"filename> the repository will be added to your live-system's <filename>/etc/"
@@ -170,24 +171,24 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:51
+#: en/customization_packages.xml:49
msgid "If such files exist, they will be picked up automatically."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:52
+#: en/customization_packages.xml:50
msgid ""
"You can also put the gpg-key used to sign the repository into config/"
"chroot_sources/foo.{binary,chroot}.gpg"
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:58
+#: en/customization_packages.xml:56
msgid "Package installation"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:59
+#: en/customization_packages.xml:57
msgid ""
"You can elect to use either <command>apt</command> or <command>aptitude</"
"command> when installing packages. Which utility is used is governed by the "
@@ -196,105 +197,105 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:63
+#: en/customization_packages.xml:61
msgid "<command>apt</command>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:66
+#: en/customization_packages.xml:64
msgid ""
"Specifying a missing package causes package installation to fail, which may "
"not be the desired behaviour."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:67
+#: en/customization_packages.xml:65
msgid "This is the default setting for building images for Lenny or later."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:72
+#: en/customization_packages.xml:70
msgid "<command>aptitude</command>"
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:75
+#: en/customization_packages.xml:73
msgid ""
"Specifying a missing package causes package installation to succeed, which "
"may not be the desired behaviour."
msgstr ""
#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:76
+#: en/customization_packages.xml:74
msgid "This is the default setting for building images for Etch."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:82
+#: en/customization_packages.xml:80
msgid "Installing additional packages"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:83
+#: en/customization_packages.xml:81
msgid ""
-"&live-helper; has a number of mechanisms for indicating that additional "
-"packages should be installed, including:"
+"<filename>live-helper</filename> has a number of mechanisms for indicating "
+"that additional packages should be installed, including:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:86 en/customization_packages.xml:99
+#: en/customization_packages.xml:84 en/customization_packages.xml:97
msgid "The <command>LH_PACKAGES</command> variable"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:89 en/customization_packages.xml:112
+#: en/customization_packages.xml:87 en/customization_packages.xml:110
msgid "Package lists"
msgstr ""
#. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/customization_packages.xml:92
+#: en/customization_packages.xml:90
msgid "Local packages (<filename>chroot_local-packages/</filename>)"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:95 en/customization_packages.xml:159
+#: en/customization_packages.xml:93 en/customization_packages.xml:157
msgid "Tasks"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:100
+#: en/customization_packages.xml:98
msgid ""
"To install additional packages, simply add them to the <command>LH_PACKAGES</"
"command> variable in <filename>config/chroot</filename>. For example:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_packages.xml:102
+#: en/customization_packages.xml:100
#, no-wrap
msgid "LH_PACKAGES=\"package1 package2 package3 ... \""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:104
+#: en/customization_packages.xml:102
msgid "You can also specify initial values on the command line:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_packages.xml:106
+#: en/customization_packages.xml:104
#, no-wrap
msgid "$ lh config --packages \"package1 package2 package3\""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:108
+#: en/customization_packages.xml:106
msgid ""
-"The behaviour of &live-helper; when specifying a package that does not exist "
-"is determined by your choice of APT utility. See <xref linkend=\"package-"
-"installation\"/> for more details."
+"The behaviour of <filename>live-helper</filename> when specifying a package "
+"that does not exist is determined by your choice of APT utility. See <xref "
+"linkend=\"package-installation\"/> for more details."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:109
+#: en/customization_packages.xml:107
msgid ""
"If you need to specify a large number of packages to be installed or you "
"need flexibility regarding which packages to install, you should probably be "
@@ -303,16 +304,16 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:113
+#: en/customization_packages.xml:111
msgid ""
"Package lists are a powerful way of expressing which packages should be "
-"installed. &live-helper; ships with a number of predefined package lists "
-"which provide sensible default package selections for the GNOME and KDE "
-"desktop environments, as well as standard systems."
+"installed. <filename>live-helper</filename> ships with a number of "
+"predefined package lists which provide sensible default package selections "
+"for the GNOME and KDE desktop environments, as well as standard systems."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:114
+#: en/customization_packages.xml:112
msgid ""
"To specify a package list, add the name of the list to the "
"<command>LH_PACKAGES_LISTS</command> variable in <filename>config/chroot</"
@@ -320,44 +321,45 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_packages.xml:116
+#: en/customization_packages.xml:114
#, no-wrap
msgid "LH_PACKAGES_LISTS=\"gnome\""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:118
+#: en/customization_packages.xml:116
msgid ""
-"Package lists that are distributed with &live-helper; reside in the "
-"<command>/usr/share/live-helper/lists</command> directory."
+"Package lists that are distributed with <filename>live-helper</filename> "
+"reside in the <command>/usr/share/live-helper/lists</command> directory."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/customization_packages.xml:120
+#: en/customization_packages.xml:118
msgid "Local packages lists"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:121
+#: en/customization_packages.xml:119
msgid ""
"You may supplement the supplied lists using local package lists stored in "
"<command>config/chroot_local-packageslists</command>."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:122
+#: en/customization_packages.xml:120
msgid ""
"Package lists that exist in this directory always override package lists "
-"distributed with &live-helper;. This can cause undesired effects when."
+"distributed with <filename>live-helper</filename>. This can cause undesired "
+"effects when."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><note><title>
-#: en/customization_packages.xml:124
-msgid "&live-helper; 2.x change"
+#: en/customization_packages.xml:122
+msgid "<filename>live-helper</filename> 2.x change"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><note><para>
-#: en/customization_packages.xml:125
+#: en/customization_packages.xml:123
msgid ""
"Any file with <command>.list</command> suffix in <command>config/"
"chroot_local-packageslists</command> is automatically enabled, the variable "
@@ -366,91 +368,91 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/customization_packages.xml:129
+#: en/customization_packages.xml:127
msgid "Extending a provided package list using includes"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:132
+#: en/customization_packages.xml:130
#, no-wrap
msgid "#include <gnome> iceweasel"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:134
+#: en/customization_packages.xml:132
msgid ""
-"The package lists that are included with &live-helper; make extensive use of "
-"includes. They are available to view in the <command>/usr/share/live-helper/"
-"lists</command> directory."
+"The package lists that are included with <filename>live-helper</filename> "
+"make extensive use of includes. They are available to view in the <command>/"
+"usr/share/live-helper/lists</command> directory."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/customization_packages.xml:137
+#: en/customization_packages.xml:135
msgid "Using conditionals inside packages lists"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:140
+#: en/customization_packages.xml:138
#, no-wrap
msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:142
+#: en/customization_packages.xml:140
msgid ""
"or if <command>LH_ARCHITECTURE</command> is set to <command>i386</command> "
"or <command>amd64</command>:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:144
+#: en/customization_packages.xml:142
#, no-wrap
msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:146
+#: en/customization_packages.xml:144
msgid ""
"or if <command>LH_SECTIONS</command> contains either <command>contrib</"
"command> or <command>non-free</command>:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:148
+#: en/customization_packages.xml:146
#, no-wrap
msgid "#if SECTIONS contrib non-free vrms #endif"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:150
+#: en/customization_packages.xml:148
msgid "A conditional may surround an <command>#include</command> directive:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:152
+#: en/customization_packages.xml:150
#, no-wrap
msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:154
+#: en/customization_packages.xml:152
msgid ""
-"Any &live-helper; configuration variable that begins with <command>LH_</"
-"command> can be tested in this way."
+"Any <filename>live-helper</filename> configuration variable that begins with "
+"<command>LH_</command> can be tested in this way."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:155
+#: en/customization_packages.xml:153
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:164
+#: en/customization_packages.xml:162
msgid "Installing modified or third-party packages"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:165
+#: en/customization_packages.xml:163
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -461,7 +463,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:166
+#: en/customization_packages.xml:164
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's <ulink url=\"http://www.joachim-"
@@ -472,22 +474,22 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:167
+#: en/customization_packages.xml:165
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/customization_packages.xml:171
+#: en/customization_packages.xml:169
msgid "<filename>chroot_local-packages</filename>"
msgstr ""
#. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/customization_packages.xml:175
+#: en/customization_packages.xml:173
msgid "Using a custom APT repository"
msgstr ""
#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:178
+#: en/customization_packages.xml:176
msgid ""
"The <filename>chroot_local-packages</filename> is simpler to achieve and "
"useful for \"one-off\" customisations but has a number of drawbacks, whilst "
@@ -495,13 +497,13 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:180
+#: en/customization_packages.xml:178
msgid ""
"Using <filename>chroot_local-packages</filename> to install custom packages"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:181
+#: en/customization_packages.xml:179
msgid ""
"To install a custom package, simply copy it to the <command>config/"
"chroot_local-packages</command> directory. Packages that are inside this "
@@ -510,45 +512,45 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:182
+#: en/customization_packages.xml:180
msgid ""
"Packages <emphasis>must</emphasis> be named in the prescribed way. One "
"simple way to do this is to use <command>dpkg-name</command>. FIXME"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:183
+#: en/customization_packages.xml:181
msgid ""
"Using <filename>chroot_local-packages</filename> for installation of custom "
"packages has disadvantages:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/customization_packages.xml:186
+#: en/customization_packages.xml:184
msgid "It is not possible to use secure APT"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/customization_packages.xml:189
+#: en/customization_packages.xml:187
msgid ""
"You must install all appropriate packages in the <command>config/"
"chroot_local-packages</command> directory"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/customization_packages.xml:192
+#: en/customization_packages.xml:190
msgid ""
"It does not lend itself to storing Debian Live configurations in revision "
"control"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:197
+#: en/customization_packages.xml:195
msgid "Using an APT repository to install custom packages"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:199
+#: en/customization_packages.xml:197
msgid ""
"Unlike using <filename>chroot_local-packages</filename>, when using a custom "
"APT repository you must ensure that you specify the packages elsewhere. See "
@@ -556,7 +558,7 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:200
+#: en/customization_packages.xml:198
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -564,22 +566,22 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:203
+#: en/customization_packages.xml:201
msgid "Custom packages and APT"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:204
+#: en/customization_packages.xml:202
msgid ""
-"&live-helper; 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."
+"<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."
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:205
+#: en/customization_packages.xml:203
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' <command>debian/changelog</command> files to ensure that your "
@@ -589,12 +591,12 @@ msgid ""
msgstr ""
#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:208
+#: en/customization_packages.xml:206
msgid "Altering APT preferences during Live system"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:210
+#: en/customization_packages.xml:208
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
diff --git a/manual/pot/index.xml.pot b/manual/pot/index.xml.pot
index 4636c14..30147d4 100644
--- a/manual/pot/index.xml.pot
+++ b/manual/pot/index.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-12 14:29+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+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,46 +16,46 @@ msgstr ""
"Content-Transfer-Encoding: ENCODING"
#. type: Content of the pubdate entity
-#: en/index.xml:4
-msgid "2010-06-12"
+#: en/index.xml:3
+msgid "2010-06-18"
msgstr ""
#. type: Content of the version entity
-#: en/index.xml:5
+#: en/index.xml:4
msgid "2.0~a1"
msgstr ""
#. type: Attribute 'lang' of: <book>
-#: en/index.xml:7
+#: en/index.xml:6
msgid "en"
msgstr ""
#. type: Content of: <book><title>
-#: en/index.xml:8
+#: en/index.xml:7
msgid "Debian Live Manual"
msgstr ""
#. type: Content of: <book><bookinfo>
-#: en/index.xml:10
+#: en/index.xml:9
msgid ""
"<author> <othername>Debian Live Project</othername> <email>debian-live at lists."
"debian.org</email> </author>"
msgstr ""
#. type: Content of: <book><bookinfo><releaseinfo>
-#: en/index.xml:14
+#: en/index.xml:13
msgid "&version;"
msgstr ""
#. type: Content of: <book><bookinfo>
-#: en/index.xml:15
+#: en/index.xml:14
msgid ""
"<pubdate>&pubdate;</pubdate> <copyright> <year>2006-2010</year> "
"<holder>Debian Live Project</holder> </copyright>"
msgstr ""
#. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:21
+#: en/index.xml:20
msgid ""
"This program is free software: you can redistribute it and/or modify it "
"under the terms of the GNU General Public License as published by the Free "
@@ -64,7 +64,7 @@ msgid ""
msgstr ""
#. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:22
+#: en/index.xml:21
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -73,7 +73,7 @@ msgid ""
msgstr ""
#. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:23
+#: en/index.xml:22
msgid ""
"You should have received a copy of the GNU General Public License along with "
"this program. If not, see <ulink url=\"http://www.gnu.org/licenses/\">http://"
@@ -81,7 +81,7 @@ msgid ""
msgstr ""
#. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:24
+#: en/index.xml:23
msgid ""
"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/"
diff --git a/manual/pot/installation.xml.pot b/manual/pot/installation.xml.pot
index d713981..18e8865 100644
--- a/manual/pot/installation.xml.pot
+++ b/manual/pot/installation.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+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,157 +16,162 @@ msgstr ""
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <chapter><section><section><title>
-#: en/about_manual.xml:43 en/installation.xml:71
-msgid "&live-initramfs;"
+#: en/about_manual.xml:41 en/installation.xml:69
+msgid "<filename>live-initramfs</filename>"
msgstr ""
#. type: Content of: <chapter><title>
-#: en/installation.xml:6
+#: en/installation.xml:4
msgid "Installation"
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/installation.xml:8
+#: en/installation.xml:6
msgid "Requirements"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/installation.xml:9
+#: en/installation.xml:7
msgid "Building Debian Live images has very few system requirements:"
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:12
+#: en/installation.xml:10
msgid "Super user (root) access"
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:15
-msgid "An up-to-date version of &live-helper;"
+#: en/installation.xml:13
+msgid "An up-to-date version of <filename>live-helper</filename>"
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:18
+#: en/installation.xml:16
msgid ""
"A POSIX-compliant shell, such as <command>bash</command> or <command>dash</"
"command>."
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:21
+#: en/installation.xml:19
msgid "<command>debootstrap</command> or <command>cdebootstrap</command>"
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:24
+#: en/installation.xml:22
msgid "Linux 2.6.x"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/installation.xml:27
+#: en/installation.xml:25
msgid ""
"Note that using Debian or a Debian-derived distribution is not required - "
-"&live-helper; will run on almost any operating system with the above "
-"requirements."
+"<filename>live-helper</filename> will run on almost any operating system "
+"with the above requirements."
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/installation.xml:30
-msgid "Installing &live-helper;"
+#: en/installation.xml:28
+msgid "Installing <filename>live-helper</filename>"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/installation.xml:31
-msgid "You can install &live-helper; in a number of different ways:"
+#: en/installation.xml:29
+msgid ""
+"You can install <filename>live-helper</filename> in a number of different "
+"ways:"
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/installation.xml:34 en/installation.xml:48
+#: en/installation.xml:32 en/installation.xml:46
msgid "From the Debian repository"
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/installation.xml:37 en/installation.xml:55
+#: en/installation.xml:35 en/installation.xml:53
msgid "From source"
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:40
+#: en/installation.xml:38
msgid "From snapshots"
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:43
+#: en/installation.xml:41
msgid "From backports.org"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/installation.xml:46
+#: en/installation.xml:44
msgid ""
-"If you are using &lenny; or &sid; the recommended way is to install &live-"
-"helper; via the Debian repository."
+"If you are using <emphasis>lenny</emphasis> or <emphasis>sid</emphasis> the "
+"recommended way is to install <filename>live-helper</filename> via the "
+"Debian repository."
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:49
-msgid "Simply install &live-helper; like any other package:"
+#: en/installation.xml:47
+msgid "Simply install <filename>live-helper</filename> like any other package:"
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:50
+#: en/installation.xml:48
#, no-wrap
msgid "# apt-get install live-helper"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:51
+#: en/installation.xml:49
msgid "or"
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:52
+#: en/installation.xml:50
#, no-wrap
msgid "# aptitude install live-helper"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:56
+#: en/installation.xml:54
msgid ""
-"&live-helper; is developed using the Git version control system. On Debian "
-"systems, this is provided by the <command>git-core</command> package. To "
-"check out the latest code, execute:"
+"<filename>live-helper</filename> is developed using the Git version control "
+"system. On Debian systems, this is provided by the <command>git-core</"
+"command> package. To check out the latest code, execute:"
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:57
+#: en/installation.xml:55
#, no-wrap
msgid "$ git clone git://live.debian.net/git/live-helper.git"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:58
+#: en/installation.xml:56
msgid "You can build and install your own Debian package by executing:"
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:59
+#: en/installation.xml:57
#, no-wrap
msgid " $ cd live-helper $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .. # dpkg -i live-helper*.deb "
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:60
-msgid "You can also use a local version of &live-helper; without installation:"
+#: en/installation.xml:58
+msgid ""
+"You can also use a local version of <filename>live-helper</filename> without "
+"installation:"
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:61
+#: en/installation.xml:59
#, no-wrap
msgid "# live-helper/helpers/lh_local"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:62
+#: en/installation.xml:60
msgid ""
"Subsequent calls to <filename>lh_</filename>-prefixed helpers in that shell "
"environment will then use the version located in the directory you executed "
@@ -174,69 +179,70 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:63
+#: en/installation.xml:61
msgid ""
-"You can also install &live-helper; directly to your system by executing:"
+"You can also install <filename>live-helper</filename> directly to your "
+"system by executing:"
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:64
+#: en/installation.xml:62
#, no-wrap
msgid "# make install"
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/installation.xml:67
+#: en/installation.xml:65
msgid "From 'snapshots'"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:68
+#: en/installation.xml:66
msgid ""
-"If you do not wish to build or install &live-helper; 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>."
+"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>."
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:73
+#: en/installation.xml:71
msgid ""
-"<emphasis>N.B. You do not need to install &live-initramfs; on your system to "
-"create customised Debian Live systems. However, doing so will do no harm.</"
-"emphasis>"
+"<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>"
msgstr ""
#. type: Content of: <chapter><section><section><section><title>
-#: en/installation.xml:76
-msgid "Using a customised &live-initramfs;"
+#: en/installation.xml:74
+msgid "Using a customised <filename>live-initramfs</filename>"
msgstr ""
#. type: Content of: <chapter><section><section><section><para>
-#: en/installation.xml:77
+#: en/installation.xml:75
msgid ""
"To modify the code you can follow the process below. Please ensure you are "
"familiar with the terms mentioned in <xref linkend=\"terms\"/>."
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:80
-msgid "Checkout the &live-initramfs; source"
+#: en/installation.xml:78
+msgid "Checkout the <filename>live-initramfs</filename> source"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:81
+#: en/installation.xml:79
#, no-wrap
msgid "$ git clone git://live.debian.net/git/live-initramfs.git"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:84
+#: en/installation.xml:82
msgid "Make changes to your local copy"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:85
+#: en/installation.xml:83
msgid ""
"And beware that if you want to add your pre-init script in live-bottom, you "
"should name it without dashes '-', e.g: call it \"81new_feature\" and not "
@@ -244,12 +250,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:88
-msgid "Build a &live-initramfs; <command>.deb</command>"
+#: en/installation.xml:86
+msgid "Build a <filename>live-initramfs</filename> <command>.deb</command>"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:89
+#: en/installation.xml:87
msgid ""
"You must build either on your target distribution or in a chroot containing "
"your target platform: this means if your target is lenny then you should "
@@ -260,69 +266,70 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:90
+#: en/installation.xml:88
#, no-wrap
msgid " $ cd live-initramfs $ dpkg-buildpackage -rfakeroot -b -uc -us "
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:93
-msgid "Use the generated &live-initramfs; <command>.deb</command>"
+#: en/installation.xml:91
+msgid ""
+"Use the generated <filename>live-initramfs</filename> <command>.deb</command>"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:94
+#: en/installation.xml:92
msgid ""
-"As &live-initramfs; is installed by the build system, installing the package "
-"in the host system is not sufficient: you should treat the generated "
-"<command>.deb</command> like another custom package. Please see <xref "
-"linkend=\"custom-packages\"/> for more information. You should pay "
-"particular attention to <xref linkend=\"custom-packages-apt\"/>."
+"As <filename>live-initramfs</filename> is installed by the build system, "
+"installing the package in the host system is not sufficient: you should "
+"treat the generated <command>.deb</command> like another custom package. "
+"Please see <xref linkend=\"custom-packages\"/> for more information. You "
+"should pay particular attention to <xref linkend=\"custom-packages-apt\"/>."
msgstr ""
#. type: Content of: <chapter><section><section><section><title>
-#: en/installation.xml:99
-msgid "Using &live-initramfs; snapshots"
+#: en/installation.xml:97
+msgid "Using <filename>live-initramfs</filename> snapshots"
msgstr ""
#. type: Content of: <chapter><section><section><section><para>
-#: en/installation.xml:100
+#: en/installation.xml:98
msgid ""
-"You can let &live-helper; automatically use the latest snapshot of &live-"
-"initramfs; by configuring a third-party repository in your live-system "
-"configuration. Assuming you have already created a configuration tree with "
-"<command>lh config</command>:"
+"You can let <filename>live-helper</filename> automatically use the latest "
+"snapshot of <filename>live-initramfs</filename> by configuring a third-party "
+"repository in your live-system configuration. Assuming you have already "
+"created a configuration tree with <command>lh config</command>:"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:103
+#: en/installation.xml:101
msgid "Create a sources.list entry for the chroot stage:"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:104
+#: en/installation.xml:102
#, no-wrap
msgid "echo \"deb http://live.debian.net/ sid-snapshots main contrib non-free\" > config/chroot_sources/debian-live_sid-snapshots.chroot"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:107
+#: en/installation.xml:105
msgid "Create a sources.list entry for the binary stage:"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:108
+#: en/installation.xml:106
#, no-wrap
msgid "cp config/chroot_sources/debian-live_sid-snapshots.chroot config/chroot_sources/debian-live_sid-snapshots.binary"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:111
+#: en/installation.xml:109
msgid "Fetch the archive signing key:"
msgstr ""
#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:112
+#: en/installation.xml:110
#, no-wrap
msgid " wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O config/chroot_sources/debian-live_sid-snapshots.chroot.gpg cp config/chroot_sources/debian-live_sid-snapshots.chroot.gpg config/chroot_sources/debian-live_sid-snapshots.binary.gpg "
msgstr ""
diff --git a/manual/pot/live-environment.xml.pot b/manual/pot/live-environment.xml.pot
index e7a4ee6..39b4996 100644
--- a/manual/pot/live-environment.xml.pot
+++ b/manual/pot/live-environment.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+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,41 +16,41 @@ msgstr ""
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <chapter><para>
-#: en/about_manual.xml:65 en/customization_bootup.xml:8
-#: en/customization_bootup.xml:14 en/customization_bootup.xml:17
-#: en/customization_bootup.xml:25 en/customization_bootup.xml:37
-#: en/customization_bootup.xml:41 en/customization_bootup.xml:45
-#: en/customization_bootup.xml:49 en/customization_packages.xml:18
-#: en/customization_packages.xml:130 en/customization_packages.xml:138
-#: en/customization_packages.xml:160 en/customization_packages.xml:198
-#: en/customization_packages.xml:209 en/live-environment.xml:9
-#: en/resources.xml:9 en/success-stories.xml:8
+#: 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
msgid "FIXME"
msgstr ""
#. type: Content of: <chapter><title>
-#: en/live-environment.xml:6
+#: en/live-environment.xml:4
msgid "The Live environment"
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:8
+#: en/live-environment.xml:6
msgid "Swap space"
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:12
+#: en/live-environment.xml:10
msgid "Hostname"
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:13
+#: en/live-environment.xml:11
#, no-wrap
msgid "lh_config --bootappend-live \"hostname=myhost\""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:13
+#: en/live-environment.xml:11
msgid ""
"The name of host running live system can be set with the <command>hostname</"
"command> parameter into the <command>--bootappend-live</command> option of "
@@ -59,25 +59,25 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:16
+#: en/live-environment.xml:14
msgid "The Live user"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:17
+#: en/live-environment.xml:15
msgid "Username FIXME."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:18
+#: en/live-environment.xml:16
msgid ""
-"One important consideration is that the live user is created by &live-"
-"initramfs; during bootup, it is not created by &live-helper; when building "
-"the image."
+"One important consideration is that the live user is created by "
+"<filename>live-initramfs</filename> during bootup, it is not created by "
+"<filename>live-helper</filename> when building the image."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:19
+#: en/live-environment.xml:17
msgid ""
"You can specify additional groups that the live user will belong to by "
"preseeding the <command>passwd/user-default-groups</command> debconf value. "
@@ -87,51 +87,51 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><screen>
-#: en/live-environment.xml:20
+#: en/live-environment.xml:18
#, no-wrap
msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse "
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:21
+#: en/live-environment.xml:19
msgid ""
"For more information about debconf preseeding, please see <xref linkend="
"\"debconf-preseed\"/>."
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:24
+#: en/live-environment.xml:22
msgid "Language"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:25
+#: en/live-environment.xml:23
msgid "When the live system boots, language is involved in three steps:"
msgstr ""
#. type: Content of: <chapter><section><para><itemizedlist><listitem><simpara>
-#: en/live-environment.xml:25
+#: en/live-environment.xml:23
msgid "the locale generation"
msgstr ""
#. type: Content of: <chapter><section><para><itemizedlist><listitem><simpara>
-#: en/live-environment.xml:25
+#: en/live-environment.xml:23
msgid "setting the keyboard layout for the console"
msgstr ""
#. type: Content of: <chapter><section><para><itemizedlist><listitem><simpara>
-#: en/live-environment.xml:25
+#: en/live-environment.xml:23
msgid "setting the keyboard layout for X"
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:26
+#: en/live-environment.xml:24
#, no-wrap
msgid "lh_config --bootappend-live \"locale=sv_SE.utf8\""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:26
+#: en/live-environment.xml:24
msgid ""
"To define the locale that should be generated, use the <command>locale</"
"command> parameter into the <command>--bootappend-live</command> option of "
@@ -143,19 +143,19 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:27
+#: en/live-environment.xml:25
#, no-wrap
msgid "$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name> "
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:27
+#: en/live-environment.xml:25
#, no-wrap
msgid "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se\""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:27
+#: en/live-environment.xml:25
msgid ""
"Both the console and X keyboard configuration depends on the <command>keyb</"
"command> parameter of the <command>--bootappend-live</command> option. Valid "
@@ -168,19 +168,19 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:28
+#: en/live-environment.xml:26
#, no-wrap
msgid "for i in `find /usr/share/keymaps/ -iname \"*kmap.gz\"`; do basename $i | head -c -9; echo; done | sort | less "
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:28
+#: en/live-environment.xml:26
#, no-wrap
msgid "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se-latin1\""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:28
+#: en/live-environment.xml:26
msgid ""
"A list of the valid values of the keyboards for the console can be figured "
"with the following command: <placeholder type=\"screen\" id=\"0\"/> To make "
@@ -189,13 +189,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:29
+#: en/live-environment.xml:27
#, no-wrap
msgid "lh_config --bootappend-live \\ \"locale=fr_FR.UTF-8 klayout=fr kvariant=bepo kmodel=tm2030usb\""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:29
+#: en/live-environment.xml:27
msgid ""
"Alternatively, you can use the <literal>console-setup</literal> package, a "
"tool to let you configure console layout using X (XKB) definitions; you can "
@@ -211,12 +211,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:32
+#: en/live-environment.xml:30
msgid "Persistence"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:33
+#: en/live-environment.xml:31
msgid ""
"A live cd paradigm is a preinstalled system which runs from read-only media, "
"like a cdrom, where writes and modifications do not survive reboots of the "
@@ -224,7 +224,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:34
+#: en/live-environment.xml:32
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -233,7 +233,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:35
+#: en/live-environment.xml:33
msgid ""
"Persistence is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this runtime evolution of the system. To "
@@ -244,7 +244,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:36
+#: en/live-environment.xml:34
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -254,12 +254,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:38
+#: en/live-environment.xml:36
msgid "Full persistence"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:39
+#: en/live-environment.xml:37
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -271,26 +271,26 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/live-environment.xml:40
+#: en/live-environment.xml:38
#, no-wrap
msgid " # mkfs.ext2 -L live-rw /dev/sdb1 "
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:41
+#: en/live-environment.xml:39
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/live-environment.xml:42
+#: en/live-environment.xml:40
#, no-wrap
msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/sdb1 live-rw # for a fat filesystem "
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:43
+#: en/live-environment.xml:41
msgid ""
"But since live system users cannot always use a hard drive partition, and "
"considering that most USB keys have poor write speeds, 'full' persistence "
@@ -300,25 +300,25 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><screen>
-#: en/live-environment.xml:44
+#: en/live-environment.xml:42
#, no-wrap
msgid " $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /sbin/mkfs.ext2 -F live-rw "
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:45
+#: en/live-environment.xml:43
msgid ""
"Then copy the <command>live-rw</command> file to a writable partition and "
"reboot with the boot parameter 'persistent'."
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:48
+#: en/live-environment.xml:46
msgid "Home automounting"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:49
+#: en/live-environment.xml:47
msgid ""
"If during the boot a partition (filesystem) image file or a partition "
"labeled <command>home-rw</command> is discovered, this filesystem will be "
@@ -328,12 +328,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:52
+#: en/live-environment.xml:50
msgid "Snapshots"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:53
+#: en/live-environment.xml:51
msgid ""
"Snapshots are collections of files and directories which are not mounted "
"while running but which are copied from a persistent device to the system "
@@ -351,7 +351,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:54
+#: en/live-environment.xml:52
msgid ""
"A /home version of snapshot exists too and its label is <command>home-sn.*</"
"command>; it works the same as the main snapshot but it is only applied to /"
@@ -359,19 +359,19 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:55
+#: en/live-environment.xml:53
msgid ""
"Snapshots cannot currently handle file deletion but full persistence and "
"home automounting can."
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:58
+#: en/live-environment.xml:56
msgid "Persistent SubText"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:59
+#: en/live-environment.xml:57
msgid ""
"If a user would need multiple persistent storage of the same type for "
"different locations or testing, such as <command>live-rw-nonwork</command> "
@@ -385,12 +385,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:62
+#: en/live-environment.xml:60
msgid "Partial remastering"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:63
+#: en/live-environment.xml:61
msgid ""
"The runtime modification of the tmpfs could be collected using live-snapshot "
"in a squashfs and added to the cd by remastering the iso in the case of cd-r "
diff --git a/manual/pot/overview.xml.pot b/manual/pot/overview.xml.pot
index 795a722..4066b0c 100644
--- a/manual/pot/overview.xml.pot
+++ b/manual/pot/overview.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+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,143 +16,145 @@ msgstr ""
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <chapter><section><title>
-#: en/about_manual.xml:37 en/overview.xml:9
-msgid "&live-helper;"
+#: en/about_manual.xml:35 en/overview.xml:7
+msgid "<filename>live-helper</filename>"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
-#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
-#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
-#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
-#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
-#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
-#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
-#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
-#: en/basics.xml:220 en/customization_packages.xml:25
-#: en/customization_packages.xml:29 en/customization_packages.xml:34
-#: en/customization_packages.xml:38 en/customization_packages.xml:48
-#: en/customization_packages.xml:102 en/customization_packages.xml:106
-#: en/customization_packages.xml:116 en/customization_packages.xml:132
-#: en/customization_packages.xml:140 en/customization_packages.xml:144
-#: en/customization_packages.xml:148 en/customization_packages.xml:152
-#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
-#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
-#: en/overview.xml:66 en/overview.xml:70
+#: 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
msgid "<placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><title>
-#: en/overview.xml:6
+#: en/overview.xml:4
msgid "Overview of tools"
msgstr ""
#. type: Content of: <chapter><para>
-#: en/overview.xml:7
+#: en/overview.xml:5
msgid ""
"This chapter contains an overview of the two main tools used in building "
"Debian Live systems."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:10
+#: en/overview.xml:8
msgid ""
-"&live-helper; is a collection of scripts to build Debian Live systems. These "
-"scripts are also referred to as \"helpers\"."
+"<filename>live-helper</filename> is a collection of scripts to build Debian "
+"Live systems. These scripts are also referred to as \"helpers\"."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:11
+#: en/overview.xml:9
msgid ""
-"The idea behind &live-helper; is to be a framework that uses a configuration "
-"directory to completely automate and customize all aspects of building a "
-"Live image."
+"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."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:12
+#: en/overview.xml:10
msgid ""
"Many concepts are similar to those in the <command>debhelper</command> "
"Debian package tools written by Joey Hess:"
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/overview.xml:15
+#: en/overview.xml:13
msgid "The scripts have a central location for configuring their operation."
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/overview.xml:16
+#: en/overview.xml:14
msgid ""
"In <command>debhelper</command>, this is the <filename class=\"directory"
"\">debian</filename> subdirectory of a package tree. For example, "
"<command>dh_install</command> will look for a file called <filename>debian/"
"<packagename>.install</filename> to determine which files should exist "
-"in a particular binary package. In much the same way, &live-helper; stores "
-"its configuration entirely under a <filename class=\"directory\">config/</"
-"filename> subdirectory."
+"in a particular binary package. In much the same way, <filename>live-helper</"
+"filename> stores its configuration entirely under a <filename class="
+"\"directory\">config/</filename> subdirectory."
msgstr ""
#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/overview.xml:19
+#: en/overview.xml:17
msgid ""
"The scripts are independent - that is to say, it is always safe to run each "
"command."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:22
+#: en/overview.xml:20
msgid ""
-"Unlike <command>debhelper</command>, &live-helper; 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\"/>."
+"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\"/>."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:23
+#: en/overview.xml:21
msgid ""
"Besides the common <filename>config/common</filename>, which is used by all "
-"&live-helper; 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)."
+"<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)."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:24
+#: en/overview.xml:22
msgid ""
"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 &live-helper; use pairs of values or slightly more "
-"complicated variable assignments."
+"Some programs in <filename>live-helper</filename> use pairs of values or "
+"slightly more complicated variable assignments."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:25
+#: en/overview.xml:23
msgid ""
-"&live-helper; 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), &live-helper; will automatically "
-"set it to a default value."
+"<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."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:26
+#: en/overview.xml:24
msgid ""
-"All config files are shell scripts which are sourced by a &live-helper; "
-"program. That means they have to follow the normal shell syntax. You can "
-"also put comments in these files; lines beginning with \"#\" are ignored."
+"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."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:27
+#: en/overview.xml:25
msgid ""
"In some rare cases you may want to have different versions of these files "
"for different architectures or distributions. If files named <command>config/"
@@ -165,71 +167,71 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:28
+#: en/overview.xml:26
msgid ""
"Please see <xref linkend=\"installation\"/> for information on how to "
-"install &live-helper;."
+"install <filename>live-helper</filename>."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:29
+#: en/overview.xml:27
msgid ""
"The remainder of this section discusses the three most important helpers:"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/overview.xml:33
+#: en/overview.xml:31
msgid "<filename>lh config</filename>"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/overview.xml:36
+#: en/overview.xml:34
msgid ""
"Responsible for initialising a Live system configuration directory. See "
"<xref linkend=\"lh-config\"/> for more information."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/overview.xml:41
+#: en/overview.xml:39
msgid "<filename>lh build</filename>"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/overview.xml:44
+#: en/overview.xml:42
msgid ""
"Responsible for starting a Live system build. See <xref linkend=\"lh-build\"/"
"> for more information."
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/overview.xml:49
+#: en/overview.xml:47
msgid "<filename>lh clean</filename>"
msgstr ""
#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/overview.xml:52
+#: en/overview.xml:50
msgid ""
"Responsible for removing parts of a Live system build. See <xref linkend="
"\"lh-clean\"/> for more information."
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/overview.xml:57
+#: en/overview.xml:55
msgid "The <filename>lh config</filename> helper"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:58
+#: en/overview.xml:56
msgid ""
"As discussed in <xref linkend=\"live-helper\"/>, the scripts that make up "
-"&live-helper; source their configuration from a single directory named "
-"<command>config/</command>. As constructing this directory by hand would be "
-"time-consuming and error-prone, the <filename>lh config</filename> helper "
-"can be used to create skeleton configuration folders."
+"<filename>live-helper</filename> source their configuration from a single "
+"directory named <command>config/</command>. As constructing this directory "
+"by hand would be time-consuming and error-prone, the <filename>lh config</"
+"filename> helper can be used to create skeleton configuration folders."
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:59
+#: en/overview.xml:57
msgid ""
"Issuing <filename>lh config</filename> without any arguments creates a "
"<command>config</command> subdirectory which it populates with some default "
@@ -237,13 +239,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/overview.xml:61
+#: en/overview.xml:59
#, no-wrap
msgid "$ lh config $ ls -l total 4.1k drwxr-xr-x 19 user group 4.1k 2008-05-09 21:37 config $ ls -l config/ total 104 -rw-r--r-- 1 user group 4175 2010-04-11 12:16 binary drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_grub drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-debs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-hooks drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-packageslists drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-udebs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_rootfs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_syslinux -rw-r--r-- 1 user group 2205 2010-04-11 12:16 bootstrap -rw-r--r-- 1 user group 1599 2010-04-11 12:16 chroot drwxr-xr-x 2 user group 4096 2010-04-11 12:16
chroot_apt drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-hooks drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packages drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packageslists drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-patches drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-preseed drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_sources -rw-r--r-- 1 user group 2938 2010-04-11 12:16 common drwxr-xr-x 2 user group 4096 2010-04-11 12:16 includes -rw-r--r-- 1 user group 206 2010-04-11 12:16 source drwxr-xr-x 2 user group 4096 2010-04-11 12:16 templates "
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:63
+#: en/overview.xml:61
msgid ""
"Using <filename>lh config</filename> without any arguments would be suitable "
"for users who are either happy editing the generated files, or are simply "
@@ -251,7 +253,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:64
+#: en/overview.xml:62
msgid ""
"You can ask <filename>lh config</filename> to generate a <filename class="
"\"directory\">config/</filename> directory \"preseeded\" with various "
@@ -260,13 +262,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/overview.xml:66
+#: en/overview.xml:64
#, no-wrap
msgid "$ lh config -p gnome"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:68
+#: en/overview.xml:66
msgid ""
"will build a <filename class=\"directory\">config/</filename> directory "
"configured to include the '<command>gnome</command>' package list. It is "
@@ -274,13 +276,13 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><para><screen>
-#: en/overview.xml:70
+#: en/overview.xml:68
#, no-wrap
msgid "$ lh config --apt aptitude --binary-images net --hostname live-machine --username live-user ..."
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:72
+#: en/overview.xml:70
msgid ""
"A full list of options is available in the <command>lh_config</command> man "
"page. Most options have a parallel with an \"<command>LH_</command>\" "
@@ -288,12 +290,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/overview.xml:75
+#: en/overview.xml:73
msgid "The <filename>lh build</filename> helper"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:76
+#: en/overview.xml:74
msgid ""
"The <filename>lh build</filename> helper reads in your configuration from "
"the <filename class=\"directory\">config/</filename> directory. It then runs "
@@ -301,12 +303,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><section><title>
-#: en/overview.xml:79
+#: en/overview.xml:77
msgid "The <filename>lh clean</filename> helper"
msgstr ""
#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:80
+#: en/overview.xml:78
msgid ""
"It is the job of the <filename>lh clean</filename> helper to remove various "
"parts of a Live helper build so subsequent builds can start from a clean "
@@ -314,22 +316,22 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/overview.xml:84
-msgid "The &live-initramfs; package"
+#: en/overview.xml:82
+msgid "The <filename>live-initramfs</filename> package"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:85
+#: en/overview.xml:83
msgid ""
-"&live-initramfs; 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."
+"<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."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:86
+#: en/overview.xml:84
msgid ""
"At boot time it will look for read-only media containing a \"/live\" "
"directory where a root filesystem (often a compressed filesystem image like "
@@ -338,14 +340,14 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:87
+#: en/overview.xml:85
msgid ""
-"&live-initramfs; is a fork of <ulink url=\"http://packages.ubuntu.com/casper"
-"\">casper</ulink>."
+"<filename>live-initramfs</filename> is a fork of <ulink url=\"http://"
+"packages.ubuntu.com/casper\">casper</ulink>."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/overview.xml:88
+#: en/overview.xml:86
msgid ""
"More information on initial ramfs in Debian can be found in the <ulink url="
"\"http://kernel-handbook.alioth.debian.org/\"> Debian Linux Kernel Handbook</"
diff --git a/manual/pot/reporting-bugs.xml.pot b/manual/pot/reporting-bugs.xml.pot
index 24b28ed..d909ebb 100644
--- a/manual/pot/reporting-bugs.xml.pot
+++ b/manual/pot/reporting-bugs.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+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,12 +16,12 @@ msgstr ""
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <chapter><title>
-#: en/reporting-bugs.xml:6
+#: en/reporting-bugs.xml:4
msgid "Reporting bugs"
msgstr ""
#. type: Content of: <chapter><para>
-#: en/reporting-bugs.xml:7
+#: en/reporting-bugs.xml:5
msgid ""
"Debian Live is far from being perfect, but we want to make it as close as "
"possible to perfect - with your help. Do not hesitate to report a bug: it is "
@@ -30,46 +30,48 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><para>
-#: en/reporting-bugs.xml:8
+#: en/reporting-bugs.xml:6
msgid "For the impatient:"
msgstr ""
#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:11
+#: en/reporting-bugs.xml:9
msgid ""
"Always check first the image status updates on <ulink url=\"http://live."
"debian.net/\">our homepage</ulink> for known issues."
msgstr ""
#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:14
+#: en/reporting-bugs.xml:12
msgid ""
"Always try to reproduce the bug with the <emphasis>most recent version of "
-"&live-helper; and &live-initramfs;</emphasis> before submitting a bug report."
+"<filename>live-helper</filename> and <filename>live-initramfs</filename></"
+"emphasis> before submitting a bug report."
msgstr ""
#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:17
+#: en/reporting-bugs.xml:15
msgid ""
"Try to give <emphasis>as specific information as possible</emphasis> about "
-"the bug. This includes (at least) the version of &live-helper; and &live-"
-"initramfs; used and the distribution of the live system you are building."
+"the bug. This includes (at least) the version of <filename>live-helper</"
+"filename> and <filename>live-initramfs</filename> used and the distribution "
+"of the live system you are building."
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/reporting-bugs.xml:21
+#: en/reporting-bugs.xml:19
msgid "Known issues"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:22
+#: en/reporting-bugs.xml:20
msgid ""
"Due to the nature of Debian testing and Debian unstable branches being a "
"moving target, building a live system may not always be possible."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:23
+#: en/reporting-bugs.xml:21
msgid ""
"If this is a problem, do not build a system based on testing or unstable, "
"but go with stable. live-helper does always default to the current stable "
@@ -77,14 +79,14 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:24
+#: en/reporting-bugs.xml:22
msgid ""
"Currently known issues are listed under the section 'status' on <ulink url="
"\"http://live.debian.net/\">our homepage</ulink>."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:25
+#: en/reporting-bugs.xml:23
msgid ""
"It is out of the scope of this manual to train you in correctly identifying "
"and fixing problems in packages of the development branches, however, there "
@@ -94,12 +96,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/reporting-bugs.xml:28
+#: en/reporting-bugs.xml:26
msgid "Rebuild from scratch"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:29
+#: en/reporting-bugs.xml:27
msgid ""
"To ensure that a particular bug is not caused by an unclean built system, "
"please always rebuild the whole live system from scratch to see if the bug "
@@ -107,17 +109,17 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/reporting-bugs.xml:32
+#: en/reporting-bugs.xml:30
msgid "Use up-to-date packages"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:33
+#: en/reporting-bugs.xml:31
msgid "This means"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:34
+#: en/reporting-bugs.xml:32
msgid ""
"Using outdated packages can cause significant problems when trying to "
"reproduce (and ultimately fix) your problem. If a relevant package is not "
@@ -127,79 +129,79 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/reporting-bugs.xml:37
+#: en/reporting-bugs.xml:35
msgid "Collect information"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:38
+#: en/reporting-bugs.xml:36
msgid ""
"Please provide enough information with your report. At a minimum, it should "
-"contain the exact version of &live-helper; version where the bug is "
-"encountered, and steps to reproduce it. Please use common sense and include "
-"other relevant information if you think that it might help in solving the "
-"problem."
+"contain the exact version of <filename>live-helper</filename> version where "
+"the bug is encountered, and steps to reproduce it. Please use common sense "
+"and include other relevant information if you think that it might help in "
+"solving the problem."
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:39
+#: en/reporting-bugs.xml:37
msgid ""
"To make the most out of your bug report, we require at least the following "
"information:"
msgstr ""
#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:42
+#: en/reporting-bugs.xml:40
msgid "Architecture of the host system"
msgstr ""
#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:45
-msgid "Version of &live-helper; on the host system"
+#: en/reporting-bugs.xml:43
+msgid "Version of <filename>live-helper</filename> on the host system"
msgstr ""
#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:48
-msgid "Version of &live-initramfs; on the live system"
+#: en/reporting-bugs.xml:46
+msgid "Version of <filename>live-initramfs</filename> on the live system"
msgstr ""
#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:51
+#: en/reporting-bugs.xml:49
msgid ""
"Version of <filename>debootstrap</filename> and/or <filename>cdebootstrap</"
"filename> on the host system"
msgstr ""
#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:54
+#: en/reporting-bugs.xml:52
msgid "Architecture of the live system"
msgstr ""
#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:57
+#: en/reporting-bugs.xml:55
msgid "Distribution of the live system"
msgstr ""
#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/reporting-bugs.xml:60
+#: en/reporting-bugs.xml:58
msgid "Version of the kernel on the live system"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:63
+#: en/reporting-bugs.xml:61
msgid ""
"You can generate a log of the build process by using the <filename>tee</"
"filename> command:"
msgstr ""
#. type: Content of: <chapter><section><screen>
-#: en/reporting-bugs.xml:64
+#: en/reporting-bugs.xml:62
#, no-wrap
msgid " # lh_build 2>&1 | tee buildlog.txt "
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:65
+#: en/reporting-bugs.xml:63
msgid ""
"Additionally, to rule out other errors, it is always a good idea to tar up "
"your config directory and upload it somewhere (do *not* send it as an "
@@ -208,7 +210,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:66
+#: en/reporting-bugs.xml:64
msgid ""
"Remember to send in any logs that were produced with English locale "
"settings, e.g. run your live-helper commands with a leading <code>LC_ALL=C</"
@@ -216,24 +218,24 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/reporting-bugs.xml:69
+#: en/reporting-bugs.xml:67
msgid "Use the correct package to report the bug against"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:70
+#: en/reporting-bugs.xml:68
msgid "Where does the bug appear?"
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/reporting-bugs.xml:74
+#: en/reporting-bugs.xml:72
msgid "At build time whilst bootstrapping"
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para><para>
-#: en/reporting-bugs.xml:77
+#: en/reporting-bugs.xml:75
msgid ""
-"&live-helper; first bootstraps a basic Debian system with "
+"<filename>live-helper</filename> first bootstraps a basic Debian system with "
"<command>debootstrap</command> or <command>cdebootstrap</command>. Depending "
"on the bootstrapping tool used and the Debian distribution it is "
"bootstrapping, it may fail. If a bug appears here, check if the error is "
@@ -242,7 +244,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para><para>
-#: en/reporting-bugs.xml:78
+#: en/reporting-bugs.xml:76
msgid ""
"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
"which we can not fix this directly. Please report such a bug against "
@@ -251,21 +253,21 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/reporting-bugs.xml:83
+#: en/reporting-bugs.xml:81
msgid "At build time whilst installing packages"
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/reporting-bugs.xml:85
+#: en/reporting-bugs.xml:83
msgid ""
-"&live-helper; installs additional packages from the Debian archive and "
-"depending on the Debian distribution used and the daily archive state, it "
-"can fail. If a bug appears here, check if the error is also reproducible on "
-"a normal system."
+"<filename>live-helper</filename> installs additional packages from the "
+"Debian archive and depending on the Debian distribution used and the daily "
+"archive state, it can fail. If a bug appears here, check if the error is "
+"also reproducible on a normal system."
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/reporting-bugs.xml:86
+#: en/reporting-bugs.xml:84
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
"- please report it against the failing package. Running "
@@ -275,7 +277,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/reporting-bugs.xml:87
+#: en/reporting-bugs.xml:85
msgid ""
"Also, if you are using a local mirror and/or any of sort of proxy and you "
"are experiencing a problem, please always reproduce it first by "
@@ -283,12 +285,12 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/reporting-bugs.xml:91
+#: en/reporting-bugs.xml:89
msgid "At boot-time"
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/reporting-bugs.xml:93
+#: en/reporting-bugs.xml:91
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in <xref linkend=\"collect-information\"/>. "
@@ -299,29 +301,29 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/reporting-bugs.xml:97
+#: en/reporting-bugs.xml:95
msgid "At run-time"
msgstr ""
#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/reporting-bugs.xml:99
+#: en/reporting-bugs.xml:97
msgid ""
"If a package was successfully installed, but fails while actually running "
"the Live system, this is probably a bug in Debian Live. However,"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:72
+#: en/reporting-bugs.xml:70
msgid "<placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/reporting-bugs.xml:106
+#: en/reporting-bugs.xml:104
msgid "Do the research"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:107
+#: en/reporting-bugs.xml:105
msgid ""
"Before filing the bug, please search the web for the particular error "
"message or symptom you are getting. As it is highly unlikely that you are "
@@ -331,7 +333,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:108
+#: en/reporting-bugs.xml:106
msgid ""
"You should pay particular attention to the Debian Live mailing list, as well "
"as the homepage, as these are likely to contain the most up-to-date "
@@ -340,22 +342,22 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:109
+#: en/reporting-bugs.xml:107
msgid ""
"In addition, you should check the <ulink url=\"http://bugs.debian.org/cgi-"
-"bin/pkgreport.cgi?src=live-helper\">current bug list for &live-helper;</"
-"ulink> and the <ulink url=\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?"
-"src=live-initramfs\">current bug list for live-initramfs</ulink> to see "
-"whether something similar has been reported already."
+"bin/pkgreport.cgi?src=live-helper\">current bug list for <filename>live-"
+"helper</filename></ulink> and the <ulink url=\"http://bugs.debian.org/cgi-"
+"bin/pkgreport.cgi?src=live-initramfs\">current bug list for live-initramfs</"
+"ulink> to see whether something similar has been reported already."
msgstr ""
#. type: Content of: <chapter><section><title>
-#: en/reporting-bugs.xml:112
+#: en/reporting-bugs.xml:110
msgid "Where to report bugs"
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:113
+#: en/reporting-bugs.xml:111
msgid ""
"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
"System (BTS). For information on how to use the system, please see <ulink "
@@ -365,7 +367,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:114
+#: en/reporting-bugs.xml:112
msgid ""
"In general, you should report build time errors against the <ulink url="
"\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper\">live-"
@@ -377,7 +379,7 @@ msgid ""
msgstr ""
#. type: Content of: <chapter><section><para>
-#: en/reporting-bugs.xml:115
+#: en/reporting-bugs.xml:113
msgid ""
"Please note that bugs found in distributions derived from Debian (such as "
"Ubuntu, Knoppix, Xandros, etc.) should <emphasis>not</emphasis> be reported "
diff --git a/manual/pot/use-cases.xml.pot b/manual/pot/use-cases.xml.pot
index 0756ef4..eb03743 100644
--- a/manual/pot/use-cases.xml.pot
+++ b/manual/pot/use-cases.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"POT-Creation-Date: 2010-06-18 17:51+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,106 +16,108 @@ msgstr ""
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/basics.xml:50 en/basics.xml:89 en/basics.xml:148 en/use-cases.xml:31
+#: en/basics.xml:48 en/basics.xml:87 en/basics.xml:146 en/use-cases.xml:29
#, no-wrap
msgid "# lh build"
msgstr ""
#. type: Content of: <chapter><title>
-#: en/use-cases.xml:6
+#: en/use-cases.xml:4
msgid "Use Cases"
msgstr ""
#. type: Content of: <chapter><para>
-#: en/use-cases.xml:7
+#: en/use-cases.xml:5
msgid "This chapter is for users to document their use cases with Debian Live."
msgstr ""
#. type: Content of: <chapter><sect1><title>
-#: en/use-cases.xml:9
+#: en/use-cases.xml:7
msgid "VNC Kiosk Client"
msgstr ""
#. type: Content of: <chapter><sect1><para>
-#: en/use-cases.xml:10
-msgid "Create an image with &live-helper; to boot directly to a VNC server."
+#: en/use-cases.xml:8
+msgid ""
+"Create an image with <filename>live-helper</filename> to boot directly to a "
+"VNC server."
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/use-cases.xml:13
+#: en/use-cases.xml:11
#, no-wrap
msgid "$ mkdir vncBuild"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/use-cases.xml:13
+#: en/use-cases.xml:11
msgid "Make a build directory: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/use-cases.xml:16
+#: en/use-cases.xml:14
#, no-wrap
msgid "$ cd vncBuild"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/use-cases.xml:16
+#: en/use-cases.xml:14
msgid "Move to the build directory: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/use-cases.xml:19
+#: en/use-cases.xml:17
#, no-wrap
msgid "$ lh config --packages \"gdm metacity xtightvncviewer\""
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/use-cases.xml:19
+#: en/use-cases.xml:17
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/use-cases.xml:22
+#: en/use-cases.xml:20
#, no-wrap
msgid "$ mkdir -p config/chroot_local-includes/etc/skel"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/use-cases.xml:22
+#: en/use-cases.xml:20
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/use-cases.xml:25
+#: en/use-cases.xml:23
#, no-wrap
msgid "$ touch config/chroot_local-includes/etc/skel/.xsession"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/use-cases.xml:25
+#: en/use-cases.xml:23
msgid ""
"Create the .xsession for the default user: <placeholder type=\"screen\" id="
"\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/use-cases.xml:28
+#: en/use-cases.xml:26
#, no-wrap
msgid " #!/bin/sh /usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT exit "
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/use-cases.xml:28
+#: en/use-cases.xml:26
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/use-cases.xml:31
+#: en/use-cases.xml:29
msgid "Build the image: <placeholder type=\"screen\" id=\"0\"/>"
msgstr ""
diff --git a/xml/common.ent b/xml/common.ent
deleted file mode 100644
index 7670cd6..0000000
--- a/xml/common.ent
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!ENTITY live-helper "<filename>live-helper</filename>">
-<!ENTITY live-initramfs "<filename>live-initramfs</filename>">
-<!ENTITY live-manual "<filename>live-manual</filename>">
-
-<!ENTITY lenny "<emphasis>lenny</emphasis>">
-<!ENTITY squeeze "<emphasis>squeeze</emphasis>">
-<!ENTITY sid "<emphasis>sid</emphasis>">
--
live-manual
More information about the debian-live-changes
mailing list