[SCM] live-manual branch, debian, updated. debian/2.0_a11-1-7-ge6387bc
Daniel Baumann
daniel at debian.org
Tue Nov 30 10:10:59 UTC 2010
The following commit has been merged in the debian branch:
commit e6387bc19c0425b82a3500d7de1f20fcdebb741f
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 30 11:10:36 2010 +0100
Removing other_configuration-files entirely, not usefull to keep a static list of possible variables in the manual.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 87f486e..c715a82 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -84,5 +84,3 @@ only after it has been reviewed.
% << other_resources.ssi
% << other_configuration-layout.ssi
-
-% << other_configuration-files.ssi
diff --git a/manual/de/other_configuration-files.ssi b/manual/de/other_configuration-files.ssi
deleted file mode 100644
index 9a687e5..0000000
--- a/manual/de/other_configuration-files.ssi
+++ /dev/null
@@ -1,232 +0,0 @@
-B~ Configuration files
-
-1~ Configuration files
-
-2~ The config/binary file
-
-_* LH_BINARY_FILESYSTEM: Set image filesystem. (see configuration-layout)
-
-_* LH_BINARY_IMAGES: Set image type. (see configuration-layout)
-
-_* LH_BINARY_INDICES: Set apt/aptitude generic indices. (see
-configuration-layout)
-
-_* LH_BOOTAPPEND_LIVE: Set boot parameters. (see configuration-layout)
-
-_* LH_BOOTAPPEND_INSTALL: Set boot parameters. (see configuration-layout)
-
-_* LH_BOOTLOADER: Set bootloader. (see bootloaders)
-
-_* LH_CHECKSUMS: Set checksums. (see cheat-codes)
-
-_* LH_CHROOT_BUILD: Control if we build binary images chrooted. (see
-configuration-layout)
-
-_* LH_DEBIAN_INSTALLER: Set debian-installer. (see debian-installer)
-
-_* LH_DEBIAN_INSTALLER_DAILY: Set daily images. (see debian-installer)
-
-_* LH_ENCRYPTION: Set encrytion. (see configuration layout)
-
-_* LH_GRUB_SPLASH: Set custom grub splash. (see splash-screen)
-
-_* LH_HOSTNAME: Set hostname. (see hostname)
-
-_* LH_ISO_APPLICATION: Set iso author. (see iso-metadata)
-
-_* LH_ISO_PREPARER: Set iso preparer. (see iso-metadata)
-
-_* LH_ISO_PUBLISHER: Set iso publisher. (see iso-metadata)
-
-_* LH_ISO_VOLUME: Set iso volume (max 32 chars). (see iso-metadata)
-
-_* LH_JFFS2_ERASEBLOCK: Set jffs2 eraseblock size. (see configuration
-layout)
-
-_* LH_MEMTEST: Set memtest. (see memtest)
-
-_* LH_NET_ROOT_FILESYSTEM: Set netboot filesystem. (see configuration
-layout)
-
-_* LH_NET_ROOT_MOUNTOPTIONS: Set nfsopts. (see configuration layout)
-
-_* LH_NET_ROOT_PATH: Set netboot server directory. (see configuration
-layout)
-
-_* LH_NET_ROOT_SERVER: Set netboot server address. (see configuration
-layout)
-
-_* LH_NET_COW_FILESYSTEM: Set net client cow filesystem. (see configuration
-layout)
-
-_* LH_NET_COW_MOUNTOPTIONS: Set cow mount options. (see configuration
-layout)
-
-_* LH_NET_COW_PATH: Set cow directory. (see configuration layout)
-
-_* LH_NET_COW_SERVER: Set cow server. (see configuration layout)
-
-_* LH_NET_TARBALL: Set net tarball. (see configuration layout)
-
-_* LH_SYSLINUX_SPLASH: Set custom syslinux splash. (see splash-screen)
-
-_* LH_SYSLINUX_TIMEOUT: Set custom syslinux timeout in seconds. (see
-syslinux)
-
-_* LH_SYSLINUX_CFG: Set custom syslinux configuration file. (see syslinux)
-
-_* LH_SYSLINUX_MENU: Set syslinux menu. (see syslinux)
-
-_* LH_SYSLINUX_MENU_LIVE_ENTRY: Set text to be used on the menu for live
-entries. (see syslinux)
-
-_* LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: Set text to be used on the menu for
-live entries (failsafe ones). (see syslinux)
-
-_* LH_SYSLINUX_MENU_MEMTEST_ENTRY: Set text to be used on the menu for
-memtest entry. (see syslinux and memtest)
-
-_* LH_USERNAME: Set username. (see the-live-user)
-
-2~ The config/bootstrap file
-
-_* LH_ARCHITECTURE: Select chroot architecture. (see configuration layout)
-
-_* LH_BOOTSTRAP_CONFIG: Set distribution config directory. (see
-configuration layout)
-
-_* LH_BOOTSTRAP_INCLUDE: Include packages on base. (see configuration
-layout)
-
-_* LH_BOOTSTRAP_EXCLUDE: Exclude packages on base. (see configuration
-layout)
-
-_* LH_BOOTSTRAP_FLAVOUR: Select flavour to use. (see configuration layout)
-
-_* LH_BOOTSTRAP_KEYRING: Set distribution keyring. (see configuration
-layout)
-
-_* LH_DISTRIBUTION: Select distribution to use. (see configuration layout)
-
-_* LH_MIRROR_BOOTSTRAP: Set mirror to bootstrap from. (see package-sources)
-
-_* LH_MIRROR_CHROOT: Set mirror to fetch packages from. (see
-package-sources)
-
-_* LH_MIRROR_CHROOT_SECURITY: Set security mirror to fetch packages
-from. (see package-sources)
-
-_* LH_MIRROR_BINARY: Set mirror which ends up in the image. (see
-package-sources)
-
-_* LH_MIRROR_BINARY_SECURITY: Set security mirror which ends up in the
-image. (see package-sources)
-
-_* LH_SECTIONS: select section(s) to use. (see package-sources)
-
-2~ The config/chroot file
-
-_* LH_CHROOT_FILESYSTEM: Set chroot filesystem. (see configuration layout)
-
-_* LH_UNION_FILESYSTEM: Set union filesystem. (see configuration layout)
-
-_* LH_EXPOSED_ROOT: expose root as read only. (see configuration layout)
-
-_* LH_HOOKS: Set hook commands.
-
-_* LH_INTERACTIVE: Set interactive build. (see configuration layout)
-
-_* LH_KEYRING_PACKAGES: Set keyring packages. (see configuration layout)
-
-_* LH_LANGUAGE: Set language to use. (see l10n)
-
-_* LH_LINUX_FLAVOURS: Set kernel flavour to use. (see kernel)
-
-_* LH_LINUX_PACKAGES: Set kernel packages to use. (see kernel)
-
-_* LH_PACKAGES: Set packages to install. (see packages)
-
-_* LH_PACKAGES_LISTS: Set package list to install. (see packages-lists)
-
-_* LH_TASKS: Set tasks to install. (see tasks)
-
-_* LH_SECURITY: enable security updates. (see package-sources)
-
-_* LH_SYMLINKS: enable symlink convertion.
-
-_* LH_SYSVINIT: enable sysvinit. (see startup-scripts)
-
-2~ The config/common file
-
-_* LH_APT: Set package manager. (see package-installation)
-
-_* LH_APT_FTP_PROXY: Set apt/aptitude ftp proxy. (see package-installation)
-
-_* LH_APT_HTTP_PROXY: Set apt/aptitude http proxy. (see
-package-installation)
-
-_* LH_APT_PDIFFS: Set apt/aptitude pdiff indices. (see package-installation)
-
-_* LH_APT_PIPELINE: Set apt/aptitude pipeline depth. (see
-package-installation)
-
-_* LH_APT_RECOMMENDS: Set apt/aptitude recommends. (see
-package-installation)
-
-_* LH_APT_SECURE: Set apt/aptitude security. (see package-installation)
-
-_* LH_BOOTSTRAP: Set bootstrap program. (see configuration layout)
-
-_* LH_CACHE: control cache. (see configuration layout)
-
-_* LH_CACHE_INDICES: control if downloaded package indices should be
-cached. (see configuration layout)
-
-_* LH_CACHE_PACKAGES: control if downloaded packages files should be
-cached. (see configuration layout)
-
-_* LH_CACHE_STAGES: control if completed stages should be cached. (see
-configuration layout)
-
-_* LH_DEBCONF_FRONTEND: Set debconf(1) frontend to use. (see configuration
-layout)
-
-_* LH_DEBCONF_NOWARNINGS: Set debconf(1) warnings. (see configuration
-layout)
-
-_* LH_DEBCONF_PRIORITY: Set debconf(1) priority to use. (see configuration
-layout)
-
-_* LH_INITRAMFS: Set initramfs hook. (see configuration layout)
-
-_* LH_FDISK: Set fdisk program. (see configuration layout)
-
-_* LH_LOSETUP: Set losetup program. (see configuration layout)
-
-_* LH_MODE: Set distribution mode. (see configuration layout)
-
-_* LH_ROOT_COMMAND: use sudo or equivalent. (see configuration layout)
-
-_* LH_USE_FAKEROOT: use fakeroot/fakechroot. (see configuration layout)
-
-_* LH_TASKSEL: Set tasksel program. (see tasks)
-
-_* LH_INCLUDES: Set includes. (see configuration layout)
-
-_* LH_TEMPLATES: Set templates. (see configuration layout)
-
-_* LH_BREAKPOINTS: enable breakpoints. (see configuration layout)
-
-_* LH_DEBUG: enable debug. (see configuration layout)
-
-_* LH_FORCE: enable force. (see configuration layout)
-
-_* LH_QUIET: enable quiet. (see configuration layout)
-
-_* LH_VERBOSE: enable verbose. (see configuration layout)
-
-2~ The config/source file
-
-_* LH_SOURCE: Set source option. (see configuration layout)
-
-_* LH_SOURCE_IMAGES: Set image type. (see configuration layout)
diff --git a/manual/en/project_coding-style.ssi b/manual/de/project_coding-style.ssi
similarity index 85%
copy from manual/en/project_coding-style.ssi
copy to manual/de/project_coding-style.ssi
index 9ef5507..a0e5959 100644
--- a/manual/en/project_coding-style.ssi
+++ b/manual/de/project_coding-style.ssi
@@ -6,7 +6,8 @@ This chapter documents the coding style used in live-boot and others.
2~ Compatibility
-_* Don't use syntax or semantics that are unique to the Bash shell. For example, the use of array constructs.
+_* Don't use syntax or semantics that are unique to the Bash shell. For
+example, the use of array constructs.
_* Only use the POSIX subset - for example, use $(foo) over `foo`.
@@ -72,19 +73,23 @@ _* Variables are always in capital letters.
_* Variables that used in lb config always start with LH_ prefix.
-_* Internal temporary variables in live-build should start with the _LH_ prefix.
+_* Internal temporary variables in live-build should start with the _LH_
+prefix.
_* Local variables start with live-build __LH_ prefix.
-_* Variables in connection to a boot parameter in live-config start with LIVE_.
+_* Variables in connection to a boot parameter in live-config start with
+LIVE_.
_* All other variables in live-config start with _ prefix.
_* Use braces around variables; eg. write ${FOO} instead of $FOO.
-_* Always protect variables with quotes to respect potential whitespaces, write "${FOO}" not ${FOO}.
+_* Always protect variables with quotes to respect potential whitespaces,
+write "${FOO}" not ${FOO}.
-_* For consistency reasons, always use quotes when assigning values to variables:
+_* For consistency reasons, always use quotes when assigning values to
+variables:
Bad:
@@ -128,8 +133,11 @@ fi
2~ Miscellaneous
-_* Use "|" (without the surround quotes) as a seperator in calls to sed, e.g. "sed -e 's|foo|bar|'" (without "").
+_* Use "|" (without the surround quotes) as a seperator in calls to sed,
+e.g. "sed -e 's|foo|bar|'" (without "").
-_* Don't use the test command for comparisons or tests, use "[" "]" (without ""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".
+_* Don't use the test command for comparisons or tests, use "[" "]" (without
+""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".
-_* Use case wherever possible over test, as it's easier to read and faster in execution.
+_* Use case wherever possible over test, as it's easier to read and faster
+in execution.
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index e1302b7..88961a4 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -84,5 +84,3 @@ been reviewed.
% << other_resources.ssi
% << other_configuration-layout.ssi
-
-% << other_configuration-files.ssi
diff --git a/manual/en/other_configuration-files.ssi b/manual/en/other_configuration-files.ssi
deleted file mode 100644
index e342a0c..0000000
--- a/manual/en/other_configuration-files.ssi
+++ /dev/null
@@ -1,203 +0,0 @@
-B~ Configuration files
-
-1~ Configuration files
-
-2~ The config/binary file
-
-_* LH_BINARY_FILESYSTEM: Set image filesystem. (see configuration-layout)
-
-_* LH_BINARY_IMAGES: Set image type. (see configuration-layout)
-
-_* LH_BINARY_INDICES: Set apt/aptitude generic indices. (see configuration-layout)
-
-_* LH_BOOTAPPEND_LIVE: Set boot parameters. (see configuration-layout)
-
-_* LH_BOOTAPPEND_INSTALL: Set boot parameters. (see configuration-layout)
-
-_* LH_BOOTLOADER: Set bootloader. (see bootloaders)
-
-_* LH_CHECKSUMS: Set checksums. (see cheat-codes)
-
-_* LH_CHROOT_BUILD: Control if we build binary images chrooted. (see configuration-layout)
-
-_* LH_DEBIAN_INSTALLER: Set debian-installer. (see debian-installer)
-
-_* LH_DEBIAN_INSTALLER_DAILY: Set daily images. (see debian-installer)
-
-_* LH_ENCRYPTION: Set encrytion. (see configuration layout)
-
-_* LH_GRUB_SPLASH: Set custom grub splash. (see splash-screen)
-
-_* LH_HOSTNAME: Set hostname. (see hostname)
-
-_* LH_ISO_APPLICATION: Set iso author. (see iso-metadata)
-
-_* LH_ISO_PREPARER: Set iso preparer. (see iso-metadata)
-
-_* LH_ISO_PUBLISHER: Set iso publisher. (see iso-metadata)
-
-_* LH_ISO_VOLUME: Set iso volume (max 32 chars). (see iso-metadata)
-
-_* LH_JFFS2_ERASEBLOCK: Set jffs2 eraseblock size. (see configuration layout)
-
-_* LH_MEMTEST: Set memtest. (see memtest)
-
-_* LH_NET_ROOT_FILESYSTEM: Set netboot filesystem. (see configuration layout)
-
-_* LH_NET_ROOT_MOUNTOPTIONS: Set nfsopts. (see configuration layout)
-
-_* LH_NET_ROOT_PATH: Set netboot server directory. (see configuration layout)
-
-_* LH_NET_ROOT_SERVER: Set netboot server address. (see configuration layout)
-
-_* LH_NET_COW_FILESYSTEM: Set net client cow filesystem. (see configuration layout)
-
-_* LH_NET_COW_MOUNTOPTIONS: Set cow mount options. (see configuration layout)
-
-_* LH_NET_COW_PATH: Set cow directory. (see configuration layout)
-
-_* LH_NET_COW_SERVER: Set cow server. (see configuration layout)
-
-_* LH_NET_TARBALL: Set net tarball. (see configuration layout)
-
-_* LH_SYSLINUX_SPLASH: Set custom syslinux splash. (see splash-screen)
-
-_* LH_SYSLINUX_TIMEOUT: Set custom syslinux timeout in seconds. (see syslinux)
-
-_* LH_SYSLINUX_CFG: Set custom syslinux configuration file. (see syslinux)
-
-_* LH_SYSLINUX_MENU: Set syslinux menu. (see syslinux)
-
-_* LH_SYSLINUX_MENU_LIVE_ENTRY: Set text to be used on the menu for live entries. (see syslinux)
-
-_* LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: Set text to be used on the menu for live entries (failsafe ones). (see syslinux)
-
-_* LH_SYSLINUX_MENU_MEMTEST_ENTRY: Set text to be used on the menu for memtest entry. (see syslinux and memtest)
-
-_* LH_USERNAME: Set username. (see the-live-user)
-
-2~ The config/bootstrap file
-
-_* LH_ARCHITECTURE: Select chroot architecture. (see configuration layout)
-
-_* LH_BOOTSTRAP_CONFIG: Set distribution config directory. (see configuration layout)
-
-_* LH_BOOTSTRAP_INCLUDE: Include packages on base. (see configuration layout)
-
-_* LH_BOOTSTRAP_EXCLUDE: Exclude packages on base. (see configuration layout)
-
-_* LH_BOOTSTRAP_FLAVOUR: Select flavour to use. (see configuration layout)
-
-_* LH_BOOTSTRAP_KEYRING: Set distribution keyring. (see configuration layout)
-
-_* LH_DISTRIBUTION: Select distribution to use. (see configuration layout)
-
-_* LH_MIRROR_BOOTSTRAP: Set mirror to bootstrap from. (see package-sources)
-
-_* LH_MIRROR_CHROOT: Set mirror to fetch packages from. (see package-sources)
-
-_* LH_MIRROR_CHROOT_SECURITY: Set security mirror to fetch packages from. (see package-sources)
-
-_* LH_MIRROR_BINARY: Set mirror which ends up in the image. (see package-sources)
-
-_* LH_MIRROR_BINARY_SECURITY: Set security mirror which ends up in the image. (see package-sources)
-
-_* LH_SECTIONS: select section(s) to use. (see package-sources)
-
-2~ The config/chroot file
-
-_* LH_CHROOT_FILESYSTEM: Set chroot filesystem. (see configuration layout)
-
-_* LH_UNION_FILESYSTEM: Set union filesystem. (see configuration layout)
-
-_* LH_EXPOSED_ROOT: expose root as read only. (see configuration layout)
-
-_* LH_HOOKS: Set hook commands.
-
-_* LH_INTERACTIVE: Set interactive build. (see configuration layout)
-
-_* LH_KEYRING_PACKAGES: Set keyring packages. (see configuration layout)
-
-_* LH_LANGUAGE: Set language to use. (see l10n)
-
-_* LH_LINUX_FLAVOURS: Set kernel flavour to use. (see kernel)
-
-_* LH_LINUX_PACKAGES: Set kernel packages to use. (see kernel)
-
-_* LH_PACKAGES: Set packages to install. (see packages)
-
-_* LH_PACKAGES_LISTS: Set package list to install. (see packages-lists)
-
-_* LH_TASKS: Set tasks to install. (see tasks)
-
-_* LH_SECURITY: enable security updates. (see package-sources)
-
-_* LH_SYMLINKS: enable symlink convertion.
-
-_* LH_SYSVINIT: enable sysvinit. (see startup-scripts)
-
-2~ The config/common file
-
-_* LH_APT: Set package manager. (see package-installation)
-
-_* LH_APT_FTP_PROXY: Set apt/aptitude ftp proxy. (see package-installation)
-
-_* LH_APT_HTTP_PROXY: Set apt/aptitude http proxy. (see package-installation)
-
-_* LH_APT_PDIFFS: Set apt/aptitude pdiff indices. (see package-installation)
-
-_* LH_APT_PIPELINE: Set apt/aptitude pipeline depth. (see package-installation)
-
-_* LH_APT_RECOMMENDS: Set apt/aptitude recommends. (see package-installation)
-
-_* LH_APT_SECURE: Set apt/aptitude security. (see package-installation)
-
-_* LH_BOOTSTRAP: Set bootstrap program. (see configuration layout)
-
-_* LH_CACHE: control cache. (see configuration layout)
-
-_* LH_CACHE_INDICES: control if downloaded package indices should be cached. (see configuration layout)
-
-_* LH_CACHE_PACKAGES: control if downloaded packages files should be cached. (see configuration layout)
-
-_* LH_CACHE_STAGES: control if completed stages should be cached. (see configuration layout)
-
-_* LH_DEBCONF_FRONTEND: Set debconf(1) frontend to use. (see configuration layout)
-
-_* LH_DEBCONF_NOWARNINGS: Set debconf(1) warnings. (see configuration layout)
-
-_* LH_DEBCONF_PRIORITY: Set debconf(1) priority to use. (see configuration layout)
-
-_* LH_INITRAMFS: Set initramfs hook. (see configuration layout)
-
-_* LH_FDISK: Set fdisk program. (see configuration layout)
-
-_* LH_LOSETUP: Set losetup program. (see configuration layout)
-
-_* LH_MODE: Set distribution mode. (see configuration layout)
-
-_* LH_ROOT_COMMAND: use sudo or equivalent. (see configuration layout)
-
-_* LH_USE_FAKEROOT: use fakeroot/fakechroot. (see configuration layout)
-
-_* LH_TASKSEL: Set tasksel program. (see tasks)
-
-_* LH_INCLUDES: Set includes. (see configuration layout)
-
-_* LH_TEMPLATES: Set templates. (see configuration layout)
-
-_* LH_BREAKPOINTS: enable breakpoints. (see configuration layout)
-
-_* LH_DEBUG: enable debug. (see configuration layout)
-
-_* LH_FORCE: enable force. (see configuration layout)
-
-_* LH_QUIET: enable quiet. (see configuration layout)
-
-_* LH_VERBOSE: enable verbose. (see configuration layout)
-
-2~ The config/source file
-
-_* LH_SOURCE: Set source option. (see configuration layout)
-
-_* LH_SOURCE_IMAGES: Set image type. (see configuration layout)
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index d2ba330..1a76eec 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -84,5 +84,3 @@ only after it has been reviewed.
% << other_resources.ssi
% << other_configuration-layout.ssi
-
-% << other_configuration-files.ssi
diff --git a/manual/fr/other_configuration-files.ssi b/manual/fr/other_configuration-files.ssi
deleted file mode 100644
index 9a687e5..0000000
--- a/manual/fr/other_configuration-files.ssi
+++ /dev/null
@@ -1,232 +0,0 @@
-B~ Configuration files
-
-1~ Configuration files
-
-2~ The config/binary file
-
-_* LH_BINARY_FILESYSTEM: Set image filesystem. (see configuration-layout)
-
-_* LH_BINARY_IMAGES: Set image type. (see configuration-layout)
-
-_* LH_BINARY_INDICES: Set apt/aptitude generic indices. (see
-configuration-layout)
-
-_* LH_BOOTAPPEND_LIVE: Set boot parameters. (see configuration-layout)
-
-_* LH_BOOTAPPEND_INSTALL: Set boot parameters. (see configuration-layout)
-
-_* LH_BOOTLOADER: Set bootloader. (see bootloaders)
-
-_* LH_CHECKSUMS: Set checksums. (see cheat-codes)
-
-_* LH_CHROOT_BUILD: Control if we build binary images chrooted. (see
-configuration-layout)
-
-_* LH_DEBIAN_INSTALLER: Set debian-installer. (see debian-installer)
-
-_* LH_DEBIAN_INSTALLER_DAILY: Set daily images. (see debian-installer)
-
-_* LH_ENCRYPTION: Set encrytion. (see configuration layout)
-
-_* LH_GRUB_SPLASH: Set custom grub splash. (see splash-screen)
-
-_* LH_HOSTNAME: Set hostname. (see hostname)
-
-_* LH_ISO_APPLICATION: Set iso author. (see iso-metadata)
-
-_* LH_ISO_PREPARER: Set iso preparer. (see iso-metadata)
-
-_* LH_ISO_PUBLISHER: Set iso publisher. (see iso-metadata)
-
-_* LH_ISO_VOLUME: Set iso volume (max 32 chars). (see iso-metadata)
-
-_* LH_JFFS2_ERASEBLOCK: Set jffs2 eraseblock size. (see configuration
-layout)
-
-_* LH_MEMTEST: Set memtest. (see memtest)
-
-_* LH_NET_ROOT_FILESYSTEM: Set netboot filesystem. (see configuration
-layout)
-
-_* LH_NET_ROOT_MOUNTOPTIONS: Set nfsopts. (see configuration layout)
-
-_* LH_NET_ROOT_PATH: Set netboot server directory. (see configuration
-layout)
-
-_* LH_NET_ROOT_SERVER: Set netboot server address. (see configuration
-layout)
-
-_* LH_NET_COW_FILESYSTEM: Set net client cow filesystem. (see configuration
-layout)
-
-_* LH_NET_COW_MOUNTOPTIONS: Set cow mount options. (see configuration
-layout)
-
-_* LH_NET_COW_PATH: Set cow directory. (see configuration layout)
-
-_* LH_NET_COW_SERVER: Set cow server. (see configuration layout)
-
-_* LH_NET_TARBALL: Set net tarball. (see configuration layout)
-
-_* LH_SYSLINUX_SPLASH: Set custom syslinux splash. (see splash-screen)
-
-_* LH_SYSLINUX_TIMEOUT: Set custom syslinux timeout in seconds. (see
-syslinux)
-
-_* LH_SYSLINUX_CFG: Set custom syslinux configuration file. (see syslinux)
-
-_* LH_SYSLINUX_MENU: Set syslinux menu. (see syslinux)
-
-_* LH_SYSLINUX_MENU_LIVE_ENTRY: Set text to be used on the menu for live
-entries. (see syslinux)
-
-_* LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: Set text to be used on the menu for
-live entries (failsafe ones). (see syslinux)
-
-_* LH_SYSLINUX_MENU_MEMTEST_ENTRY: Set text to be used on the menu for
-memtest entry. (see syslinux and memtest)
-
-_* LH_USERNAME: Set username. (see the-live-user)
-
-2~ The config/bootstrap file
-
-_* LH_ARCHITECTURE: Select chroot architecture. (see configuration layout)
-
-_* LH_BOOTSTRAP_CONFIG: Set distribution config directory. (see
-configuration layout)
-
-_* LH_BOOTSTRAP_INCLUDE: Include packages on base. (see configuration
-layout)
-
-_* LH_BOOTSTRAP_EXCLUDE: Exclude packages on base. (see configuration
-layout)
-
-_* LH_BOOTSTRAP_FLAVOUR: Select flavour to use. (see configuration layout)
-
-_* LH_BOOTSTRAP_KEYRING: Set distribution keyring. (see configuration
-layout)
-
-_* LH_DISTRIBUTION: Select distribution to use. (see configuration layout)
-
-_* LH_MIRROR_BOOTSTRAP: Set mirror to bootstrap from. (see package-sources)
-
-_* LH_MIRROR_CHROOT: Set mirror to fetch packages from. (see
-package-sources)
-
-_* LH_MIRROR_CHROOT_SECURITY: Set security mirror to fetch packages
-from. (see package-sources)
-
-_* LH_MIRROR_BINARY: Set mirror which ends up in the image. (see
-package-sources)
-
-_* LH_MIRROR_BINARY_SECURITY: Set security mirror which ends up in the
-image. (see package-sources)
-
-_* LH_SECTIONS: select section(s) to use. (see package-sources)
-
-2~ The config/chroot file
-
-_* LH_CHROOT_FILESYSTEM: Set chroot filesystem. (see configuration layout)
-
-_* LH_UNION_FILESYSTEM: Set union filesystem. (see configuration layout)
-
-_* LH_EXPOSED_ROOT: expose root as read only. (see configuration layout)
-
-_* LH_HOOKS: Set hook commands.
-
-_* LH_INTERACTIVE: Set interactive build. (see configuration layout)
-
-_* LH_KEYRING_PACKAGES: Set keyring packages. (see configuration layout)
-
-_* LH_LANGUAGE: Set language to use. (see l10n)
-
-_* LH_LINUX_FLAVOURS: Set kernel flavour to use. (see kernel)
-
-_* LH_LINUX_PACKAGES: Set kernel packages to use. (see kernel)
-
-_* LH_PACKAGES: Set packages to install. (see packages)
-
-_* LH_PACKAGES_LISTS: Set package list to install. (see packages-lists)
-
-_* LH_TASKS: Set tasks to install. (see tasks)
-
-_* LH_SECURITY: enable security updates. (see package-sources)
-
-_* LH_SYMLINKS: enable symlink convertion.
-
-_* LH_SYSVINIT: enable sysvinit. (see startup-scripts)
-
-2~ The config/common file
-
-_* LH_APT: Set package manager. (see package-installation)
-
-_* LH_APT_FTP_PROXY: Set apt/aptitude ftp proxy. (see package-installation)
-
-_* LH_APT_HTTP_PROXY: Set apt/aptitude http proxy. (see
-package-installation)
-
-_* LH_APT_PDIFFS: Set apt/aptitude pdiff indices. (see package-installation)
-
-_* LH_APT_PIPELINE: Set apt/aptitude pipeline depth. (see
-package-installation)
-
-_* LH_APT_RECOMMENDS: Set apt/aptitude recommends. (see
-package-installation)
-
-_* LH_APT_SECURE: Set apt/aptitude security. (see package-installation)
-
-_* LH_BOOTSTRAP: Set bootstrap program. (see configuration layout)
-
-_* LH_CACHE: control cache. (see configuration layout)
-
-_* LH_CACHE_INDICES: control if downloaded package indices should be
-cached. (see configuration layout)
-
-_* LH_CACHE_PACKAGES: control if downloaded packages files should be
-cached. (see configuration layout)
-
-_* LH_CACHE_STAGES: control if completed stages should be cached. (see
-configuration layout)
-
-_* LH_DEBCONF_FRONTEND: Set debconf(1) frontend to use. (see configuration
-layout)
-
-_* LH_DEBCONF_NOWARNINGS: Set debconf(1) warnings. (see configuration
-layout)
-
-_* LH_DEBCONF_PRIORITY: Set debconf(1) priority to use. (see configuration
-layout)
-
-_* LH_INITRAMFS: Set initramfs hook. (see configuration layout)
-
-_* LH_FDISK: Set fdisk program. (see configuration layout)
-
-_* LH_LOSETUP: Set losetup program. (see configuration layout)
-
-_* LH_MODE: Set distribution mode. (see configuration layout)
-
-_* LH_ROOT_COMMAND: use sudo or equivalent. (see configuration layout)
-
-_* LH_USE_FAKEROOT: use fakeroot/fakechroot. (see configuration layout)
-
-_* LH_TASKSEL: Set tasksel program. (see tasks)
-
-_* LH_INCLUDES: Set includes. (see configuration layout)
-
-_* LH_TEMPLATES: Set templates. (see configuration layout)
-
-_* LH_BREAKPOINTS: enable breakpoints. (see configuration layout)
-
-_* LH_DEBUG: enable debug. (see configuration layout)
-
-_* LH_FORCE: enable force. (see configuration layout)
-
-_* LH_QUIET: enable quiet. (see configuration layout)
-
-_* LH_VERBOSE: enable verbose. (see configuration layout)
-
-2~ The config/source file
-
-_* LH_SOURCE: Set source option. (see configuration layout)
-
-_* LH_SOURCE_IMAGES: Set image type. (see configuration layout)
diff --git a/manual/en/project_coding-style.ssi b/manual/fr/project_coding-style.ssi
similarity index 85%
copy from manual/en/project_coding-style.ssi
copy to manual/fr/project_coding-style.ssi
index 9ef5507..a0e5959 100644
--- a/manual/en/project_coding-style.ssi
+++ b/manual/fr/project_coding-style.ssi
@@ -6,7 +6,8 @@ This chapter documents the coding style used in live-boot and others.
2~ Compatibility
-_* Don't use syntax or semantics that are unique to the Bash shell. For example, the use of array constructs.
+_* Don't use syntax or semantics that are unique to the Bash shell. For
+example, the use of array constructs.
_* Only use the POSIX subset - for example, use $(foo) over `foo`.
@@ -72,19 +73,23 @@ _* Variables are always in capital letters.
_* Variables that used in lb config always start with LH_ prefix.
-_* Internal temporary variables in live-build should start with the _LH_ prefix.
+_* Internal temporary variables in live-build should start with the _LH_
+prefix.
_* Local variables start with live-build __LH_ prefix.
-_* Variables in connection to a boot parameter in live-config start with LIVE_.
+_* Variables in connection to a boot parameter in live-config start with
+LIVE_.
_* All other variables in live-config start with _ prefix.
_* Use braces around variables; eg. write ${FOO} instead of $FOO.
-_* Always protect variables with quotes to respect potential whitespaces, write "${FOO}" not ${FOO}.
+_* Always protect variables with quotes to respect potential whitespaces,
+write "${FOO}" not ${FOO}.
-_* For consistency reasons, always use quotes when assigning values to variables:
+_* For consistency reasons, always use quotes when assigning values to
+variables:
Bad:
@@ -128,8 +133,11 @@ fi
2~ Miscellaneous
-_* Use "|" (without the surround quotes) as a seperator in calls to sed, e.g. "sed -e 's|foo|bar|'" (without "").
+_* Use "|" (without the surround quotes) as a seperator in calls to sed,
+e.g. "sed -e 's|foo|bar|'" (without "").
-_* Don't use the test command for comparisons or tests, use "[" "]" (without ""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".
+_* Don't use the test command for comparisons or tests, use "[" "]" (without
+""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".
-_* Use case wherever possible over test, as it's easier to read and faster in execution.
+_* Use case wherever possible over test, as it's easier to read and faster
+in execution.
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 2992673..51e8551 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-30 11:05+0100\n"
+"POT-Creation-Date: 2010-11-30 11:08+0100\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -220,11 +220,6 @@ msgid "% << other_resources.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:87
+#: en/live-manual.ssm:86
msgid "% << other_configuration-layout.ssi"
msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:88
-msgid "% << other_configuration-files.ssi"
-msgstr ""
diff --git a/manual/po/de/other_configuration-files.ssi.po b/manual/po/de/other_configuration-files.ssi.po
deleted file mode 100644
index 8c1ca55..0000000
--- a/manual/po/de/other_configuration-files.ssi.po
+++ /dev/null
@@ -1,586 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:2
-msgid "B~ Configuration files"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:4
-msgid "1~ Configuration files"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:6
-msgid "2~ The config/binary file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:8
-msgid ""
-"_* LH_BINARY_FILESYSTEM: Set image filesystem. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:10
-msgid "_* LH_BINARY_IMAGES: Set image type. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:12
-msgid ""
-"_* LH_BINARY_INDICES: Set apt/aptitude generic indices. (see configuration-"
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:14
-msgid "_* LH_BOOTAPPEND_LIVE: Set boot parameters. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:16
-msgid ""
-"_* LH_BOOTAPPEND_INSTALL: Set boot parameters. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:18
-msgid "_* LH_BOOTLOADER: Set bootloader. (see bootloaders)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:20
-msgid "_* LH_CHECKSUMS: Set checksums. (see cheat-codes)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:22
-msgid ""
-"_* LH_CHROOT_BUILD: Control if we build binary images chrooted. (see "
-"configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:24
-msgid "_* LH_DEBIAN_INSTALLER: Set debian-installer. (see debian-installer)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:26
-msgid "_* LH_DEBIAN_INSTALLER_DAILY: Set daily images. (see debian-installer)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:28
-msgid "_* LH_ENCRYPTION: Set encrytion. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:30
-msgid "_* LH_GRUB_SPLASH: Set custom grub splash. (see splash-screen)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:32
-msgid "_* LH_HOSTNAME: Set hostname. (see hostname)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:34
-msgid "_* LH_ISO_APPLICATION: Set iso author. (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:36
-msgid "_* LH_ISO_PREPARER: Set iso preparer. (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:38
-msgid "_* LH_ISO_PUBLISHER: Set iso publisher. (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:40
-msgid "_* LH_ISO_VOLUME: Set iso volume (max 32 chars). (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:42
-msgid ""
-"_* LH_JFFS2_ERASEBLOCK: Set jffs2 eraseblock size. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:44
-msgid "_* LH_MEMTEST: Set memtest. (see memtest)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:46
-msgid ""
-"_* LH_NET_ROOT_FILESYSTEM: Set netboot filesystem. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:48
-msgid "_* LH_NET_ROOT_MOUNTOPTIONS: Set nfsopts. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:50
-msgid ""
-"_* LH_NET_ROOT_PATH: Set netboot server directory. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:52
-msgid ""
-"_* LH_NET_ROOT_SERVER: Set netboot server address. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:54
-msgid ""
-"_* LH_NET_COW_FILESYSTEM: Set net client cow filesystem. (see configuration "
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:56
-msgid ""
-"_* LH_NET_COW_MOUNTOPTIONS: Set cow mount options. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:58
-msgid "_* LH_NET_COW_PATH: Set cow directory. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:60
-msgid "_* LH_NET_COW_SERVER: Set cow server. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:62
-msgid "_* LH_NET_TARBALL: Set net tarball. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:64
-msgid "_* LH_SYSLINUX_SPLASH: Set custom syslinux splash. (see splash-screen)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:66
-msgid ""
-"_* LH_SYSLINUX_TIMEOUT: Set custom syslinux timeout in seconds. (see "
-"syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:68
-msgid ""
-"_* LH_SYSLINUX_CFG: Set custom syslinux configuration file. (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:70
-msgid "_* LH_SYSLINUX_MENU: Set syslinux menu. (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:72
-msgid ""
-"_* LH_SYSLINUX_MENU_LIVE_ENTRY: Set text to be used on the menu for live "
-"entries. (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:74
-msgid ""
-"_* LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: Set text to be used on the menu for "
-"live entries (failsafe ones). (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:76
-msgid ""
-"_* LH_SYSLINUX_MENU_MEMTEST_ENTRY: Set text to be used on the menu for "
-"memtest entry. (see syslinux and memtest)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:78
-msgid "_* LH_USERNAME: Set username. (see the-live-user)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:80
-msgid "2~ The config/bootstrap file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:82
-msgid ""
-"_* LH_ARCHITECTURE: Select chroot architecture. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:84
-msgid ""
-"_* LH_BOOTSTRAP_CONFIG: Set distribution config directory. (see "
-"configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:86
-msgid ""
-"_* LH_BOOTSTRAP_INCLUDE: Include packages on base. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:88
-msgid ""
-"_* LH_BOOTSTRAP_EXCLUDE: Exclude packages on base. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:90
-msgid ""
-"_* LH_BOOTSTRAP_FLAVOUR: Select flavour to use. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:92
-msgid ""
-"_* LH_BOOTSTRAP_KEYRING: Set distribution keyring. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:94
-msgid ""
-"_* LH_DISTRIBUTION: Select distribution to use. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:96
-msgid ""
-"_* LH_MIRROR_BOOTSTRAP: Set mirror to bootstrap from. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:98
-msgid ""
-"_* LH_MIRROR_CHROOT: Set mirror to fetch packages from. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:100
-msgid ""
-"_* LH_MIRROR_CHROOT_SECURITY: Set security mirror to fetch packages from. "
-"(see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:102
-msgid ""
-"_* LH_MIRROR_BINARY: Set mirror which ends up in the image. (see package-"
-"sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:104
-msgid ""
-"_* LH_MIRROR_BINARY_SECURITY: Set security mirror which ends up in the "
-"image. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:106
-msgid "_* LH_SECTIONS: select section(s) to use. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:108
-msgid "2~ The config/chroot file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:110
-msgid ""
-"_* LH_CHROOT_FILESYSTEM: Set chroot filesystem. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:112
-msgid ""
-"_* LH_UNION_FILESYSTEM: Set union filesystem. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:114
-msgid ""
-"_* LH_EXPOSED_ROOT: expose root as read only. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:116
-msgid "_* LH_HOOKS: Set hook commands."
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:118
-msgid "_* LH_INTERACTIVE: Set interactive build. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:120
-msgid ""
-"_* LH_KEYRING_PACKAGES: Set keyring packages. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:122
-msgid "_* LH_LANGUAGE: Set language to use. (see l10n)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:124
-msgid "_* LH_LINUX_FLAVOURS: Set kernel flavour to use. (see kernel)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:126
-msgid "_* LH_LINUX_PACKAGES: Set kernel packages to use. (see kernel)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:128
-msgid "_* LH_PACKAGES: Set packages to install. (see packages)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:130
-msgid "_* LH_PACKAGES_LISTS: Set package list to install. (see packages-lists)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:132
-msgid "_* LH_TASKS: Set tasks to install. (see tasks)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:134
-msgid "_* LH_SECURITY: enable security updates. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:136
-msgid "_* LH_SYMLINKS: enable symlink convertion."
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:138
-msgid "_* LH_SYSVINIT: enable sysvinit. (see startup-scripts)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:140
-msgid "2~ The config/common file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:142
-msgid "_* LH_APT: Set package manager. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:144
-msgid ""
-"_* LH_APT_FTP_PROXY: Set apt/aptitude ftp proxy. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:146
-msgid ""
-"_* LH_APT_HTTP_PROXY: Set apt/aptitude http proxy. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:148
-msgid ""
-"_* LH_APT_PDIFFS: Set apt/aptitude pdiff indices. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:150
-msgid ""
-"_* LH_APT_PIPELINE: Set apt/aptitude pipeline depth. (see package-"
-"installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:152
-msgid ""
-"_* LH_APT_RECOMMENDS: Set apt/aptitude recommends. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:154
-msgid "_* LH_APT_SECURE: Set apt/aptitude security. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:156
-msgid "_* LH_BOOTSTRAP: Set bootstrap program. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:158
-msgid "_* LH_CACHE: control cache. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:160
-msgid ""
-"_* LH_CACHE_INDICES: control if downloaded package indices should be cached. "
-"(see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:162
-msgid ""
-"_* LH_CACHE_PACKAGES: control if downloaded packages files should be cached. "
-"(see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:164
-msgid ""
-"_* LH_CACHE_STAGES: control if completed stages should be cached. (see "
-"configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:166
-msgid ""
-"_* LH_DEBCONF_FRONTEND: Set debconf(1) frontend to use. (see configuration "
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:168
-msgid ""
-"_* LH_DEBCONF_NOWARNINGS: Set debconf(1) warnings. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:170
-msgid ""
-"_* LH_DEBCONF_PRIORITY: Set debconf(1) priority to use. (see configuration "
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:172
-msgid "_* LH_INITRAMFS: Set initramfs hook. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:174
-msgid "_* LH_FDISK: Set fdisk program. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:176
-msgid "_* LH_LOSETUP: Set losetup program. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:178
-msgid "_* LH_MODE: Set distribution mode. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:180
-msgid "_* LH_ROOT_COMMAND: use sudo or equivalent. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:182
-msgid "_* LH_USE_FAKEROOT: use fakeroot/fakechroot. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:184
-msgid "_* LH_TASKSEL: Set tasksel program. (see tasks)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:186
-msgid "_* LH_INCLUDES: Set includes. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:188
-msgid "_* LH_TEMPLATES: Set templates. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:190
-msgid "_* LH_BREAKPOINTS: enable breakpoints. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:192
-msgid "_* LH_DEBUG: enable debug. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:194
-msgid "_* LH_FORCE: enable force. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:196
-msgid "_* LH_QUIET: enable quiet. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:198
-msgid "_* LH_VERBOSE: enable verbose. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:200
-msgid "2~ The config/source file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:202
-msgid "_* LH_SOURCE: Set source option. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:203
-msgid "_* LH_SOURCE_IMAGES: Set image type. (see configuration layout)"
-msgstr ""
diff --git a/manual/po/de/project_procedures.ssi.po b/manual/po/de/project_coding-style.ssi.po
similarity index 55%
copy from manual/po/de/project_procedures.ssi.po
copy to manual/po/de/project_coding-style.ssi.po
index 54bc940..cd91efe 100644
--- a/manual/po/de/project_procedures.ssi.po
+++ b/manual/po/de/project_coding-style.ssi.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-30 10:35+0100\n"
-"PO-Revision-Date: 2010-11-30 10:35+0100\n"
+"POT-Creation-Date: 2010-11-30 11:05+0100\n"
+"PO-Revision-Date: 2010-11-30 11:05+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: de\n"
@@ -20,12 +20,7 @@ msgstr ""
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/about_manual.ssi:170 en/other_customization-bootup.ssi:30
#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
@@ -39,6 +34,10 @@ msgstr ""
#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
#: en/other_live-environment.ssi:133 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
@@ -87,25 +86,24 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/about_manual.ssi:173 en/other_customization-bootup.ssi:35
+#: en/other_customization-bootup.ssi:48 en/other_faq.ssi:37
+#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
+#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
+#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
+#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
+#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
+#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
@@ -151,296 +149,238 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:2
-msgid "B~ Procedures"
+#: en/project_coding-style.ssi:2
+msgid "B~ Coding Style"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:4
-msgid "1~ Procedures"
+#: en/project_coding-style.ssi:4
+msgid "1~ Coding Style"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:6
-msgid ""
-"This chapter documents the procedures within the Debian Live project for "
-"various tasks that need cooperation with other teams in Debian."
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:8
-msgid "2~ Udeb Uploads"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:10
-msgid "Before commiting releases of a udeb in d-i svn, one has to call:"
+#: en/project_coding-style.ssi:6
+msgid "This chapter documents the coding style used in live-boot and others."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:14
-msgid "../../scripts/l10n/output-l10n-changes . -d"
+#: en/project_coding-style.ssi:8
+msgid "2~ Compatibility"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:18
-msgid "2~ Major Releases"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:20
+#: en/project_coding-style.ssi:10
msgid ""
-"Releasing a new stable major version of Debian includes a lot of different "
-"teams working together to make it happen. At some point, the Live team comes "
-"in and builds live system images. The requirements to do this are:"
+"_* Don't use syntax or semantics that are unique to the Bash shell. For "
+"example, the use of array constructs."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:22
-msgid ""
-"_* A mirror containing the released versions for the debian, debian-security "
-"and debian-volatile archive which the debian-live buildd can access."
+#: en/project_coding-style.ssi:12
+msgid "_* Only use the POSIX subset - for example, use $(foo) over `foo`."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:24
-msgid ""
-"_* The names of the image need to be known (e.g. debian-live-VERSION-ARCH-"
-"FLAVOUR.iso)."
+#: en/project_coding-style.ssi:14
+msgid "_* You can check your scripts with 'sh -n' and 'checkbashisms'."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:26
-msgid "_* The packagelists need to have been updated."
+#: en/project_coding-style.ssi:16
+msgid "2~ Indenting"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:28
-msgid "_* The data from debian-cd needs to be synced (udeb exclude lists)."
+#: en/project_coding-style.ssi:18
+msgid "_* Always use tabs over spaces."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:30
-msgid ""
-"_* The includes from debian-cd needs to be synced (README.*, doc/*, etc.)."
+#: en/project_coding-style.ssi:20
+msgid "2~ Wrapping"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:32 en/project_procedures.ssi:38
-msgid "_* Images are built and mirrored on cdimage.debian.org."
+#: en/project_coding-style.ssi:22
+msgid "_* Generally, lines are 80 chars at maximum."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:34
-msgid "2~ Point Releases"
+#: en/project_coding-style.ssi:24
+msgid "_* Use the \"Linux style\" of line breaks:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:36
-msgid ""
-"_* Again, we need updated mirror of debian, debian-security and debian-"
-"volatile."
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:40
-msgid "_* Send announcement mail."
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:42
-msgid "3~ Point release announcement template"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:44
-msgid ""
-"An annoucement mail for point releases can be generated using the template "
-"below and the following command:"
+#: en/project_coding-style.ssi:26 en/project_coding-style.ssi:49
+#: en/project_coding-style.ssi:90 en/project_coding-style.ssi:108
+msgid "Bad:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:52
+#: en/project_coding-style.ssi:32
#, no-wrap
msgid ""
-"$ sed \\\n"
-" -e 's|%major%|5.0|g' \\\n"
-" -e 's|%minor%|5.0.2|g' \\\n"
-" -e 's|%codename%|lenny|g' \\\n"
-" -e 's|%release_mail%|2009/msg00007.html|g'\n"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:56
-msgid ""
-"Please check the mail carefully before sending and pass it to others for "
-"proof-reading."
+"if foo; then\n"
+" bar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:60
-msgid "Debian Live images for Debian GNU/Linux %major% updated"
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:59
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:119
+msgid "Good:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:64
+#: en/project_coding-style.ssi:43
+#, no-wrap
msgid ""
-"The Debian Live project is pleased to announce the availability of updated "
-"Live images for its stable distribution Debian GNU/Linux %major% (codename "
-"\"%codename%\")."
+"if foo\n"
+"then\n"
+" bar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:66
-msgid "The images are available for download at:"
+#: en/project_coding-style.ssi:47
+msgid "_* The same holds for functions:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:68
+#: en/project_coding-style.ssi:55
#, no-wrap
-msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:73
msgid ""
-"This update incorporates the changes made in the %minor% point release, "
-"which adds corrections for security problems to the stable release along "
-"with a few adjustments for serious problems. A full list of the changes may "
-"be viewed at:"
+"foo () {\n"
+" bar\n"
+"}\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:75
+#: en/project_coding-style.ssi:66
#, no-wrap
-msgid " <http://lists.debian.org/debian-announce/%release_mail%>\n"
+msgid ""
+"foo ()\n"
+"{\n"
+" bar\n"
+"}\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:77
-msgid "It also includes the following Live-specific changes:"
+#: en/project_coding-style.ssi:70
+msgid "2~ Variables"
msgstr ""
-#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
-msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
+#. type: Plain text
+#: en/project_coding-style.ssi:72
+msgid "_* Variables are always in capital letters."
msgstr ""
-#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
-msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
+#. type: Plain text
+#: en/project_coding-style.ssi:74
+msgid "_* Variables that used in lb config always start with LH_ prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:84
-#, no-wrap
+#: en/project_coding-style.ssi:76
msgid ""
-"URLs\n"
-"----\n"
+"_* Internal temporary variables in live-build should start with the _LH_ "
+"prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:87
-msgid "Download location of updated images:"
+#: en/project_coding-style.ssi:78
+msgid "_* Local variables start with live-build __LH_ prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:89
-#, no-wrap
-msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+#: en/project_coding-style.ssi:80
+msgid ""
+"_* Variables in connection to a boot parameter in live-config start with "
+"LIVE_."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:91
-#, fuzzy
-#| msgid "Debian Live Project"
-msgid "Debian Live project homepage:"
-msgstr "Debian Live Projekt"
-
-#. type: Plain text
-#: en/project_procedures.ssi:93
-#, no-wrap
-msgid " <http://live.debian.net/>\n"
+#: en/project_coding-style.ssi:82
+msgid "_* All other variables in live-config start with _ prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:95
-msgid "The current stable distribution:"
+#: en/project_coding-style.ssi:84
+msgid "_* Use braces around variables; eg. write ${FOO} instead of $FOO."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:97
-#, no-wrap
-msgid " <http://ftp.debian.org/debian/dists/stable>\n"
+#: en/project_coding-style.ssi:86
+msgid ""
+"_* Always protect variables with quotes to respect potential whitespaces, "
+"write \"${FOO}\" not ${FOO}."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:99
-msgid "stable distribution information (release notes, errata etc.):"
+#: en/project_coding-style.ssi:88
+msgid ""
+"_* For consistency reasons, always use quotes when assigning values to "
+"variables:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:101
-#, no-wrap
-msgid " <http://www.debian.org/releases/stable/>\n"
+#: en/project_coding-style.ssi:94
+msgid "FOO=bar"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:103
-msgid "Security announcements and information:"
+#: en/project_coding-style.ssi:102
+msgid "FOO=\"bar\""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:105
-#, no-wrap
-msgid " <http://www.debian.org/security/>\n"
+#: en/project_coding-style.ssi:106
+msgid "_* If multiple variables are used, quote the full expression:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:108
+#: en/project_coding-style.ssi:115
#, no-wrap
msgid ""
-"About Debian\n"
-"-------------\n"
+"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
+"then\n"
+" foobar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:113
+#: en/project_coding-style.ssi:126
+#, no-wrap
msgid ""
-"The Debian Project is an association of Free Software developers who "
-"volunteer their time and effort in order to produce the completely free "
-"operating system Debian GNU/Linux."
+"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
+"then\n"
+" foobar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:116
-#, no-wrap
-msgid ""
-"About Debian Live\n"
-"-----------------\n"
+#: en/project_coding-style.ssi:130
+msgid "2~ Miscellaneous"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:122
+#: en/project_coding-style.ssi:132
msgid ""
-"Debian Live is an official sub-project of Debian which produces Debian "
-"systems that do not require a classical installer. Images are available for "
-"CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem "
-"images for booting directly from the internet."
+"_* Use \"|\" (without the surround quotes) as a seperator in calls to sed, e."
+"g. \"sed -e 's|foo|bar|'\" (without \"\")."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:125
-#, no-wrap
+#: en/project_coding-style.ssi:134
msgid ""
-"Contact Information\n"
-"-------------------\n"
+"_* Don't use the test command for comparisons or tests, use \"[\" "
+"\"]\" (without \"\"), e.g. \"if [ -x /bin/foo ]; ...\" and not \"if test -x /"
+"bin/foo; ...\"."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:130
+#: en/project_coding-style.ssi:135
msgid ""
-"For further information, please visit the Debian Live web pages at <http://"
-"live.debian.net/> or alternatively send mail to <debian-live at lists.debian."
-"org>."
+"_* Use case wherever possible over test, as it's easier to read and faster "
+"in execution."
msgstr ""
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index a396100..9c96519 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-30 11:05+0100\n"
+"POT-Creation-Date: 2010-11-30 11:08+0100\n"
"PO-Revision-Date: 2010-10-21 07:06-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -220,11 +220,6 @@ msgid "% << other_resources.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:87
+#: en/live-manual.ssm:86
msgid "% << other_configuration-layout.ssi"
msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:88
-msgid "% << other_configuration-files.ssi"
-msgstr ""
diff --git a/manual/po/fr/other_configuration-files.ssi.po b/manual/po/fr/other_configuration-files.ssi.po
deleted file mode 100644
index 0489d75..0000000
--- a/manual/po/fr/other_configuration-files.ssi.po
+++ /dev/null
@@ -1,586 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:2
-msgid "B~ Configuration files"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:4
-msgid "1~ Configuration files"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:6
-msgid "2~ The config/binary file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:8
-msgid ""
-"_* LH_BINARY_FILESYSTEM: Set image filesystem. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:10
-msgid "_* LH_BINARY_IMAGES: Set image type. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:12
-msgid ""
-"_* LH_BINARY_INDICES: Set apt/aptitude generic indices. (see configuration-"
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:14
-msgid "_* LH_BOOTAPPEND_LIVE: Set boot parameters. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:16
-msgid ""
-"_* LH_BOOTAPPEND_INSTALL: Set boot parameters. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:18
-msgid "_* LH_BOOTLOADER: Set bootloader. (see bootloaders)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:20
-msgid "_* LH_CHECKSUMS: Set checksums. (see cheat-codes)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:22
-msgid ""
-"_* LH_CHROOT_BUILD: Control if we build binary images chrooted. (see "
-"configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:24
-msgid "_* LH_DEBIAN_INSTALLER: Set debian-installer. (see debian-installer)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:26
-msgid "_* LH_DEBIAN_INSTALLER_DAILY: Set daily images. (see debian-installer)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:28
-msgid "_* LH_ENCRYPTION: Set encrytion. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:30
-msgid "_* LH_GRUB_SPLASH: Set custom grub splash. (see splash-screen)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:32
-msgid "_* LH_HOSTNAME: Set hostname. (see hostname)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:34
-msgid "_* LH_ISO_APPLICATION: Set iso author. (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:36
-msgid "_* LH_ISO_PREPARER: Set iso preparer. (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:38
-msgid "_* LH_ISO_PUBLISHER: Set iso publisher. (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:40
-msgid "_* LH_ISO_VOLUME: Set iso volume (max 32 chars). (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:42
-msgid ""
-"_* LH_JFFS2_ERASEBLOCK: Set jffs2 eraseblock size. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:44
-msgid "_* LH_MEMTEST: Set memtest. (see memtest)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:46
-msgid ""
-"_* LH_NET_ROOT_FILESYSTEM: Set netboot filesystem. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:48
-msgid "_* LH_NET_ROOT_MOUNTOPTIONS: Set nfsopts. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:50
-msgid ""
-"_* LH_NET_ROOT_PATH: Set netboot server directory. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:52
-msgid ""
-"_* LH_NET_ROOT_SERVER: Set netboot server address. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:54
-msgid ""
-"_* LH_NET_COW_FILESYSTEM: Set net client cow filesystem. (see configuration "
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:56
-msgid ""
-"_* LH_NET_COW_MOUNTOPTIONS: Set cow mount options. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:58
-msgid "_* LH_NET_COW_PATH: Set cow directory. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:60
-msgid "_* LH_NET_COW_SERVER: Set cow server. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:62
-msgid "_* LH_NET_TARBALL: Set net tarball. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:64
-msgid "_* LH_SYSLINUX_SPLASH: Set custom syslinux splash. (see splash-screen)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:66
-msgid ""
-"_* LH_SYSLINUX_TIMEOUT: Set custom syslinux timeout in seconds. (see "
-"syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:68
-msgid ""
-"_* LH_SYSLINUX_CFG: Set custom syslinux configuration file. (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:70
-msgid "_* LH_SYSLINUX_MENU: Set syslinux menu. (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:72
-msgid ""
-"_* LH_SYSLINUX_MENU_LIVE_ENTRY: Set text to be used on the menu for live "
-"entries. (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:74
-msgid ""
-"_* LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: Set text to be used on the menu for "
-"live entries (failsafe ones). (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:76
-msgid ""
-"_* LH_SYSLINUX_MENU_MEMTEST_ENTRY: Set text to be used on the menu for "
-"memtest entry. (see syslinux and memtest)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:78
-msgid "_* LH_USERNAME: Set username. (see the-live-user)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:80
-msgid "2~ The config/bootstrap file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:82
-msgid ""
-"_* LH_ARCHITECTURE: Select chroot architecture. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:84
-msgid ""
-"_* LH_BOOTSTRAP_CONFIG: Set distribution config directory. (see "
-"configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:86
-msgid ""
-"_* LH_BOOTSTRAP_INCLUDE: Include packages on base. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:88
-msgid ""
-"_* LH_BOOTSTRAP_EXCLUDE: Exclude packages on base. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:90
-msgid ""
-"_* LH_BOOTSTRAP_FLAVOUR: Select flavour to use. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:92
-msgid ""
-"_* LH_BOOTSTRAP_KEYRING: Set distribution keyring. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:94
-msgid ""
-"_* LH_DISTRIBUTION: Select distribution to use. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:96
-msgid ""
-"_* LH_MIRROR_BOOTSTRAP: Set mirror to bootstrap from. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:98
-msgid ""
-"_* LH_MIRROR_CHROOT: Set mirror to fetch packages from. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:100
-msgid ""
-"_* LH_MIRROR_CHROOT_SECURITY: Set security mirror to fetch packages from. "
-"(see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:102
-msgid ""
-"_* LH_MIRROR_BINARY: Set mirror which ends up in the image. (see package-"
-"sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:104
-msgid ""
-"_* LH_MIRROR_BINARY_SECURITY: Set security mirror which ends up in the "
-"image. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:106
-msgid "_* LH_SECTIONS: select section(s) to use. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:108
-msgid "2~ The config/chroot file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:110
-msgid ""
-"_* LH_CHROOT_FILESYSTEM: Set chroot filesystem. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:112
-msgid ""
-"_* LH_UNION_FILESYSTEM: Set union filesystem. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:114
-msgid ""
-"_* LH_EXPOSED_ROOT: expose root as read only. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:116
-msgid "_* LH_HOOKS: Set hook commands."
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:118
-msgid "_* LH_INTERACTIVE: Set interactive build. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:120
-msgid ""
-"_* LH_KEYRING_PACKAGES: Set keyring packages. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:122
-msgid "_* LH_LANGUAGE: Set language to use. (see l10n)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:124
-msgid "_* LH_LINUX_FLAVOURS: Set kernel flavour to use. (see kernel)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:126
-msgid "_* LH_LINUX_PACKAGES: Set kernel packages to use. (see kernel)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:128
-msgid "_* LH_PACKAGES: Set packages to install. (see packages)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:130
-msgid "_* LH_PACKAGES_LISTS: Set package list to install. (see packages-lists)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:132
-msgid "_* LH_TASKS: Set tasks to install. (see tasks)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:134
-msgid "_* LH_SECURITY: enable security updates. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:136
-msgid "_* LH_SYMLINKS: enable symlink convertion."
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:138
-msgid "_* LH_SYSVINIT: enable sysvinit. (see startup-scripts)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:140
-msgid "2~ The config/common file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:142
-msgid "_* LH_APT: Set package manager. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:144
-msgid ""
-"_* LH_APT_FTP_PROXY: Set apt/aptitude ftp proxy. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:146
-msgid ""
-"_* LH_APT_HTTP_PROXY: Set apt/aptitude http proxy. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:148
-msgid ""
-"_* LH_APT_PDIFFS: Set apt/aptitude pdiff indices. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:150
-msgid ""
-"_* LH_APT_PIPELINE: Set apt/aptitude pipeline depth. (see package-"
-"installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:152
-msgid ""
-"_* LH_APT_RECOMMENDS: Set apt/aptitude recommends. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:154
-msgid "_* LH_APT_SECURE: Set apt/aptitude security. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:156
-msgid "_* LH_BOOTSTRAP: Set bootstrap program. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:158
-msgid "_* LH_CACHE: control cache. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:160
-msgid ""
-"_* LH_CACHE_INDICES: control if downloaded package indices should be cached. "
-"(see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:162
-msgid ""
-"_* LH_CACHE_PACKAGES: control if downloaded packages files should be cached. "
-"(see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:164
-msgid ""
-"_* LH_CACHE_STAGES: control if completed stages should be cached. (see "
-"configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:166
-msgid ""
-"_* LH_DEBCONF_FRONTEND: Set debconf(1) frontend to use. (see configuration "
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:168
-msgid ""
-"_* LH_DEBCONF_NOWARNINGS: Set debconf(1) warnings. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:170
-msgid ""
-"_* LH_DEBCONF_PRIORITY: Set debconf(1) priority to use. (see configuration "
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:172
-msgid "_* LH_INITRAMFS: Set initramfs hook. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:174
-msgid "_* LH_FDISK: Set fdisk program. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:176
-msgid "_* LH_LOSETUP: Set losetup program. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:178
-msgid "_* LH_MODE: Set distribution mode. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:180
-msgid "_* LH_ROOT_COMMAND: use sudo or equivalent. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:182
-msgid "_* LH_USE_FAKEROOT: use fakeroot/fakechroot. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:184
-msgid "_* LH_TASKSEL: Set tasksel program. (see tasks)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:186
-msgid "_* LH_INCLUDES: Set includes. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:188
-msgid "_* LH_TEMPLATES: Set templates. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:190
-msgid "_* LH_BREAKPOINTS: enable breakpoints. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:192
-msgid "_* LH_DEBUG: enable debug. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:194
-msgid "_* LH_FORCE: enable force. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:196
-msgid "_* LH_QUIET: enable quiet. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:198
-msgid "_* LH_VERBOSE: enable verbose. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:200
-msgid "2~ The config/source file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:202
-msgid "_* LH_SOURCE: Set source option. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:203
-msgid "_* LH_SOURCE_IMAGES: Set image type. (see configuration layout)"
-msgstr ""
diff --git a/manual/po/fr/project_procedures.ssi.po b/manual/po/fr/project_coding-style.ssi.po
similarity index 55%
copy from manual/po/fr/project_procedures.ssi.po
copy to manual/po/fr/project_coding-style.ssi.po
index 6ff1b01..cdfe58b 100644
--- a/manual/po/fr/project_procedures.ssi.po
+++ b/manual/po/fr/project_coding-style.ssi.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-30 10:35+0100\n"
-"PO-Revision-Date: 2010-11-30 10:35+0100\n"
+"POT-Creation-Date: 2010-11-30 11:05+0100\n"
+"PO-Revision-Date: 2010-11-30 11:05+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: fr\n"
@@ -20,12 +20,7 @@ msgstr ""
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/about_manual.ssi:170 en/other_customization-bootup.ssi:30
#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
@@ -39,6 +34,10 @@ msgstr ""
#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
#: en/other_live-environment.ssi:133 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
@@ -87,25 +86,24 @@ msgstr "code{"
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/about_manual.ssi:173 en/other_customization-bootup.ssi:35
+#: en/other_customization-bootup.ssi:48 en/other_faq.ssi:37
+#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
+#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
+#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
+#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
+#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
+#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
@@ -151,296 +149,238 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/project_procedures.ssi:2
-msgid "B~ Procedures"
+#: en/project_coding-style.ssi:2
+msgid "B~ Coding Style"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:4
-msgid "1~ Procedures"
+#: en/project_coding-style.ssi:4
+msgid "1~ Coding Style"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:6
-msgid ""
-"This chapter documents the procedures within the Debian Live project for "
-"various tasks that need cooperation with other teams in Debian."
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:8
-msgid "2~ Udeb Uploads"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:10
-msgid "Before commiting releases of a udeb in d-i svn, one has to call:"
+#: en/project_coding-style.ssi:6
+msgid "This chapter documents the coding style used in live-boot and others."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:14
-msgid "../../scripts/l10n/output-l10n-changes . -d"
+#: en/project_coding-style.ssi:8
+msgid "2~ Compatibility"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:18
-msgid "2~ Major Releases"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:20
+#: en/project_coding-style.ssi:10
msgid ""
-"Releasing a new stable major version of Debian includes a lot of different "
-"teams working together to make it happen. At some point, the Live team comes "
-"in and builds live system images. The requirements to do this are:"
+"_* Don't use syntax or semantics that are unique to the Bash shell. For "
+"example, the use of array constructs."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:22
-msgid ""
-"_* A mirror containing the released versions for the debian, debian-security "
-"and debian-volatile archive which the debian-live buildd can access."
+#: en/project_coding-style.ssi:12
+msgid "_* Only use the POSIX subset - for example, use $(foo) over `foo`."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:24
-msgid ""
-"_* The names of the image need to be known (e.g. debian-live-VERSION-ARCH-"
-"FLAVOUR.iso)."
+#: en/project_coding-style.ssi:14
+msgid "_* You can check your scripts with 'sh -n' and 'checkbashisms'."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:26
-msgid "_* The packagelists need to have been updated."
+#: en/project_coding-style.ssi:16
+msgid "2~ Indenting"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:28
-msgid "_* The data from debian-cd needs to be synced (udeb exclude lists)."
+#: en/project_coding-style.ssi:18
+msgid "_* Always use tabs over spaces."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:30
-msgid ""
-"_* The includes from debian-cd needs to be synced (README.*, doc/*, etc.)."
+#: en/project_coding-style.ssi:20
+msgid "2~ Wrapping"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:32 en/project_procedures.ssi:38
-msgid "_* Images are built and mirrored on cdimage.debian.org."
+#: en/project_coding-style.ssi:22
+msgid "_* Generally, lines are 80 chars at maximum."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:34
-msgid "2~ Point Releases"
+#: en/project_coding-style.ssi:24
+msgid "_* Use the \"Linux style\" of line breaks:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:36
-msgid ""
-"_* Again, we need updated mirror of debian, debian-security and debian-"
-"volatile."
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:40
-msgid "_* Send announcement mail."
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:42
-msgid "3~ Point release announcement template"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:44
-msgid ""
-"An annoucement mail for point releases can be generated using the template "
-"below and the following command:"
+#: en/project_coding-style.ssi:26 en/project_coding-style.ssi:49
+#: en/project_coding-style.ssi:90 en/project_coding-style.ssi:108
+msgid "Bad:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:52
+#: en/project_coding-style.ssi:32
#, no-wrap
msgid ""
-"$ sed \\\n"
-" -e 's|%major%|5.0|g' \\\n"
-" -e 's|%minor%|5.0.2|g' \\\n"
-" -e 's|%codename%|lenny|g' \\\n"
-" -e 's|%release_mail%|2009/msg00007.html|g'\n"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:56
-msgid ""
-"Please check the mail carefully before sending and pass it to others for "
-"proof-reading."
+"if foo; then\n"
+" bar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:60
-msgid "Debian Live images for Debian GNU/Linux %major% updated"
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:59
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:119
+msgid "Good:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:64
+#: en/project_coding-style.ssi:43
+#, no-wrap
msgid ""
-"The Debian Live project is pleased to announce the availability of updated "
-"Live images for its stable distribution Debian GNU/Linux %major% (codename "
-"\"%codename%\")."
+"if foo\n"
+"then\n"
+" bar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:66
-msgid "The images are available for download at:"
+#: en/project_coding-style.ssi:47
+msgid "_* The same holds for functions:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:68
+#: en/project_coding-style.ssi:55
#, no-wrap
-msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:73
msgid ""
-"This update incorporates the changes made in the %minor% point release, "
-"which adds corrections for security problems to the stable release along "
-"with a few adjustments for serious problems. A full list of the changes may "
-"be viewed at:"
+"foo () {\n"
+" bar\n"
+"}\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:75
+#: en/project_coding-style.ssi:66
#, no-wrap
-msgid " <http://lists.debian.org/debian-announce/%release_mail%>\n"
+msgid ""
+"foo ()\n"
+"{\n"
+" bar\n"
+"}\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:77
-msgid "It also includes the following Live-specific changes:"
+#: en/project_coding-style.ssi:70
+msgid "2~ Variables"
msgstr ""
-#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
-msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
+#. type: Plain text
+#: en/project_coding-style.ssi:72
+msgid "_* Variables are always in capital letters."
msgstr ""
-#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
-msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
+#. type: Plain text
+#: en/project_coding-style.ssi:74
+msgid "_* Variables that used in lb config always start with LH_ prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:84
-#, no-wrap
+#: en/project_coding-style.ssi:76
msgid ""
-"URLs\n"
-"----\n"
+"_* Internal temporary variables in live-build should start with the _LH_ "
+"prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:87
-msgid "Download location of updated images:"
+#: en/project_coding-style.ssi:78
+msgid "_* Local variables start with live-build __LH_ prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:89
-#, no-wrap
-msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+#: en/project_coding-style.ssi:80
+msgid ""
+"_* Variables in connection to a boot parameter in live-config start with "
+"LIVE_."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:91
-#, fuzzy
-#| msgid "Debian Live Project"
-msgid "Debian Live project homepage:"
-msgstr "Projet Debian Live"
-
-#. type: Plain text
-#: en/project_procedures.ssi:93
-#, no-wrap
-msgid " <http://live.debian.net/>\n"
+#: en/project_coding-style.ssi:82
+msgid "_* All other variables in live-config start with _ prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:95
-msgid "The current stable distribution:"
+#: en/project_coding-style.ssi:84
+msgid "_* Use braces around variables; eg. write ${FOO} instead of $FOO."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:97
-#, no-wrap
-msgid " <http://ftp.debian.org/debian/dists/stable>\n"
+#: en/project_coding-style.ssi:86
+msgid ""
+"_* Always protect variables with quotes to respect potential whitespaces, "
+"write \"${FOO}\" not ${FOO}."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:99
-msgid "stable distribution information (release notes, errata etc.):"
+#: en/project_coding-style.ssi:88
+msgid ""
+"_* For consistency reasons, always use quotes when assigning values to "
+"variables:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:101
-#, no-wrap
-msgid " <http://www.debian.org/releases/stable/>\n"
+#: en/project_coding-style.ssi:94
+msgid "FOO=bar"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:103
-msgid "Security announcements and information:"
+#: en/project_coding-style.ssi:102
+msgid "FOO=\"bar\""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:105
-#, no-wrap
-msgid " <http://www.debian.org/security/>\n"
+#: en/project_coding-style.ssi:106
+msgid "_* If multiple variables are used, quote the full expression:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:108
+#: en/project_coding-style.ssi:115
#, no-wrap
msgid ""
-"About Debian\n"
-"-------------\n"
+"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
+"then\n"
+" foobar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:113
+#: en/project_coding-style.ssi:126
+#, no-wrap
msgid ""
-"The Debian Project is an association of Free Software developers who "
-"volunteer their time and effort in order to produce the completely free "
-"operating system Debian GNU/Linux."
+"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
+"then\n"
+" foobar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:116
-#, no-wrap
-msgid ""
-"About Debian Live\n"
-"-----------------\n"
+#: en/project_coding-style.ssi:130
+msgid "2~ Miscellaneous"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:122
+#: en/project_coding-style.ssi:132
msgid ""
-"Debian Live is an official sub-project of Debian which produces Debian "
-"systems that do not require a classical installer. Images are available for "
-"CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem "
-"images for booting directly from the internet."
+"_* Use \"|\" (without the surround quotes) as a seperator in calls to sed, e."
+"g. \"sed -e 's|foo|bar|'\" (without \"\")."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:125
-#, no-wrap
+#: en/project_coding-style.ssi:134
msgid ""
-"Contact Information\n"
-"-------------------\n"
+"_* Don't use the test command for comparisons or tests, use \"[\" "
+"\"]\" (without \"\"), e.g. \"if [ -x /bin/foo ]; ...\" and not \"if test -x /"
+"bin/foo; ...\"."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:130
+#: en/project_coding-style.ssi:135
msgid ""
-"For further information, please visit the Debian Live web pages at <http://"
-"live.debian.net/> or alternatively send mail to <debian-live at lists.debian."
-"org>."
+"_* Use case wherever possible over test, as it's easier to read and faster "
+"in execution."
msgstr ""
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index b61a6ef..5607e46 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-30 11:05+0100\n"
+"POT-Creation-Date: 2010-11-30 11:08+0100\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -220,11 +220,6 @@ msgid "% << other_resources.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:87
+#: en/live-manual.ssm:86
msgid "% << other_configuration-layout.ssi"
msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:88
-msgid "% << other_configuration-files.ssi"
-msgstr ""
diff --git a/manual/po/pt_BR/other_configuration-files.ssi.po b/manual/po/pt_BR/other_configuration-files.ssi.po
deleted file mode 100644
index e0d93fb..0000000
--- a/manual/po/pt_BR/other_configuration-files.ssi.po
+++ /dev/null
@@ -1,586 +0,0 @@
-# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:2
-msgid "B~ Configuration files"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:4
-msgid "1~ Configuration files"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:6
-msgid "2~ The config/binary file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:8
-msgid ""
-"_* LH_BINARY_FILESYSTEM: Set image filesystem. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:10
-msgid "_* LH_BINARY_IMAGES: Set image type. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:12
-msgid ""
-"_* LH_BINARY_INDICES: Set apt/aptitude generic indices. (see configuration-"
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:14
-msgid "_* LH_BOOTAPPEND_LIVE: Set boot parameters. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:16
-msgid ""
-"_* LH_BOOTAPPEND_INSTALL: Set boot parameters. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:18
-msgid "_* LH_BOOTLOADER: Set bootloader. (see bootloaders)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:20
-msgid "_* LH_CHECKSUMS: Set checksums. (see cheat-codes)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:22
-msgid ""
-"_* LH_CHROOT_BUILD: Control if we build binary images chrooted. (see "
-"configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:24
-msgid "_* LH_DEBIAN_INSTALLER: Set debian-installer. (see debian-installer)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:26
-msgid "_* LH_DEBIAN_INSTALLER_DAILY: Set daily images. (see debian-installer)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:28
-msgid "_* LH_ENCRYPTION: Set encrytion. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:30
-msgid "_* LH_GRUB_SPLASH: Set custom grub splash. (see splash-screen)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:32
-msgid "_* LH_HOSTNAME: Set hostname. (see hostname)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:34
-msgid "_* LH_ISO_APPLICATION: Set iso author. (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:36
-msgid "_* LH_ISO_PREPARER: Set iso preparer. (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:38
-msgid "_* LH_ISO_PUBLISHER: Set iso publisher. (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:40
-msgid "_* LH_ISO_VOLUME: Set iso volume (max 32 chars). (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:42
-msgid ""
-"_* LH_JFFS2_ERASEBLOCK: Set jffs2 eraseblock size. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:44
-msgid "_* LH_MEMTEST: Set memtest. (see memtest)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:46
-msgid ""
-"_* LH_NET_ROOT_FILESYSTEM: Set netboot filesystem. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:48
-msgid "_* LH_NET_ROOT_MOUNTOPTIONS: Set nfsopts. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:50
-msgid ""
-"_* LH_NET_ROOT_PATH: Set netboot server directory. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:52
-msgid ""
-"_* LH_NET_ROOT_SERVER: Set netboot server address. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:54
-msgid ""
-"_* LH_NET_COW_FILESYSTEM: Set net client cow filesystem. (see configuration "
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:56
-msgid ""
-"_* LH_NET_COW_MOUNTOPTIONS: Set cow mount options. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:58
-msgid "_* LH_NET_COW_PATH: Set cow directory. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:60
-msgid "_* LH_NET_COW_SERVER: Set cow server. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:62
-msgid "_* LH_NET_TARBALL: Set net tarball. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:64
-msgid "_* LH_SYSLINUX_SPLASH: Set custom syslinux splash. (see splash-screen)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:66
-msgid ""
-"_* LH_SYSLINUX_TIMEOUT: Set custom syslinux timeout in seconds. (see "
-"syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:68
-msgid ""
-"_* LH_SYSLINUX_CFG: Set custom syslinux configuration file. (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:70
-msgid "_* LH_SYSLINUX_MENU: Set syslinux menu. (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:72
-msgid ""
-"_* LH_SYSLINUX_MENU_LIVE_ENTRY: Set text to be used on the menu for live "
-"entries. (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:74
-msgid ""
-"_* LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: Set text to be used on the menu for "
-"live entries (failsafe ones). (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:76
-msgid ""
-"_* LH_SYSLINUX_MENU_MEMTEST_ENTRY: Set text to be used on the menu for "
-"memtest entry. (see syslinux and memtest)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:78
-msgid "_* LH_USERNAME: Set username. (see the-live-user)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:80
-msgid "2~ The config/bootstrap file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:82
-msgid ""
-"_* LH_ARCHITECTURE: Select chroot architecture. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:84
-msgid ""
-"_* LH_BOOTSTRAP_CONFIG: Set distribution config directory. (see "
-"configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:86
-msgid ""
-"_* LH_BOOTSTRAP_INCLUDE: Include packages on base. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:88
-msgid ""
-"_* LH_BOOTSTRAP_EXCLUDE: Exclude packages on base. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:90
-msgid ""
-"_* LH_BOOTSTRAP_FLAVOUR: Select flavour to use. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:92
-msgid ""
-"_* LH_BOOTSTRAP_KEYRING: Set distribution keyring. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:94
-msgid ""
-"_* LH_DISTRIBUTION: Select distribution to use. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:96
-msgid ""
-"_* LH_MIRROR_BOOTSTRAP: Set mirror to bootstrap from. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:98
-msgid ""
-"_* LH_MIRROR_CHROOT: Set mirror to fetch packages from. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:100
-msgid ""
-"_* LH_MIRROR_CHROOT_SECURITY: Set security mirror to fetch packages from. "
-"(see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:102
-msgid ""
-"_* LH_MIRROR_BINARY: Set mirror which ends up in the image. (see package-"
-"sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:104
-msgid ""
-"_* LH_MIRROR_BINARY_SECURITY: Set security mirror which ends up in the "
-"image. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:106
-msgid "_* LH_SECTIONS: select section(s) to use. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:108
-msgid "2~ The config/chroot file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:110
-msgid ""
-"_* LH_CHROOT_FILESYSTEM: Set chroot filesystem. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:112
-msgid ""
-"_* LH_UNION_FILESYSTEM: Set union filesystem. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:114
-msgid ""
-"_* LH_EXPOSED_ROOT: expose root as read only. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:116
-msgid "_* LH_HOOKS: Set hook commands."
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:118
-msgid "_* LH_INTERACTIVE: Set interactive build. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:120
-msgid ""
-"_* LH_KEYRING_PACKAGES: Set keyring packages. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:122
-msgid "_* LH_LANGUAGE: Set language to use. (see l10n)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:124
-msgid "_* LH_LINUX_FLAVOURS: Set kernel flavour to use. (see kernel)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:126
-msgid "_* LH_LINUX_PACKAGES: Set kernel packages to use. (see kernel)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:128
-msgid "_* LH_PACKAGES: Set packages to install. (see packages)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:130
-msgid "_* LH_PACKAGES_LISTS: Set package list to install. (see packages-lists)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:132
-msgid "_* LH_TASKS: Set tasks to install. (see tasks)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:134
-msgid "_* LH_SECURITY: enable security updates. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:136
-msgid "_* LH_SYMLINKS: enable symlink convertion."
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:138
-msgid "_* LH_SYSVINIT: enable sysvinit. (see startup-scripts)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:140
-msgid "2~ The config/common file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:142
-msgid "_* LH_APT: Set package manager. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:144
-msgid ""
-"_* LH_APT_FTP_PROXY: Set apt/aptitude ftp proxy. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:146
-msgid ""
-"_* LH_APT_HTTP_PROXY: Set apt/aptitude http proxy. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:148
-msgid ""
-"_* LH_APT_PDIFFS: Set apt/aptitude pdiff indices. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:150
-msgid ""
-"_* LH_APT_PIPELINE: Set apt/aptitude pipeline depth. (see package-"
-"installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:152
-msgid ""
-"_* LH_APT_RECOMMENDS: Set apt/aptitude recommends. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:154
-msgid "_* LH_APT_SECURE: Set apt/aptitude security. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:156
-msgid "_* LH_BOOTSTRAP: Set bootstrap program. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:158
-msgid "_* LH_CACHE: control cache. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:160
-msgid ""
-"_* LH_CACHE_INDICES: control if downloaded package indices should be cached. "
-"(see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:162
-msgid ""
-"_* LH_CACHE_PACKAGES: control if downloaded packages files should be cached. "
-"(see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:164
-msgid ""
-"_* LH_CACHE_STAGES: control if completed stages should be cached. (see "
-"configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:166
-msgid ""
-"_* LH_DEBCONF_FRONTEND: Set debconf(1) frontend to use. (see configuration "
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:168
-msgid ""
-"_* LH_DEBCONF_NOWARNINGS: Set debconf(1) warnings. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:170
-msgid ""
-"_* LH_DEBCONF_PRIORITY: Set debconf(1) priority to use. (see configuration "
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:172
-msgid "_* LH_INITRAMFS: Set initramfs hook. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:174
-msgid "_* LH_FDISK: Set fdisk program. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:176
-msgid "_* LH_LOSETUP: Set losetup program. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:178
-msgid "_* LH_MODE: Set distribution mode. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:180
-msgid "_* LH_ROOT_COMMAND: use sudo or equivalent. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:182
-msgid "_* LH_USE_FAKEROOT: use fakeroot/fakechroot. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:184
-msgid "_* LH_TASKSEL: Set tasksel program. (see tasks)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:186
-msgid "_* LH_INCLUDES: Set includes. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:188
-msgid "_* LH_TEMPLATES: Set templates. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:190
-msgid "_* LH_BREAKPOINTS: enable breakpoints. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:192
-msgid "_* LH_DEBUG: enable debug. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:194
-msgid "_* LH_FORCE: enable force. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:196
-msgid "_* LH_QUIET: enable quiet. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:198
-msgid "_* LH_VERBOSE: enable verbose. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:200
-msgid "2~ The config/source file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:202
-msgid "_* LH_SOURCE: Set source option. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:203
-msgid "_* LH_SOURCE_IMAGES: Set image type. (see configuration layout)"
-msgstr ""
diff --git a/manual/po/pt_BR/project_procedures.ssi.po b/manual/po/pt_BR/project_coding-style.ssi.po
similarity index 55%
copy from manual/po/pt_BR/project_procedures.ssi.po
copy to manual/po/pt_BR/project_coding-style.ssi.po
index 58e4306..5ca5bac 100644
--- a/manual/po/pt_BR/project_procedures.ssi.po
+++ b/manual/po/pt_BR/project_coding-style.ssi.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-30 10:35+0100\n"
-"PO-Revision-Date: 2010-11-30 10:35+0100\n"
+"POT-Creation-Date: 2010-11-30 11:05+0100\n"
+"PO-Revision-Date: 2010-11-30 11:05+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: pt_BR\n"
@@ -20,12 +20,7 @@ msgstr ""
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/about_manual.ssi:170 en/other_customization-bootup.ssi:30
#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
@@ -39,6 +34,10 @@ msgstr ""
#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
#: en/other_live-environment.ssi:133 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
@@ -87,25 +86,24 @@ msgstr "code{"
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/about_manual.ssi:173 en/other_customization-bootup.ssi:35
+#: en/other_customization-bootup.ssi:48 en/other_faq.ssi:37
+#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
+#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
+#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
+#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
+#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
+#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
@@ -151,296 +149,238 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/project_procedures.ssi:2
-msgid "B~ Procedures"
+#: en/project_coding-style.ssi:2
+msgid "B~ Coding Style"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:4
-msgid "1~ Procedures"
+#: en/project_coding-style.ssi:4
+msgid "1~ Coding Style"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:6
-msgid ""
-"This chapter documents the procedures within the Debian Live project for "
-"various tasks that need cooperation with other teams in Debian."
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:8
-msgid "2~ Udeb Uploads"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:10
-msgid "Before commiting releases of a udeb in d-i svn, one has to call:"
+#: en/project_coding-style.ssi:6
+msgid "This chapter documents the coding style used in live-boot and others."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:14
-msgid "../../scripts/l10n/output-l10n-changes . -d"
+#: en/project_coding-style.ssi:8
+msgid "2~ Compatibility"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:18
-msgid "2~ Major Releases"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:20
+#: en/project_coding-style.ssi:10
msgid ""
-"Releasing a new stable major version of Debian includes a lot of different "
-"teams working together to make it happen. At some point, the Live team comes "
-"in and builds live system images. The requirements to do this are:"
+"_* Don't use syntax or semantics that are unique to the Bash shell. For "
+"example, the use of array constructs."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:22
-msgid ""
-"_* A mirror containing the released versions for the debian, debian-security "
-"and debian-volatile archive which the debian-live buildd can access."
+#: en/project_coding-style.ssi:12
+msgid "_* Only use the POSIX subset - for example, use $(foo) over `foo`."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:24
-msgid ""
-"_* The names of the image need to be known (e.g. debian-live-VERSION-ARCH-"
-"FLAVOUR.iso)."
+#: en/project_coding-style.ssi:14
+msgid "_* You can check your scripts with 'sh -n' and 'checkbashisms'."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:26
-msgid "_* The packagelists need to have been updated."
+#: en/project_coding-style.ssi:16
+msgid "2~ Indenting"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:28
-msgid "_* The data from debian-cd needs to be synced (udeb exclude lists)."
+#: en/project_coding-style.ssi:18
+msgid "_* Always use tabs over spaces."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:30
-msgid ""
-"_* The includes from debian-cd needs to be synced (README.*, doc/*, etc.)."
+#: en/project_coding-style.ssi:20
+msgid "2~ Wrapping"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:32 en/project_procedures.ssi:38
-msgid "_* Images are built and mirrored on cdimage.debian.org."
+#: en/project_coding-style.ssi:22
+msgid "_* Generally, lines are 80 chars at maximum."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:34
-msgid "2~ Point Releases"
+#: en/project_coding-style.ssi:24
+msgid "_* Use the \"Linux style\" of line breaks:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:36
-msgid ""
-"_* Again, we need updated mirror of debian, debian-security and debian-"
-"volatile."
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:40
-msgid "_* Send announcement mail."
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:42
-msgid "3~ Point release announcement template"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:44
-msgid ""
-"An annoucement mail for point releases can be generated using the template "
-"below and the following command:"
+#: en/project_coding-style.ssi:26 en/project_coding-style.ssi:49
+#: en/project_coding-style.ssi:90 en/project_coding-style.ssi:108
+msgid "Bad:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:52
+#: en/project_coding-style.ssi:32
#, no-wrap
msgid ""
-"$ sed \\\n"
-" -e 's|%major%|5.0|g' \\\n"
-" -e 's|%minor%|5.0.2|g' \\\n"
-" -e 's|%codename%|lenny|g' \\\n"
-" -e 's|%release_mail%|2009/msg00007.html|g'\n"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:56
-msgid ""
-"Please check the mail carefully before sending and pass it to others for "
-"proof-reading."
+"if foo; then\n"
+" bar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:60
-msgid "Debian Live images for Debian GNU/Linux %major% updated"
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:59
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:119
+msgid "Good:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:64
+#: en/project_coding-style.ssi:43
+#, no-wrap
msgid ""
-"The Debian Live project is pleased to announce the availability of updated "
-"Live images for its stable distribution Debian GNU/Linux %major% (codename "
-"\"%codename%\")."
+"if foo\n"
+"then\n"
+" bar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:66
-msgid "The images are available for download at:"
+#: en/project_coding-style.ssi:47
+msgid "_* The same holds for functions:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:68
+#: en/project_coding-style.ssi:55
#, no-wrap
-msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:73
msgid ""
-"This update incorporates the changes made in the %minor% point release, "
-"which adds corrections for security problems to the stable release along "
-"with a few adjustments for serious problems. A full list of the changes may "
-"be viewed at:"
+"foo () {\n"
+" bar\n"
+"}\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:75
+#: en/project_coding-style.ssi:66
#, no-wrap
-msgid " <http://lists.debian.org/debian-announce/%release_mail%>\n"
+msgid ""
+"foo ()\n"
+"{\n"
+" bar\n"
+"}\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:77
-msgid "It also includes the following Live-specific changes:"
+#: en/project_coding-style.ssi:70
+msgid "2~ Variables"
msgstr ""
-#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
-msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
+#. type: Plain text
+#: en/project_coding-style.ssi:72
+msgid "_* Variables are always in capital letters."
msgstr ""
-#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
-msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
+#. type: Plain text
+#: en/project_coding-style.ssi:74
+msgid "_* Variables that used in lb config always start with LH_ prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:84
-#, no-wrap
+#: en/project_coding-style.ssi:76
msgid ""
-"URLs\n"
-"----\n"
+"_* Internal temporary variables in live-build should start with the _LH_ "
+"prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:87
-msgid "Download location of updated images:"
+#: en/project_coding-style.ssi:78
+msgid "_* Local variables start with live-build __LH_ prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:89
-#, no-wrap
-msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+#: en/project_coding-style.ssi:80
+msgid ""
+"_* Variables in connection to a boot parameter in live-config start with "
+"LIVE_."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:91
-#, fuzzy
-#| msgid "Debian Live Project"
-msgid "Debian Live project homepage:"
-msgstr "Projeto Debian Live"
-
-#. type: Plain text
-#: en/project_procedures.ssi:93
-#, no-wrap
-msgid " <http://live.debian.net/>\n"
+#: en/project_coding-style.ssi:82
+msgid "_* All other variables in live-config start with _ prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:95
-msgid "The current stable distribution:"
+#: en/project_coding-style.ssi:84
+msgid "_* Use braces around variables; eg. write ${FOO} instead of $FOO."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:97
-#, no-wrap
-msgid " <http://ftp.debian.org/debian/dists/stable>\n"
+#: en/project_coding-style.ssi:86
+msgid ""
+"_* Always protect variables with quotes to respect potential whitespaces, "
+"write \"${FOO}\" not ${FOO}."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:99
-msgid "stable distribution information (release notes, errata etc.):"
+#: en/project_coding-style.ssi:88
+msgid ""
+"_* For consistency reasons, always use quotes when assigning values to "
+"variables:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:101
-#, no-wrap
-msgid " <http://www.debian.org/releases/stable/>\n"
+#: en/project_coding-style.ssi:94
+msgid "FOO=bar"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:103
-msgid "Security announcements and information:"
+#: en/project_coding-style.ssi:102
+msgid "FOO=\"bar\""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:105
-#, no-wrap
-msgid " <http://www.debian.org/security/>\n"
+#: en/project_coding-style.ssi:106
+msgid "_* If multiple variables are used, quote the full expression:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:108
+#: en/project_coding-style.ssi:115
#, no-wrap
msgid ""
-"About Debian\n"
-"-------------\n"
+"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
+"then\n"
+" foobar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:113
+#: en/project_coding-style.ssi:126
+#, no-wrap
msgid ""
-"The Debian Project is an association of Free Software developers who "
-"volunteer their time and effort in order to produce the completely free "
-"operating system Debian GNU/Linux."
+"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
+"then\n"
+" foobar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:116
-#, no-wrap
-msgid ""
-"About Debian Live\n"
-"-----------------\n"
+#: en/project_coding-style.ssi:130
+msgid "2~ Miscellaneous"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:122
+#: en/project_coding-style.ssi:132
msgid ""
-"Debian Live is an official sub-project of Debian which produces Debian "
-"systems that do not require a classical installer. Images are available for "
-"CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem "
-"images for booting directly from the internet."
+"_* Use \"|\" (without the surround quotes) as a seperator in calls to sed, e."
+"g. \"sed -e 's|foo|bar|'\" (without \"\")."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:125
-#, no-wrap
+#: en/project_coding-style.ssi:134
msgid ""
-"Contact Information\n"
-"-------------------\n"
+"_* Don't use the test command for comparisons or tests, use \"[\" "
+"\"]\" (without \"\"), e.g. \"if [ -x /bin/foo ]; ...\" and not \"if test -x /"
+"bin/foo; ...\"."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:130
+#: en/project_coding-style.ssi:135
msgid ""
-"For further information, please visit the Debian Live web pages at <http://"
-"live.debian.net/> or alternatively send mail to <debian-live at lists.debian."
-"org>."
+"_* Use case wherever possible over test, as it's easier to read and faster "
+"in execution."
msgstr ""
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 27b208b..4afc75d 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-30 11:05+0100\n"
+"POT-Creation-Date: 2010-11-30 11:08+0100\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -221,11 +221,6 @@ msgid "% << other_resources.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:87
+#: en/live-manual.ssm:86
msgid "% << other_configuration-layout.ssi"
msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:88
-msgid "% << other_configuration-files.ssi"
-msgstr ""
diff --git a/manual/po/ro/other_configuration-files.ssi.po b/manual/po/ro/other_configuration-files.ssi.po
deleted file mode 100644
index 8e4fa57..0000000
--- a/manual/po/ro/other_configuration-files.ssi.po
+++ /dev/null
@@ -1,587 +0,0 @@
-# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: ro\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2;\n"
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:2
-msgid "B~ Configuration files"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:4
-msgid "1~ Configuration files"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:6
-msgid "2~ The config/binary file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:8
-msgid ""
-"_* LH_BINARY_FILESYSTEM: Set image filesystem. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:10
-msgid "_* LH_BINARY_IMAGES: Set image type. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:12
-msgid ""
-"_* LH_BINARY_INDICES: Set apt/aptitude generic indices. (see configuration-"
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:14
-msgid "_* LH_BOOTAPPEND_LIVE: Set boot parameters. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:16
-msgid ""
-"_* LH_BOOTAPPEND_INSTALL: Set boot parameters. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:18
-msgid "_* LH_BOOTLOADER: Set bootloader. (see bootloaders)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:20
-msgid "_* LH_CHECKSUMS: Set checksums. (see cheat-codes)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:22
-msgid ""
-"_* LH_CHROOT_BUILD: Control if we build binary images chrooted. (see "
-"configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:24
-msgid "_* LH_DEBIAN_INSTALLER: Set debian-installer. (see debian-installer)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:26
-msgid "_* LH_DEBIAN_INSTALLER_DAILY: Set daily images. (see debian-installer)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:28
-msgid "_* LH_ENCRYPTION: Set encrytion. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:30
-msgid "_* LH_GRUB_SPLASH: Set custom grub splash. (see splash-screen)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:32
-msgid "_* LH_HOSTNAME: Set hostname. (see hostname)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:34
-msgid "_* LH_ISO_APPLICATION: Set iso author. (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:36
-msgid "_* LH_ISO_PREPARER: Set iso preparer. (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:38
-msgid "_* LH_ISO_PUBLISHER: Set iso publisher. (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:40
-msgid "_* LH_ISO_VOLUME: Set iso volume (max 32 chars). (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:42
-msgid ""
-"_* LH_JFFS2_ERASEBLOCK: Set jffs2 eraseblock size. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:44
-msgid "_* LH_MEMTEST: Set memtest. (see memtest)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:46
-msgid ""
-"_* LH_NET_ROOT_FILESYSTEM: Set netboot filesystem. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:48
-msgid "_* LH_NET_ROOT_MOUNTOPTIONS: Set nfsopts. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:50
-msgid ""
-"_* LH_NET_ROOT_PATH: Set netboot server directory. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:52
-msgid ""
-"_* LH_NET_ROOT_SERVER: Set netboot server address. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:54
-msgid ""
-"_* LH_NET_COW_FILESYSTEM: Set net client cow filesystem. (see configuration "
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:56
-msgid ""
-"_* LH_NET_COW_MOUNTOPTIONS: Set cow mount options. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:58
-msgid "_* LH_NET_COW_PATH: Set cow directory. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:60
-msgid "_* LH_NET_COW_SERVER: Set cow server. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:62
-msgid "_* LH_NET_TARBALL: Set net tarball. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:64
-msgid "_* LH_SYSLINUX_SPLASH: Set custom syslinux splash. (see splash-screen)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:66
-msgid ""
-"_* LH_SYSLINUX_TIMEOUT: Set custom syslinux timeout in seconds. (see "
-"syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:68
-msgid ""
-"_* LH_SYSLINUX_CFG: Set custom syslinux configuration file. (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:70
-msgid "_* LH_SYSLINUX_MENU: Set syslinux menu. (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:72
-msgid ""
-"_* LH_SYSLINUX_MENU_LIVE_ENTRY: Set text to be used on the menu for live "
-"entries. (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:74
-msgid ""
-"_* LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: Set text to be used on the menu for "
-"live entries (failsafe ones). (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:76
-msgid ""
-"_* LH_SYSLINUX_MENU_MEMTEST_ENTRY: Set text to be used on the menu for "
-"memtest entry. (see syslinux and memtest)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:78
-msgid "_* LH_USERNAME: Set username. (see the-live-user)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:80
-msgid "2~ The config/bootstrap file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:82
-msgid ""
-"_* LH_ARCHITECTURE: Select chroot architecture. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:84
-msgid ""
-"_* LH_BOOTSTRAP_CONFIG: Set distribution config directory. (see "
-"configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:86
-msgid ""
-"_* LH_BOOTSTRAP_INCLUDE: Include packages on base. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:88
-msgid ""
-"_* LH_BOOTSTRAP_EXCLUDE: Exclude packages on base. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:90
-msgid ""
-"_* LH_BOOTSTRAP_FLAVOUR: Select flavour to use. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:92
-msgid ""
-"_* LH_BOOTSTRAP_KEYRING: Set distribution keyring. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:94
-msgid ""
-"_* LH_DISTRIBUTION: Select distribution to use. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:96
-msgid ""
-"_* LH_MIRROR_BOOTSTRAP: Set mirror to bootstrap from. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:98
-msgid ""
-"_* LH_MIRROR_CHROOT: Set mirror to fetch packages from. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:100
-msgid ""
-"_* LH_MIRROR_CHROOT_SECURITY: Set security mirror to fetch packages from. "
-"(see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:102
-msgid ""
-"_* LH_MIRROR_BINARY: Set mirror which ends up in the image. (see package-"
-"sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:104
-msgid ""
-"_* LH_MIRROR_BINARY_SECURITY: Set security mirror which ends up in the "
-"image. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:106
-msgid "_* LH_SECTIONS: select section(s) to use. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:108
-msgid "2~ The config/chroot file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:110
-msgid ""
-"_* LH_CHROOT_FILESYSTEM: Set chroot filesystem. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:112
-msgid ""
-"_* LH_UNION_FILESYSTEM: Set union filesystem. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:114
-msgid ""
-"_* LH_EXPOSED_ROOT: expose root as read only. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:116
-msgid "_* LH_HOOKS: Set hook commands."
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:118
-msgid "_* LH_INTERACTIVE: Set interactive build. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:120
-msgid ""
-"_* LH_KEYRING_PACKAGES: Set keyring packages. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:122
-msgid "_* LH_LANGUAGE: Set language to use. (see l10n)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:124
-msgid "_* LH_LINUX_FLAVOURS: Set kernel flavour to use. (see kernel)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:126
-msgid "_* LH_LINUX_PACKAGES: Set kernel packages to use. (see kernel)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:128
-msgid "_* LH_PACKAGES: Set packages to install. (see packages)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:130
-msgid "_* LH_PACKAGES_LISTS: Set package list to install. (see packages-lists)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:132
-msgid "_* LH_TASKS: Set tasks to install. (see tasks)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:134
-msgid "_* LH_SECURITY: enable security updates. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:136
-msgid "_* LH_SYMLINKS: enable symlink convertion."
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:138
-msgid "_* LH_SYSVINIT: enable sysvinit. (see startup-scripts)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:140
-msgid "2~ The config/common file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:142
-msgid "_* LH_APT: Set package manager. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:144
-msgid ""
-"_* LH_APT_FTP_PROXY: Set apt/aptitude ftp proxy. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:146
-msgid ""
-"_* LH_APT_HTTP_PROXY: Set apt/aptitude http proxy. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:148
-msgid ""
-"_* LH_APT_PDIFFS: Set apt/aptitude pdiff indices. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:150
-msgid ""
-"_* LH_APT_PIPELINE: Set apt/aptitude pipeline depth. (see package-"
-"installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:152
-msgid ""
-"_* LH_APT_RECOMMENDS: Set apt/aptitude recommends. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:154
-msgid "_* LH_APT_SECURE: Set apt/aptitude security. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:156
-msgid "_* LH_BOOTSTRAP: Set bootstrap program. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:158
-msgid "_* LH_CACHE: control cache. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:160
-msgid ""
-"_* LH_CACHE_INDICES: control if downloaded package indices should be cached. "
-"(see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:162
-msgid ""
-"_* LH_CACHE_PACKAGES: control if downloaded packages files should be cached. "
-"(see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:164
-msgid ""
-"_* LH_CACHE_STAGES: control if completed stages should be cached. (see "
-"configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:166
-msgid ""
-"_* LH_DEBCONF_FRONTEND: Set debconf(1) frontend to use. (see configuration "
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:168
-msgid ""
-"_* LH_DEBCONF_NOWARNINGS: Set debconf(1) warnings. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:170
-msgid ""
-"_* LH_DEBCONF_PRIORITY: Set debconf(1) priority to use. (see configuration "
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:172
-msgid "_* LH_INITRAMFS: Set initramfs hook. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:174
-msgid "_* LH_FDISK: Set fdisk program. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:176
-msgid "_* LH_LOSETUP: Set losetup program. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:178
-msgid "_* LH_MODE: Set distribution mode. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:180
-msgid "_* LH_ROOT_COMMAND: use sudo or equivalent. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:182
-msgid "_* LH_USE_FAKEROOT: use fakeroot/fakechroot. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:184
-msgid "_* LH_TASKSEL: Set tasksel program. (see tasks)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:186
-msgid "_* LH_INCLUDES: Set includes. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:188
-msgid "_* LH_TEMPLATES: Set templates. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:190
-msgid "_* LH_BREAKPOINTS: enable breakpoints. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:192
-msgid "_* LH_DEBUG: enable debug. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:194
-msgid "_* LH_FORCE: enable force. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:196
-msgid "_* LH_QUIET: enable quiet. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:198
-msgid "_* LH_VERBOSE: enable verbose. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:200
-msgid "2~ The config/source file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:202
-msgid "_* LH_SOURCE: Set source option. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:203
-msgid "_* LH_SOURCE_IMAGES: Set image type. (see configuration layout)"
-msgstr ""
diff --git a/manual/po/ro/project_procedures.ssi.po b/manual/po/ro/project_coding-style.ssi.po
similarity index 55%
copy from manual/po/ro/project_procedures.ssi.po
copy to manual/po/ro/project_coding-style.ssi.po
index ff211a0..78775e9 100644
--- a/manual/po/ro/project_procedures.ssi.po
+++ b/manual/po/ro/project_coding-style.ssi.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-30 10:35+0100\n"
-"PO-Revision-Date: 2010-11-30 10:35+0100\n"
+"POT-Creation-Date: 2010-11-30 11:05+0100\n"
+"PO-Revision-Date: 2010-11-30 11:05+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: ro\n"
@@ -21,12 +21,7 @@ msgstr ""
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/about_manual.ssi:170 en/other_customization-bootup.ssi:30
#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
@@ -40,6 +35,10 @@ msgstr ""
#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
#: en/other_live-environment.ssi:133 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
@@ -88,25 +87,24 @@ msgstr "code{"
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/about_manual.ssi:173 en/other_customization-bootup.ssi:35
+#: en/other_customization-bootup.ssi:48 en/other_faq.ssi:37
+#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
+#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
+#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
+#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
+#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
+#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
@@ -152,296 +150,238 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/project_procedures.ssi:2
-msgid "B~ Procedures"
+#: en/project_coding-style.ssi:2
+msgid "B~ Coding Style"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:4
-msgid "1~ Procedures"
+#: en/project_coding-style.ssi:4
+msgid "1~ Coding Style"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:6
-msgid ""
-"This chapter documents the procedures within the Debian Live project for "
-"various tasks that need cooperation with other teams in Debian."
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:8
-msgid "2~ Udeb Uploads"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:10
-msgid "Before commiting releases of a udeb in d-i svn, one has to call:"
+#: en/project_coding-style.ssi:6
+msgid "This chapter documents the coding style used in live-boot and others."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:14
-msgid "../../scripts/l10n/output-l10n-changes . -d"
+#: en/project_coding-style.ssi:8
+msgid "2~ Compatibility"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:18
-msgid "2~ Major Releases"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:20
+#: en/project_coding-style.ssi:10
msgid ""
-"Releasing a new stable major version of Debian includes a lot of different "
-"teams working together to make it happen. At some point, the Live team comes "
-"in and builds live system images. The requirements to do this are:"
+"_* Don't use syntax or semantics that are unique to the Bash shell. For "
+"example, the use of array constructs."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:22
-msgid ""
-"_* A mirror containing the released versions for the debian, debian-security "
-"and debian-volatile archive which the debian-live buildd can access."
+#: en/project_coding-style.ssi:12
+msgid "_* Only use the POSIX subset - for example, use $(foo) over `foo`."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:24
-msgid ""
-"_* The names of the image need to be known (e.g. debian-live-VERSION-ARCH-"
-"FLAVOUR.iso)."
+#: en/project_coding-style.ssi:14
+msgid "_* You can check your scripts with 'sh -n' and 'checkbashisms'."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:26
-msgid "_* The packagelists need to have been updated."
+#: en/project_coding-style.ssi:16
+msgid "2~ Indenting"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:28
-msgid "_* The data from debian-cd needs to be synced (udeb exclude lists)."
+#: en/project_coding-style.ssi:18
+msgid "_* Always use tabs over spaces."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:30
-msgid ""
-"_* The includes from debian-cd needs to be synced (README.*, doc/*, etc.)."
+#: en/project_coding-style.ssi:20
+msgid "2~ Wrapping"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:32 en/project_procedures.ssi:38
-msgid "_* Images are built and mirrored on cdimage.debian.org."
+#: en/project_coding-style.ssi:22
+msgid "_* Generally, lines are 80 chars at maximum."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:34
-msgid "2~ Point Releases"
+#: en/project_coding-style.ssi:24
+msgid "_* Use the \"Linux style\" of line breaks:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:36
-msgid ""
-"_* Again, we need updated mirror of debian, debian-security and debian-"
-"volatile."
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:40
-msgid "_* Send announcement mail."
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:42
-msgid "3~ Point release announcement template"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:44
-msgid ""
-"An annoucement mail for point releases can be generated using the template "
-"below and the following command:"
+#: en/project_coding-style.ssi:26 en/project_coding-style.ssi:49
+#: en/project_coding-style.ssi:90 en/project_coding-style.ssi:108
+msgid "Bad:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:52
+#: en/project_coding-style.ssi:32
#, no-wrap
msgid ""
-"$ sed \\\n"
-" -e 's|%major%|5.0|g' \\\n"
-" -e 's|%minor%|5.0.2|g' \\\n"
-" -e 's|%codename%|lenny|g' \\\n"
-" -e 's|%release_mail%|2009/msg00007.html|g'\n"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:56
-msgid ""
-"Please check the mail carefully before sending and pass it to others for "
-"proof-reading."
+"if foo; then\n"
+" bar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:60
-msgid "Debian Live images for Debian GNU/Linux %major% updated"
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:59
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:119
+msgid "Good:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:64
+#: en/project_coding-style.ssi:43
+#, no-wrap
msgid ""
-"The Debian Live project is pleased to announce the availability of updated "
-"Live images for its stable distribution Debian GNU/Linux %major% (codename "
-"\"%codename%\")."
+"if foo\n"
+"then\n"
+" bar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:66
-msgid "The images are available for download at:"
+#: en/project_coding-style.ssi:47
+msgid "_* The same holds for functions:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:68
+#: en/project_coding-style.ssi:55
#, no-wrap
-msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:73
msgid ""
-"This update incorporates the changes made in the %minor% point release, "
-"which adds corrections for security problems to the stable release along "
-"with a few adjustments for serious problems. A full list of the changes may "
-"be viewed at:"
+"foo () {\n"
+" bar\n"
+"}\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:75
+#: en/project_coding-style.ssi:66
#, no-wrap
-msgid " <http://lists.debian.org/debian-announce/%release_mail%>\n"
+msgid ""
+"foo ()\n"
+"{\n"
+" bar\n"
+"}\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:77
-msgid "It also includes the following Live-specific changes:"
+#: en/project_coding-style.ssi:70
+msgid "2~ Variables"
msgstr ""
-#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
-msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
+#. type: Plain text
+#: en/project_coding-style.ssi:72
+msgid "_* Variables are always in capital letters."
msgstr ""
-#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
-msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
+#. type: Plain text
+#: en/project_coding-style.ssi:74
+msgid "_* Variables that used in lb config always start with LH_ prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:84
-#, no-wrap
+#: en/project_coding-style.ssi:76
msgid ""
-"URLs\n"
-"----\n"
+"_* Internal temporary variables in live-build should start with the _LH_ "
+"prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:87
-msgid "Download location of updated images:"
+#: en/project_coding-style.ssi:78
+msgid "_* Local variables start with live-build __LH_ prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:89
-#, no-wrap
-msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+#: en/project_coding-style.ssi:80
+msgid ""
+"_* Variables in connection to a boot parameter in live-config start with "
+"LIVE_."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:91
-msgid "Debian Live project homepage:"
+#: en/project_coding-style.ssi:82
+msgid "_* All other variables in live-config start with _ prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:93
-#, no-wrap
-msgid " <http://live.debian.net/>\n"
+#: en/project_coding-style.ssi:84
+msgid "_* Use braces around variables; eg. write ${FOO} instead of $FOO."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:95
-#, fuzzy
-#| msgid "_* It reflects the (current) state of one distribution."
-msgid "The current stable distribution:"
-msgstr "_* El reflecta starea (actuala) a distributiei."
-
-#. type: Plain text
-#: en/project_procedures.ssi:97
-#, no-wrap
-msgid " <http://ftp.debian.org/debian/dists/stable>\n"
+#: en/project_coding-style.ssi:86
+msgid ""
+"_* Always protect variables with quotes to respect potential whitespaces, "
+"write \"${FOO}\" not ${FOO}."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:99
-msgid "stable distribution information (release notes, errata etc.):"
+#: en/project_coding-style.ssi:88
+msgid ""
+"_* For consistency reasons, always use quotes when assigning values to "
+"variables:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:101
-#, no-wrap
-msgid " <http://www.debian.org/releases/stable/>\n"
+#: en/project_coding-style.ssi:94
+msgid "FOO=bar"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:103
-msgid "Security announcements and information:"
+#: en/project_coding-style.ssi:102
+msgid "FOO=\"bar\""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:105
-#, no-wrap
-msgid " <http://www.debian.org/security/>\n"
+#: en/project_coding-style.ssi:106
+msgid "_* If multiple variables are used, quote the full expression:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:108
+#: en/project_coding-style.ssi:115
#, no-wrap
msgid ""
-"About Debian\n"
-"-------------\n"
+"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
+"then\n"
+" foobar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:113
+#: en/project_coding-style.ssi:126
+#, no-wrap
msgid ""
-"The Debian Project is an association of Free Software developers who "
-"volunteer their time and effort in order to produce the completely free "
-"operating system Debian GNU/Linux."
+"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
+"then\n"
+" foobar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:116
-#, no-wrap
-msgid ""
-"About Debian Live\n"
-"-----------------\n"
+#: en/project_coding-style.ssi:130
+msgid "2~ Miscellaneous"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:122
+#: en/project_coding-style.ssi:132
msgid ""
-"Debian Live is an official sub-project of Debian which produces Debian "
-"systems that do not require a classical installer. Images are available for "
-"CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem "
-"images for booting directly from the internet."
+"_* Use \"|\" (without the surround quotes) as a seperator in calls to sed, e."
+"g. \"sed -e 's|foo|bar|'\" (without \"\")."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:125
-#, no-wrap
+#: en/project_coding-style.ssi:134
msgid ""
-"Contact Information\n"
-"-------------------\n"
+"_* Don't use the test command for comparisons or tests, use \"[\" "
+"\"]\" (without \"\"), e.g. \"if [ -x /bin/foo ]; ...\" and not \"if test -x /"
+"bin/foo; ...\"."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:130
+#: en/project_coding-style.ssi:135
msgid ""
-"For further information, please visit the Debian Live web pages at <http://"
-"live.debian.net/> or alternatively send mail to <debian-live at lists.debian."
-"org>."
+"_* Use case wherever possible over test, as it's easier to read and faster "
+"in execution."
msgstr ""
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index e7393ee..f55c778 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -4,7 +4,6 @@
[type: text] en/about_manual.ssi $lang:$lang/about_manual.ssi
[type: text] en/about_project.ssi $lang:$lang/about_project.ssi
[type: text] en/other_common-tasks.ssi $lang:$lang/other_common-tasks.ssi
-[type: text] en/other_configuration-files.ssi $lang:$lang/other_configuration-files.ssi
[type: text] en/other_configuration-layout.ssi $lang:$lang/other_configuration-layout.ssi
[type: text] en/other_customization-binary.ssi $lang:$lang/other_customization-binary.ssi
[type: text] en/other_customization-bootup.ssi $lang:$lang/other_customization-bootup.ssi
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 441476b..1e93c65 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-30 11:05+0100\n"
+"POT-Creation-Date: 2010-11-30 11:08+0100\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"
@@ -220,11 +220,6 @@ msgid "% << other_resources.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:87
+#: en/live-manual.ssm:86
msgid "% << other_configuration-layout.ssi"
msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:88
-msgid "% << other_configuration-files.ssi"
-msgstr ""
diff --git a/manual/pot/other_configuration-files.ssi.pot b/manual/pot/other_configuration-files.ssi.pot
deleted file mode 100644
index bf92cf6..0000000
--- a/manual/pot/other_configuration-files.ssi.pot
+++ /dev/null
@@ -1,586 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:2
-msgid "B~ Configuration files"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:4
-msgid "1~ Configuration files"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:6
-msgid "2~ The config/binary file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:8
-msgid ""
-"_* LH_BINARY_FILESYSTEM: Set image filesystem. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:10
-msgid "_* LH_BINARY_IMAGES: Set image type. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:12
-msgid ""
-"_* LH_BINARY_INDICES: Set apt/aptitude generic indices. (see configuration-"
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:14
-msgid "_* LH_BOOTAPPEND_LIVE: Set boot parameters. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:16
-msgid ""
-"_* LH_BOOTAPPEND_INSTALL: Set boot parameters. (see configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:18
-msgid "_* LH_BOOTLOADER: Set bootloader. (see bootloaders)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:20
-msgid "_* LH_CHECKSUMS: Set checksums. (see cheat-codes)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:22
-msgid ""
-"_* LH_CHROOT_BUILD: Control if we build binary images chrooted. (see "
-"configuration-layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:24
-msgid "_* LH_DEBIAN_INSTALLER: Set debian-installer. (see debian-installer)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:26
-msgid "_* LH_DEBIAN_INSTALLER_DAILY: Set daily images. (see debian-installer)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:28
-msgid "_* LH_ENCRYPTION: Set encrytion. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:30
-msgid "_* LH_GRUB_SPLASH: Set custom grub splash. (see splash-screen)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:32
-msgid "_* LH_HOSTNAME: Set hostname. (see hostname)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:34
-msgid "_* LH_ISO_APPLICATION: Set iso author. (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:36
-msgid "_* LH_ISO_PREPARER: Set iso preparer. (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:38
-msgid "_* LH_ISO_PUBLISHER: Set iso publisher. (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:40
-msgid "_* LH_ISO_VOLUME: Set iso volume (max 32 chars). (see iso-metadata)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:42
-msgid ""
-"_* LH_JFFS2_ERASEBLOCK: Set jffs2 eraseblock size. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:44
-msgid "_* LH_MEMTEST: Set memtest. (see memtest)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:46
-msgid ""
-"_* LH_NET_ROOT_FILESYSTEM: Set netboot filesystem. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:48
-msgid "_* LH_NET_ROOT_MOUNTOPTIONS: Set nfsopts. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:50
-msgid ""
-"_* LH_NET_ROOT_PATH: Set netboot server directory. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:52
-msgid ""
-"_* LH_NET_ROOT_SERVER: Set netboot server address. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:54
-msgid ""
-"_* LH_NET_COW_FILESYSTEM: Set net client cow filesystem. (see configuration "
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:56
-msgid ""
-"_* LH_NET_COW_MOUNTOPTIONS: Set cow mount options. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:58
-msgid "_* LH_NET_COW_PATH: Set cow directory. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:60
-msgid "_* LH_NET_COW_SERVER: Set cow server. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:62
-msgid "_* LH_NET_TARBALL: Set net tarball. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:64
-msgid "_* LH_SYSLINUX_SPLASH: Set custom syslinux splash. (see splash-screen)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:66
-msgid ""
-"_* LH_SYSLINUX_TIMEOUT: Set custom syslinux timeout in seconds. (see "
-"syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:68
-msgid ""
-"_* LH_SYSLINUX_CFG: Set custom syslinux configuration file. (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:70
-msgid "_* LH_SYSLINUX_MENU: Set syslinux menu. (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:72
-msgid ""
-"_* LH_SYSLINUX_MENU_LIVE_ENTRY: Set text to be used on the menu for live "
-"entries. (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:74
-msgid ""
-"_* LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: Set text to be used on the menu for "
-"live entries (failsafe ones). (see syslinux)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:76
-msgid ""
-"_* LH_SYSLINUX_MENU_MEMTEST_ENTRY: Set text to be used on the menu for "
-"memtest entry. (see syslinux and memtest)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:78
-msgid "_* LH_USERNAME: Set username. (see the-live-user)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:80
-msgid "2~ The config/bootstrap file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:82
-msgid ""
-"_* LH_ARCHITECTURE: Select chroot architecture. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:84
-msgid ""
-"_* LH_BOOTSTRAP_CONFIG: Set distribution config directory. (see "
-"configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:86
-msgid ""
-"_* LH_BOOTSTRAP_INCLUDE: Include packages on base. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:88
-msgid ""
-"_* LH_BOOTSTRAP_EXCLUDE: Exclude packages on base. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:90
-msgid ""
-"_* LH_BOOTSTRAP_FLAVOUR: Select flavour to use. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:92
-msgid ""
-"_* LH_BOOTSTRAP_KEYRING: Set distribution keyring. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:94
-msgid ""
-"_* LH_DISTRIBUTION: Select distribution to use. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:96
-msgid ""
-"_* LH_MIRROR_BOOTSTRAP: Set mirror to bootstrap from. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:98
-msgid ""
-"_* LH_MIRROR_CHROOT: Set mirror to fetch packages from. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:100
-msgid ""
-"_* LH_MIRROR_CHROOT_SECURITY: Set security mirror to fetch packages from. "
-"(see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:102
-msgid ""
-"_* LH_MIRROR_BINARY: Set mirror which ends up in the image. (see package-"
-"sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:104
-msgid ""
-"_* LH_MIRROR_BINARY_SECURITY: Set security mirror which ends up in the "
-"image. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:106
-msgid "_* LH_SECTIONS: select section(s) to use. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:108
-msgid "2~ The config/chroot file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:110
-msgid ""
-"_* LH_CHROOT_FILESYSTEM: Set chroot filesystem. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:112
-msgid ""
-"_* LH_UNION_FILESYSTEM: Set union filesystem. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:114
-msgid ""
-"_* LH_EXPOSED_ROOT: expose root as read only. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:116
-msgid "_* LH_HOOKS: Set hook commands."
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:118
-msgid "_* LH_INTERACTIVE: Set interactive build. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:120
-msgid ""
-"_* LH_KEYRING_PACKAGES: Set keyring packages. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:122
-msgid "_* LH_LANGUAGE: Set language to use. (see l10n)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:124
-msgid "_* LH_LINUX_FLAVOURS: Set kernel flavour to use. (see kernel)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:126
-msgid "_* LH_LINUX_PACKAGES: Set kernel packages to use. (see kernel)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:128
-msgid "_* LH_PACKAGES: Set packages to install. (see packages)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:130
-msgid "_* LH_PACKAGES_LISTS: Set package list to install. (see packages-lists)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:132
-msgid "_* LH_TASKS: Set tasks to install. (see tasks)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:134
-msgid "_* LH_SECURITY: enable security updates. (see package-sources)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:136
-msgid "_* LH_SYMLINKS: enable symlink convertion."
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:138
-msgid "_* LH_SYSVINIT: enable sysvinit. (see startup-scripts)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:140
-msgid "2~ The config/common file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:142
-msgid "_* LH_APT: Set package manager. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:144
-msgid ""
-"_* LH_APT_FTP_PROXY: Set apt/aptitude ftp proxy. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:146
-msgid ""
-"_* LH_APT_HTTP_PROXY: Set apt/aptitude http proxy. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:148
-msgid ""
-"_* LH_APT_PDIFFS: Set apt/aptitude pdiff indices. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:150
-msgid ""
-"_* LH_APT_PIPELINE: Set apt/aptitude pipeline depth. (see package-"
-"installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:152
-msgid ""
-"_* LH_APT_RECOMMENDS: Set apt/aptitude recommends. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:154
-msgid "_* LH_APT_SECURE: Set apt/aptitude security. (see package-installation)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:156
-msgid "_* LH_BOOTSTRAP: Set bootstrap program. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:158
-msgid "_* LH_CACHE: control cache. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:160
-msgid ""
-"_* LH_CACHE_INDICES: control if downloaded package indices should be cached. "
-"(see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:162
-msgid ""
-"_* LH_CACHE_PACKAGES: control if downloaded packages files should be cached. "
-"(see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:164
-msgid ""
-"_* LH_CACHE_STAGES: control if completed stages should be cached. (see "
-"configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:166
-msgid ""
-"_* LH_DEBCONF_FRONTEND: Set debconf(1) frontend to use. (see configuration "
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:168
-msgid ""
-"_* LH_DEBCONF_NOWARNINGS: Set debconf(1) warnings. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:170
-msgid ""
-"_* LH_DEBCONF_PRIORITY: Set debconf(1) priority to use. (see configuration "
-"layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:172
-msgid "_* LH_INITRAMFS: Set initramfs hook. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:174
-msgid "_* LH_FDISK: Set fdisk program. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:176
-msgid "_* LH_LOSETUP: Set losetup program. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:178
-msgid "_* LH_MODE: Set distribution mode. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:180
-msgid "_* LH_ROOT_COMMAND: use sudo or equivalent. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:182
-msgid "_* LH_USE_FAKEROOT: use fakeroot/fakechroot. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:184
-msgid "_* LH_TASKSEL: Set tasksel program. (see tasks)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:186
-msgid "_* LH_INCLUDES: Set includes. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:188
-msgid "_* LH_TEMPLATES: Set templates. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:190
-msgid "_* LH_BREAKPOINTS: enable breakpoints. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:192
-msgid "_* LH_DEBUG: enable debug. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:194
-msgid "_* LH_FORCE: enable force. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:196
-msgid "_* LH_QUIET: enable quiet. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:198
-msgid "_* LH_VERBOSE: enable verbose. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:200
-msgid "2~ The config/source file"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:202
-msgid "_* LH_SOURCE: Set source option. (see configuration layout)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_configuration-files.ssi:203
-msgid "_* LH_SOURCE_IMAGES: Set image type. (see configuration layout)"
-msgstr ""
diff --git a/manual/pot/project_procedures.ssi.pot b/manual/pot/project_coding-style.ssi.pot
similarity index 55%
copy from manual/pot/project_procedures.ssi.pot
copy to manual/pot/project_coding-style.ssi.pot
index c4fe16c..ebd6848 100644
--- a/manual/pot/project_procedures.ssi.pot
+++ b/manual/pot/project_coding-style.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-30 10:35+0100\n"
+"POT-Creation-Date: 2010-11-30 11:05+0100\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"
@@ -20,12 +20,7 @@ msgstr ""
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/about_manual.ssi:170 en/other_customization-bootup.ssi:30
#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
@@ -39,6 +34,10 @@ msgstr ""
#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
#: en/other_live-environment.ssi:133 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
@@ -87,25 +86,24 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/about_manual.ssi:173 en/other_customization-bootup.ssi:35
+#: en/other_customization-bootup.ssi:48 en/other_faq.ssi:37
+#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
+#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
+#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
+#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
+#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
+#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
@@ -151,294 +149,238 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:2
-msgid "B~ Procedures"
+#: en/project_coding-style.ssi:2
+msgid "B~ Coding Style"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:4
-msgid "1~ Procedures"
+#: en/project_coding-style.ssi:4
+msgid "1~ Coding Style"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:6
-msgid ""
-"This chapter documents the procedures within the Debian Live project for "
-"various tasks that need cooperation with other teams in Debian."
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:8
-msgid "2~ Udeb Uploads"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:10
-msgid "Before commiting releases of a udeb in d-i svn, one has to call:"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:14
-msgid "../../scripts/l10n/output-l10n-changes . -d"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:18
-msgid "2~ Major Releases"
+#: en/project_coding-style.ssi:6
+msgid "This chapter documents the coding style used in live-boot and others."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:20
-msgid ""
-"Releasing a new stable major version of Debian includes a lot of different "
-"teams working together to make it happen. At some point, the Live team comes "
-"in and builds live system images. The requirements to do this are:"
+#: en/project_coding-style.ssi:8
+msgid "2~ Compatibility"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:22
+#: en/project_coding-style.ssi:10
msgid ""
-"_* A mirror containing the released versions for the debian, debian-security "
-"and debian-volatile archive which the debian-live buildd can access."
+"_* Don't use syntax or semantics that are unique to the Bash shell. For "
+"example, the use of array constructs."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:24
-msgid ""
-"_* The names of the image need to be known (e.g. debian-live-VERSION-ARCH-"
-"FLAVOUR.iso)."
+#: en/project_coding-style.ssi:12
+msgid "_* Only use the POSIX subset - for example, use $(foo) over `foo`."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:26
-msgid "_* The packagelists need to have been updated."
+#: en/project_coding-style.ssi:14
+msgid "_* You can check your scripts with 'sh -n' and 'checkbashisms'."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:28
-msgid "_* The data from debian-cd needs to be synced (udeb exclude lists)."
+#: en/project_coding-style.ssi:16
+msgid "2~ Indenting"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:30
-msgid ""
-"_* The includes from debian-cd needs to be synced (README.*, doc/*, etc.)."
+#: en/project_coding-style.ssi:18
+msgid "_* Always use tabs over spaces."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:32 en/project_procedures.ssi:38
-msgid "_* Images are built and mirrored on cdimage.debian.org."
+#: en/project_coding-style.ssi:20
+msgid "2~ Wrapping"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:34
-msgid "2~ Point Releases"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:36
-msgid ""
-"_* Again, we need updated mirror of debian, debian-security and debian-"
-"volatile."
+#: en/project_coding-style.ssi:22
+msgid "_* Generally, lines are 80 chars at maximum."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:40
-msgid "_* Send announcement mail."
+#: en/project_coding-style.ssi:24
+msgid "_* Use the \"Linux style\" of line breaks:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:42
-msgid "3~ Point release announcement template"
+#: en/project_coding-style.ssi:26 en/project_coding-style.ssi:49
+#: en/project_coding-style.ssi:90 en/project_coding-style.ssi:108
+msgid "Bad:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:44
-msgid ""
-"An annoucement mail for point releases can be generated using the template "
-"below and the following command:"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:52
+#: en/project_coding-style.ssi:32
#, no-wrap
msgid ""
-"$ sed \\\n"
-" -e 's|%major%|5.0|g' \\\n"
-" -e 's|%minor%|5.0.2|g' \\\n"
-" -e 's|%codename%|lenny|g' \\\n"
-" -e 's|%release_mail%|2009/msg00007.html|g'\n"
+"if foo; then\n"
+" bar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:56
-msgid ""
-"Please check the mail carefully before sending and pass it to others for "
-"proof-reading."
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:59
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:119
+msgid "Good:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:60
-msgid "Debian Live images for Debian GNU/Linux %major% updated"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:64
+#: en/project_coding-style.ssi:43
+#, no-wrap
msgid ""
-"The Debian Live project is pleased to announce the availability of updated "
-"Live images for its stable distribution Debian GNU/Linux %major% (codename "
-"\"%codename%\")."
+"if foo\n"
+"then\n"
+" bar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:66
-msgid "The images are available for download at:"
+#: en/project_coding-style.ssi:47
+msgid "_* The same holds for functions:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:68
+#: en/project_coding-style.ssi:55
#, no-wrap
-msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:73
msgid ""
-"This update incorporates the changes made in the %minor% point release, "
-"which adds corrections for security problems to the stable release along "
-"with a few adjustments for serious problems. A full list of the changes may "
-"be viewed at:"
+"foo () {\n"
+" bar\n"
+"}\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:75
+#: en/project_coding-style.ssi:66
#, no-wrap
-msgid " <http://lists.debian.org/debian-announce/%release_mail%>\n"
+msgid ""
+"foo ()\n"
+"{\n"
+" bar\n"
+"}\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:77
-msgid "It also includes the following Live-specific changes:"
+#: en/project_coding-style.ssi:70
+msgid "2~ Variables"
msgstr ""
-#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
-msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
+#. type: Plain text
+#: en/project_coding-style.ssi:72
+msgid "_* Variables are always in capital letters."
msgstr ""
-#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
-msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
+#. type: Plain text
+#: en/project_coding-style.ssi:74
+msgid "_* Variables that used in lb config always start with LH_ prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:84
-#, no-wrap
+#: en/project_coding-style.ssi:76
msgid ""
-"URLs\n"
-"----\n"
+"_* Internal temporary variables in live-build should start with the _LH_ "
+"prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:87
-msgid "Download location of updated images:"
+#: en/project_coding-style.ssi:78
+msgid "_* Local variables start with live-build __LH_ prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:89
-#, no-wrap
-msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
-msgstr ""
-
-#. type: Plain text
-#: en/project_procedures.ssi:91
-msgid "Debian Live project homepage:"
+#: en/project_coding-style.ssi:80
+msgid ""
+"_* Variables in connection to a boot parameter in live-config start with "
+"LIVE_."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:93
-#, no-wrap
-msgid " <http://live.debian.net/>\n"
+#: en/project_coding-style.ssi:82
+msgid "_* All other variables in live-config start with _ prefix."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:95
-msgid "The current stable distribution:"
+#: en/project_coding-style.ssi:84
+msgid "_* Use braces around variables; eg. write ${FOO} instead of $FOO."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:97
-#, no-wrap
-msgid " <http://ftp.debian.org/debian/dists/stable>\n"
+#: en/project_coding-style.ssi:86
+msgid ""
+"_* Always protect variables with quotes to respect potential whitespaces, "
+"write \"${FOO}\" not ${FOO}."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:99
-msgid "stable distribution information (release notes, errata etc.):"
+#: en/project_coding-style.ssi:88
+msgid ""
+"_* For consistency reasons, always use quotes when assigning values to "
+"variables:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:101
-#, no-wrap
-msgid " <http://www.debian.org/releases/stable/>\n"
+#: en/project_coding-style.ssi:94
+msgid "FOO=bar"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:103
-msgid "Security announcements and information:"
+#: en/project_coding-style.ssi:102
+msgid "FOO=\"bar\""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:105
-#, no-wrap
-msgid " <http://www.debian.org/security/>\n"
+#: en/project_coding-style.ssi:106
+msgid "_* If multiple variables are used, quote the full expression:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:108
+#: en/project_coding-style.ssi:115
#, no-wrap
msgid ""
-"About Debian\n"
-"-------------\n"
+"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
+"then\n"
+" foobar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:113
+#: en/project_coding-style.ssi:126
+#, no-wrap
msgid ""
-"The Debian Project is an association of Free Software developers who "
-"volunteer their time and effort in order to produce the completely free "
-"operating system Debian GNU/Linux."
+"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
+"then\n"
+" foobar\n"
+"fi\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:116
-#, no-wrap
-msgid ""
-"About Debian Live\n"
-"-----------------\n"
+#: en/project_coding-style.ssi:130
+msgid "2~ Miscellaneous"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:122
+#: en/project_coding-style.ssi:132
msgid ""
-"Debian Live is an official sub-project of Debian which produces Debian "
-"systems that do not require a classical installer. Images are available for "
-"CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem "
-"images for booting directly from the internet."
+"_* Use \"|\" (without the surround quotes) as a seperator in calls to sed, e."
+"g. \"sed -e 's|foo|bar|'\" (without \"\")."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:125
-#, no-wrap
+#: en/project_coding-style.ssi:134
msgid ""
-"Contact Information\n"
-"-------------------\n"
+"_* Don't use the test command for comparisons or tests, use \"[\" "
+"\"]\" (without \"\"), e.g. \"if [ -x /bin/foo ]; ...\" and not \"if test -x /"
+"bin/foo; ...\"."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:130
+#: en/project_coding-style.ssi:135
msgid ""
-"For further information, please visit the Debian Live web pages at <http://"
-"live.debian.net/> or alternatively send mail to <debian-live at lists.debian."
-"org>."
+"_* Use case wherever possible over test, as it's easier to read and faster "
+"in execution."
msgstr ""
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index d2ba330..1a76eec 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -84,5 +84,3 @@ only after it has been reviewed.
% << other_resources.ssi
% << other_configuration-layout.ssi
-
-% << other_configuration-files.ssi
diff --git a/manual/pt_BR/other_configuration-files.ssi b/manual/pt_BR/other_configuration-files.ssi
deleted file mode 100644
index 9a687e5..0000000
--- a/manual/pt_BR/other_configuration-files.ssi
+++ /dev/null
@@ -1,232 +0,0 @@
-B~ Configuration files
-
-1~ Configuration files
-
-2~ The config/binary file
-
-_* LH_BINARY_FILESYSTEM: Set image filesystem. (see configuration-layout)
-
-_* LH_BINARY_IMAGES: Set image type. (see configuration-layout)
-
-_* LH_BINARY_INDICES: Set apt/aptitude generic indices. (see
-configuration-layout)
-
-_* LH_BOOTAPPEND_LIVE: Set boot parameters. (see configuration-layout)
-
-_* LH_BOOTAPPEND_INSTALL: Set boot parameters. (see configuration-layout)
-
-_* LH_BOOTLOADER: Set bootloader. (see bootloaders)
-
-_* LH_CHECKSUMS: Set checksums. (see cheat-codes)
-
-_* LH_CHROOT_BUILD: Control if we build binary images chrooted. (see
-configuration-layout)
-
-_* LH_DEBIAN_INSTALLER: Set debian-installer. (see debian-installer)
-
-_* LH_DEBIAN_INSTALLER_DAILY: Set daily images. (see debian-installer)
-
-_* LH_ENCRYPTION: Set encrytion. (see configuration layout)
-
-_* LH_GRUB_SPLASH: Set custom grub splash. (see splash-screen)
-
-_* LH_HOSTNAME: Set hostname. (see hostname)
-
-_* LH_ISO_APPLICATION: Set iso author. (see iso-metadata)
-
-_* LH_ISO_PREPARER: Set iso preparer. (see iso-metadata)
-
-_* LH_ISO_PUBLISHER: Set iso publisher. (see iso-metadata)
-
-_* LH_ISO_VOLUME: Set iso volume (max 32 chars). (see iso-metadata)
-
-_* LH_JFFS2_ERASEBLOCK: Set jffs2 eraseblock size. (see configuration
-layout)
-
-_* LH_MEMTEST: Set memtest. (see memtest)
-
-_* LH_NET_ROOT_FILESYSTEM: Set netboot filesystem. (see configuration
-layout)
-
-_* LH_NET_ROOT_MOUNTOPTIONS: Set nfsopts. (see configuration layout)
-
-_* LH_NET_ROOT_PATH: Set netboot server directory. (see configuration
-layout)
-
-_* LH_NET_ROOT_SERVER: Set netboot server address. (see configuration
-layout)
-
-_* LH_NET_COW_FILESYSTEM: Set net client cow filesystem. (see configuration
-layout)
-
-_* LH_NET_COW_MOUNTOPTIONS: Set cow mount options. (see configuration
-layout)
-
-_* LH_NET_COW_PATH: Set cow directory. (see configuration layout)
-
-_* LH_NET_COW_SERVER: Set cow server. (see configuration layout)
-
-_* LH_NET_TARBALL: Set net tarball. (see configuration layout)
-
-_* LH_SYSLINUX_SPLASH: Set custom syslinux splash. (see splash-screen)
-
-_* LH_SYSLINUX_TIMEOUT: Set custom syslinux timeout in seconds. (see
-syslinux)
-
-_* LH_SYSLINUX_CFG: Set custom syslinux configuration file. (see syslinux)
-
-_* LH_SYSLINUX_MENU: Set syslinux menu. (see syslinux)
-
-_* LH_SYSLINUX_MENU_LIVE_ENTRY: Set text to be used on the menu for live
-entries. (see syslinux)
-
-_* LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: Set text to be used on the menu for
-live entries (failsafe ones). (see syslinux)
-
-_* LH_SYSLINUX_MENU_MEMTEST_ENTRY: Set text to be used on the menu for
-memtest entry. (see syslinux and memtest)
-
-_* LH_USERNAME: Set username. (see the-live-user)
-
-2~ The config/bootstrap file
-
-_* LH_ARCHITECTURE: Select chroot architecture. (see configuration layout)
-
-_* LH_BOOTSTRAP_CONFIG: Set distribution config directory. (see
-configuration layout)
-
-_* LH_BOOTSTRAP_INCLUDE: Include packages on base. (see configuration
-layout)
-
-_* LH_BOOTSTRAP_EXCLUDE: Exclude packages on base. (see configuration
-layout)
-
-_* LH_BOOTSTRAP_FLAVOUR: Select flavour to use. (see configuration layout)
-
-_* LH_BOOTSTRAP_KEYRING: Set distribution keyring. (see configuration
-layout)
-
-_* LH_DISTRIBUTION: Select distribution to use. (see configuration layout)
-
-_* LH_MIRROR_BOOTSTRAP: Set mirror to bootstrap from. (see package-sources)
-
-_* LH_MIRROR_CHROOT: Set mirror to fetch packages from. (see
-package-sources)
-
-_* LH_MIRROR_CHROOT_SECURITY: Set security mirror to fetch packages
-from. (see package-sources)
-
-_* LH_MIRROR_BINARY: Set mirror which ends up in the image. (see
-package-sources)
-
-_* LH_MIRROR_BINARY_SECURITY: Set security mirror which ends up in the
-image. (see package-sources)
-
-_* LH_SECTIONS: select section(s) to use. (see package-sources)
-
-2~ The config/chroot file
-
-_* LH_CHROOT_FILESYSTEM: Set chroot filesystem. (see configuration layout)
-
-_* LH_UNION_FILESYSTEM: Set union filesystem. (see configuration layout)
-
-_* LH_EXPOSED_ROOT: expose root as read only. (see configuration layout)
-
-_* LH_HOOKS: Set hook commands.
-
-_* LH_INTERACTIVE: Set interactive build. (see configuration layout)
-
-_* LH_KEYRING_PACKAGES: Set keyring packages. (see configuration layout)
-
-_* LH_LANGUAGE: Set language to use. (see l10n)
-
-_* LH_LINUX_FLAVOURS: Set kernel flavour to use. (see kernel)
-
-_* LH_LINUX_PACKAGES: Set kernel packages to use. (see kernel)
-
-_* LH_PACKAGES: Set packages to install. (see packages)
-
-_* LH_PACKAGES_LISTS: Set package list to install. (see packages-lists)
-
-_* LH_TASKS: Set tasks to install. (see tasks)
-
-_* LH_SECURITY: enable security updates. (see package-sources)
-
-_* LH_SYMLINKS: enable symlink convertion.
-
-_* LH_SYSVINIT: enable sysvinit. (see startup-scripts)
-
-2~ The config/common file
-
-_* LH_APT: Set package manager. (see package-installation)
-
-_* LH_APT_FTP_PROXY: Set apt/aptitude ftp proxy. (see package-installation)
-
-_* LH_APT_HTTP_PROXY: Set apt/aptitude http proxy. (see
-package-installation)
-
-_* LH_APT_PDIFFS: Set apt/aptitude pdiff indices. (see package-installation)
-
-_* LH_APT_PIPELINE: Set apt/aptitude pipeline depth. (see
-package-installation)
-
-_* LH_APT_RECOMMENDS: Set apt/aptitude recommends. (see
-package-installation)
-
-_* LH_APT_SECURE: Set apt/aptitude security. (see package-installation)
-
-_* LH_BOOTSTRAP: Set bootstrap program. (see configuration layout)
-
-_* LH_CACHE: control cache. (see configuration layout)
-
-_* LH_CACHE_INDICES: control if downloaded package indices should be
-cached. (see configuration layout)
-
-_* LH_CACHE_PACKAGES: control if downloaded packages files should be
-cached. (see configuration layout)
-
-_* LH_CACHE_STAGES: control if completed stages should be cached. (see
-configuration layout)
-
-_* LH_DEBCONF_FRONTEND: Set debconf(1) frontend to use. (see configuration
-layout)
-
-_* LH_DEBCONF_NOWARNINGS: Set debconf(1) warnings. (see configuration
-layout)
-
-_* LH_DEBCONF_PRIORITY: Set debconf(1) priority to use. (see configuration
-layout)
-
-_* LH_INITRAMFS: Set initramfs hook. (see configuration layout)
-
-_* LH_FDISK: Set fdisk program. (see configuration layout)
-
-_* LH_LOSETUP: Set losetup program. (see configuration layout)
-
-_* LH_MODE: Set distribution mode. (see configuration layout)
-
-_* LH_ROOT_COMMAND: use sudo or equivalent. (see configuration layout)
-
-_* LH_USE_FAKEROOT: use fakeroot/fakechroot. (see configuration layout)
-
-_* LH_TASKSEL: Set tasksel program. (see tasks)
-
-_* LH_INCLUDES: Set includes. (see configuration layout)
-
-_* LH_TEMPLATES: Set templates. (see configuration layout)
-
-_* LH_BREAKPOINTS: enable breakpoints. (see configuration layout)
-
-_* LH_DEBUG: enable debug. (see configuration layout)
-
-_* LH_FORCE: enable force. (see configuration layout)
-
-_* LH_QUIET: enable quiet. (see configuration layout)
-
-_* LH_VERBOSE: enable verbose. (see configuration layout)
-
-2~ The config/source file
-
-_* LH_SOURCE: Set source option. (see configuration layout)
-
-_* LH_SOURCE_IMAGES: Set image type. (see configuration layout)
diff --git a/manual/en/project_coding-style.ssi b/manual/pt_BR/project_coding-style.ssi
similarity index 85%
copy from manual/en/project_coding-style.ssi
copy to manual/pt_BR/project_coding-style.ssi
index 9ef5507..a0e5959 100644
--- a/manual/en/project_coding-style.ssi
+++ b/manual/pt_BR/project_coding-style.ssi
@@ -6,7 +6,8 @@ This chapter documents the coding style used in live-boot and others.
2~ Compatibility
-_* Don't use syntax or semantics that are unique to the Bash shell. For example, the use of array constructs.
+_* Don't use syntax or semantics that are unique to the Bash shell. For
+example, the use of array constructs.
_* Only use the POSIX subset - for example, use $(foo) over `foo`.
@@ -72,19 +73,23 @@ _* Variables are always in capital letters.
_* Variables that used in lb config always start with LH_ prefix.
-_* Internal temporary variables in live-build should start with the _LH_ prefix.
+_* Internal temporary variables in live-build should start with the _LH_
+prefix.
_* Local variables start with live-build __LH_ prefix.
-_* Variables in connection to a boot parameter in live-config start with LIVE_.
+_* Variables in connection to a boot parameter in live-config start with
+LIVE_.
_* All other variables in live-config start with _ prefix.
_* Use braces around variables; eg. write ${FOO} instead of $FOO.
-_* Always protect variables with quotes to respect potential whitespaces, write "${FOO}" not ${FOO}.
+_* Always protect variables with quotes to respect potential whitespaces,
+write "${FOO}" not ${FOO}.
-_* For consistency reasons, always use quotes when assigning values to variables:
+_* For consistency reasons, always use quotes when assigning values to
+variables:
Bad:
@@ -128,8 +133,11 @@ fi
2~ Miscellaneous
-_* Use "|" (without the surround quotes) as a seperator in calls to sed, e.g. "sed -e 's|foo|bar|'" (without "").
+_* Use "|" (without the surround quotes) as a seperator in calls to sed,
+e.g. "sed -e 's|foo|bar|'" (without "").
-_* Don't use the test command for comparisons or tests, use "[" "]" (without ""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".
+_* Don't use the test command for comparisons or tests, use "[" "]" (without
+""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".
-_* Use case wherever possible over test, as it's easier to read and faster in execution.
+_* Use case wherever possible over test, as it's easier to read and faster
+in execution.
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index d2ba330..1a76eec 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -84,5 +84,3 @@ only after it has been reviewed.
% << other_resources.ssi
% << other_configuration-layout.ssi
-
-% << other_configuration-files.ssi
diff --git a/manual/ro/other_configuration-files.ssi b/manual/ro/other_configuration-files.ssi
deleted file mode 100644
index 9a687e5..0000000
--- a/manual/ro/other_configuration-files.ssi
+++ /dev/null
@@ -1,232 +0,0 @@
-B~ Configuration files
-
-1~ Configuration files
-
-2~ The config/binary file
-
-_* LH_BINARY_FILESYSTEM: Set image filesystem. (see configuration-layout)
-
-_* LH_BINARY_IMAGES: Set image type. (see configuration-layout)
-
-_* LH_BINARY_INDICES: Set apt/aptitude generic indices. (see
-configuration-layout)
-
-_* LH_BOOTAPPEND_LIVE: Set boot parameters. (see configuration-layout)
-
-_* LH_BOOTAPPEND_INSTALL: Set boot parameters. (see configuration-layout)
-
-_* LH_BOOTLOADER: Set bootloader. (see bootloaders)
-
-_* LH_CHECKSUMS: Set checksums. (see cheat-codes)
-
-_* LH_CHROOT_BUILD: Control if we build binary images chrooted. (see
-configuration-layout)
-
-_* LH_DEBIAN_INSTALLER: Set debian-installer. (see debian-installer)
-
-_* LH_DEBIAN_INSTALLER_DAILY: Set daily images. (see debian-installer)
-
-_* LH_ENCRYPTION: Set encrytion. (see configuration layout)
-
-_* LH_GRUB_SPLASH: Set custom grub splash. (see splash-screen)
-
-_* LH_HOSTNAME: Set hostname. (see hostname)
-
-_* LH_ISO_APPLICATION: Set iso author. (see iso-metadata)
-
-_* LH_ISO_PREPARER: Set iso preparer. (see iso-metadata)
-
-_* LH_ISO_PUBLISHER: Set iso publisher. (see iso-metadata)
-
-_* LH_ISO_VOLUME: Set iso volume (max 32 chars). (see iso-metadata)
-
-_* LH_JFFS2_ERASEBLOCK: Set jffs2 eraseblock size. (see configuration
-layout)
-
-_* LH_MEMTEST: Set memtest. (see memtest)
-
-_* LH_NET_ROOT_FILESYSTEM: Set netboot filesystem. (see configuration
-layout)
-
-_* LH_NET_ROOT_MOUNTOPTIONS: Set nfsopts. (see configuration layout)
-
-_* LH_NET_ROOT_PATH: Set netboot server directory. (see configuration
-layout)
-
-_* LH_NET_ROOT_SERVER: Set netboot server address. (see configuration
-layout)
-
-_* LH_NET_COW_FILESYSTEM: Set net client cow filesystem. (see configuration
-layout)
-
-_* LH_NET_COW_MOUNTOPTIONS: Set cow mount options. (see configuration
-layout)
-
-_* LH_NET_COW_PATH: Set cow directory. (see configuration layout)
-
-_* LH_NET_COW_SERVER: Set cow server. (see configuration layout)
-
-_* LH_NET_TARBALL: Set net tarball. (see configuration layout)
-
-_* LH_SYSLINUX_SPLASH: Set custom syslinux splash. (see splash-screen)
-
-_* LH_SYSLINUX_TIMEOUT: Set custom syslinux timeout in seconds. (see
-syslinux)
-
-_* LH_SYSLINUX_CFG: Set custom syslinux configuration file. (see syslinux)
-
-_* LH_SYSLINUX_MENU: Set syslinux menu. (see syslinux)
-
-_* LH_SYSLINUX_MENU_LIVE_ENTRY: Set text to be used on the menu for live
-entries. (see syslinux)
-
-_* LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: Set text to be used on the menu for
-live entries (failsafe ones). (see syslinux)
-
-_* LH_SYSLINUX_MENU_MEMTEST_ENTRY: Set text to be used on the menu for
-memtest entry. (see syslinux and memtest)
-
-_* LH_USERNAME: Set username. (see the-live-user)
-
-2~ The config/bootstrap file
-
-_* LH_ARCHITECTURE: Select chroot architecture. (see configuration layout)
-
-_* LH_BOOTSTRAP_CONFIG: Set distribution config directory. (see
-configuration layout)
-
-_* LH_BOOTSTRAP_INCLUDE: Include packages on base. (see configuration
-layout)
-
-_* LH_BOOTSTRAP_EXCLUDE: Exclude packages on base. (see configuration
-layout)
-
-_* LH_BOOTSTRAP_FLAVOUR: Select flavour to use. (see configuration layout)
-
-_* LH_BOOTSTRAP_KEYRING: Set distribution keyring. (see configuration
-layout)
-
-_* LH_DISTRIBUTION: Select distribution to use. (see configuration layout)
-
-_* LH_MIRROR_BOOTSTRAP: Set mirror to bootstrap from. (see package-sources)
-
-_* LH_MIRROR_CHROOT: Set mirror to fetch packages from. (see
-package-sources)
-
-_* LH_MIRROR_CHROOT_SECURITY: Set security mirror to fetch packages
-from. (see package-sources)
-
-_* LH_MIRROR_BINARY: Set mirror which ends up in the image. (see
-package-sources)
-
-_* LH_MIRROR_BINARY_SECURITY: Set security mirror which ends up in the
-image. (see package-sources)
-
-_* LH_SECTIONS: select section(s) to use. (see package-sources)
-
-2~ The config/chroot file
-
-_* LH_CHROOT_FILESYSTEM: Set chroot filesystem. (see configuration layout)
-
-_* LH_UNION_FILESYSTEM: Set union filesystem. (see configuration layout)
-
-_* LH_EXPOSED_ROOT: expose root as read only. (see configuration layout)
-
-_* LH_HOOKS: Set hook commands.
-
-_* LH_INTERACTIVE: Set interactive build. (see configuration layout)
-
-_* LH_KEYRING_PACKAGES: Set keyring packages. (see configuration layout)
-
-_* LH_LANGUAGE: Set language to use. (see l10n)
-
-_* LH_LINUX_FLAVOURS: Set kernel flavour to use. (see kernel)
-
-_* LH_LINUX_PACKAGES: Set kernel packages to use. (see kernel)
-
-_* LH_PACKAGES: Set packages to install. (see packages)
-
-_* LH_PACKAGES_LISTS: Set package list to install. (see packages-lists)
-
-_* LH_TASKS: Set tasks to install. (see tasks)
-
-_* LH_SECURITY: enable security updates. (see package-sources)
-
-_* LH_SYMLINKS: enable symlink convertion.
-
-_* LH_SYSVINIT: enable sysvinit. (see startup-scripts)
-
-2~ The config/common file
-
-_* LH_APT: Set package manager. (see package-installation)
-
-_* LH_APT_FTP_PROXY: Set apt/aptitude ftp proxy. (see package-installation)
-
-_* LH_APT_HTTP_PROXY: Set apt/aptitude http proxy. (see
-package-installation)
-
-_* LH_APT_PDIFFS: Set apt/aptitude pdiff indices. (see package-installation)
-
-_* LH_APT_PIPELINE: Set apt/aptitude pipeline depth. (see
-package-installation)
-
-_* LH_APT_RECOMMENDS: Set apt/aptitude recommends. (see
-package-installation)
-
-_* LH_APT_SECURE: Set apt/aptitude security. (see package-installation)
-
-_* LH_BOOTSTRAP: Set bootstrap program. (see configuration layout)
-
-_* LH_CACHE: control cache. (see configuration layout)
-
-_* LH_CACHE_INDICES: control if downloaded package indices should be
-cached. (see configuration layout)
-
-_* LH_CACHE_PACKAGES: control if downloaded packages files should be
-cached. (see configuration layout)
-
-_* LH_CACHE_STAGES: control if completed stages should be cached. (see
-configuration layout)
-
-_* LH_DEBCONF_FRONTEND: Set debconf(1) frontend to use. (see configuration
-layout)
-
-_* LH_DEBCONF_NOWARNINGS: Set debconf(1) warnings. (see configuration
-layout)
-
-_* LH_DEBCONF_PRIORITY: Set debconf(1) priority to use. (see configuration
-layout)
-
-_* LH_INITRAMFS: Set initramfs hook. (see configuration layout)
-
-_* LH_FDISK: Set fdisk program. (see configuration layout)
-
-_* LH_LOSETUP: Set losetup program. (see configuration layout)
-
-_* LH_MODE: Set distribution mode. (see configuration layout)
-
-_* LH_ROOT_COMMAND: use sudo or equivalent. (see configuration layout)
-
-_* LH_USE_FAKEROOT: use fakeroot/fakechroot. (see configuration layout)
-
-_* LH_TASKSEL: Set tasksel program. (see tasks)
-
-_* LH_INCLUDES: Set includes. (see configuration layout)
-
-_* LH_TEMPLATES: Set templates. (see configuration layout)
-
-_* LH_BREAKPOINTS: enable breakpoints. (see configuration layout)
-
-_* LH_DEBUG: enable debug. (see configuration layout)
-
-_* LH_FORCE: enable force. (see configuration layout)
-
-_* LH_QUIET: enable quiet. (see configuration layout)
-
-_* LH_VERBOSE: enable verbose. (see configuration layout)
-
-2~ The config/source file
-
-_* LH_SOURCE: Set source option. (see configuration layout)
-
-_* LH_SOURCE_IMAGES: Set image type. (see configuration layout)
diff --git a/manual/en/project_coding-style.ssi b/manual/ro/project_coding-style.ssi
similarity index 85%
copy from manual/en/project_coding-style.ssi
copy to manual/ro/project_coding-style.ssi
index 9ef5507..a0e5959 100644
--- a/manual/en/project_coding-style.ssi
+++ b/manual/ro/project_coding-style.ssi
@@ -6,7 +6,8 @@ This chapter documents the coding style used in live-boot and others.
2~ Compatibility
-_* Don't use syntax or semantics that are unique to the Bash shell. For example, the use of array constructs.
+_* Don't use syntax or semantics that are unique to the Bash shell. For
+example, the use of array constructs.
_* Only use the POSIX subset - for example, use $(foo) over `foo`.
@@ -72,19 +73,23 @@ _* Variables are always in capital letters.
_* Variables that used in lb config always start with LH_ prefix.
-_* Internal temporary variables in live-build should start with the _LH_ prefix.
+_* Internal temporary variables in live-build should start with the _LH_
+prefix.
_* Local variables start with live-build __LH_ prefix.
-_* Variables in connection to a boot parameter in live-config start with LIVE_.
+_* Variables in connection to a boot parameter in live-config start with
+LIVE_.
_* All other variables in live-config start with _ prefix.
_* Use braces around variables; eg. write ${FOO} instead of $FOO.
-_* Always protect variables with quotes to respect potential whitespaces, write "${FOO}" not ${FOO}.
+_* Always protect variables with quotes to respect potential whitespaces,
+write "${FOO}" not ${FOO}.
-_* For consistency reasons, always use quotes when assigning values to variables:
+_* For consistency reasons, always use quotes when assigning values to
+variables:
Bad:
@@ -128,8 +133,11 @@ fi
2~ Miscellaneous
-_* Use "|" (without the surround quotes) as a seperator in calls to sed, e.g. "sed -e 's|foo|bar|'" (without "").
+_* Use "|" (without the surround quotes) as a seperator in calls to sed,
+e.g. "sed -e 's|foo|bar|'" (without "").
-_* Don't use the test command for comparisons or tests, use "[" "]" (without ""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".
+_* Don't use the test command for comparisons or tests, use "[" "]" (without
+""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".
-_* Use case wherever possible over test, as it's easier to read and faster in execution.
+_* Use case wherever possible over test, as it's easier to read and faster
+in execution.
--
live-manual
More information about the debian-live-changes
mailing list