[SCM] live-manual branch, debian, updated. debian/2.0_a11-1-6-gec81e1d

Daniel Baumann daniel at debian.org
Tue Nov 30 10:07:31 UTC 2010


The following commit has been merged in the debian branch:
commit ec81e1d444f4bbae17ccf7c1a9f185841722a9cb
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Nov 30 11:07:09 2010 +0100

    Updating coding-style page and moving it to project.

diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 6803d68..87f486e 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -53,6 +53,8 @@
 
 << project_bugs.ssi
 
+<< project_coding_style.ssi
+
 << project_procedures.ssi
 
 :B~ Examples ~#
@@ -79,8 +81,6 @@ only after it has been reviewed.
 
 % << other_howtos.ssi
 
-% << other_coding-style.ssi
-
 % << other_resources.ssi
 
 % << other_configuration-layout.ssi
diff --git a/manual/de/other_coding-style.ssi b/manual/de/other_coding-style.ssi
deleted file mode 100644
index 15efcdb..0000000
--- a/manual/de/other_coding-style.ssi
+++ /dev/null
@@ -1,135 +0,0 @@
-B~ Coding Style
-
-1~ Coding Style
-
-This chapter documents the coding style used in live-helper and (ideally) in
-live-initramfs.
-
-2~ Compatibility
-
-_* 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`.
-
-_* You can check your scripts with 'sh -n' and 'checkbashisms'
-
-2~ Indenting
-
-_* Always use tabs over spaces.
-
-2~ Wrapping
-
-_* Generally, lines are 80 chars at maximum.
-
-_* Use the "Linux style" of line breaks:
-
-Bad:
-
-code{
-
-if foo; then
-        bar
-fi
-
-}code
-
-Good:
-
-code{
-
-if foo
-then
-        bar
-fi
-
-}code
-
-_* The same holds for functions:
-
-Bad:
-
-code{
-
-foo () {
-        bar
-}
-
-}code
-
-Good:
-
-code{
-
-foo ()
-{
-        bar
-}
-
-}code
-
-2~ Variables
-
-_* Variables are always in capital letters.
-
-_* Variables that used in config always start with LH_ prefix.
-
-_* Internal temporary variables should start with the _LH_ prefix.
-
-_* Local variables start with __LH_ prefix.
-
-_* Use braces around variables; eg. write ${FOO} instead of $FOO.
-
-_* Always protect variables with respect to potential whitespaces, write
-"${FOO}" not ${FOO}.
-
-_* For consistency reasons, always use quotes when assigning values to
-variables:
-
-Bad:
-
-code{
-
-FOO=bar
-
-}code
-
-Good:
-
-code{
-
-FOO="bar"
-
-}code
-
-_* If multiple variables are used, quote the full expression:
-
-Bad:
-
-code{
-
-if [ -f "${FOO}"/foo/"${BAR}"/bar ]
-then
-        foobar
-fi
-
-}code
-
-Good:
-
-code{
-
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-        foobar
-fi
-
-}code
-
-2~ Miscellaneous
-
-_* 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; ...".
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 7970eec..e1302b7 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -53,6 +53,8 @@
 
 << project_bugs.ssi
 
+<< project_coding_style.ssi
+
 << project_procedures.ssi
 
 :B~ Examples ~#
@@ -79,8 +81,6 @@ been reviewed.
 
 % << other_howtos.ssi
 
-% << other_coding-style.ssi
-
 % << other_resources.ssi
 
 % << other_configuration-layout.ssi
diff --git a/manual/en/other_coding-style.ssi b/manual/en/project_coding-style.ssi
similarity index 67%
rename from manual/en/other_coding-style.ssi
rename to manual/en/project_coding-style.ssi
index 7dbabdb..9ef5507 100644
--- a/manual/en/other_coding-style.ssi
+++ b/manual/en/project_coding-style.ssi
@@ -2,7 +2,7 @@ B~ Coding Style
 
 1~ Coding Style
 
-This chapter documents the coding style used in live-helper and (ideally) in live-initramfs.
+This chapter documents the coding style used in live-boot and others.
 
 2~ Compatibility
 
@@ -10,7 +10,7 @@ _* Don't use syntax or semantics that are unique to the Bash shell. For example,
 
 _* Only use the POSIX subset - for example, use $(foo) over `foo`.
 
-_* You can check your scripts with 'sh -n' and 'checkbashisms'
+_* You can check your scripts with 'sh -n' and 'checkbashisms'.
 
 2~ Indenting
 
@@ -70,15 +70,19 @@ foo ()
 
 _* Variables are always in capital letters.
 
-_* Variables that used in config always start with LH_ prefix.
+_* Variables that used in lb config always start with LH_ prefix.
 
-_* Internal temporary variables should start with the _LH_ prefix.
+_* Internal temporary variables in live-build should start with the _LH_ prefix.
 
-_* Local variables start with __LH_ prefix.
+_* Local variables start with live-build __LH_ prefix.
+
+_* 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 respect to 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:
 
@@ -127,3 +131,5 @@ fi
 _* 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; ...".
+
+_* Use case wherever possible over test, as it's easier to read and faster in execution.
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index cfda310..d2ba330 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -53,6 +53,8 @@
 
 << project_bugs.ssi
 
+<< project_coding_style.ssi
+
 << project_procedures.ssi
 
 :B~ Examples ~#
@@ -79,8 +81,6 @@ only after it has been reviewed.
 
 % << other_howtos.ssi
 
-% << other_coding-style.ssi
-
 % << other_resources.ssi
 
 % << other_configuration-layout.ssi
diff --git a/manual/fr/other_coding-style.ssi b/manual/fr/other_coding-style.ssi
deleted file mode 100644
index 15efcdb..0000000
--- a/manual/fr/other_coding-style.ssi
+++ /dev/null
@@ -1,135 +0,0 @@
-B~ Coding Style
-
-1~ Coding Style
-
-This chapter documents the coding style used in live-helper and (ideally) in
-live-initramfs.
-
-2~ Compatibility
-
-_* 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`.
-
-_* You can check your scripts with 'sh -n' and 'checkbashisms'
-
-2~ Indenting
-
-_* Always use tabs over spaces.
-
-2~ Wrapping
-
-_* Generally, lines are 80 chars at maximum.
-
-_* Use the "Linux style" of line breaks:
-
-Bad:
-
-code{
-
-if foo; then
-        bar
-fi
-
-}code
-
-Good:
-
-code{
-
-if foo
-then
-        bar
-fi
-
-}code
-
-_* The same holds for functions:
-
-Bad:
-
-code{
-
-foo () {
-        bar
-}
-
-}code
-
-Good:
-
-code{
-
-foo ()
-{
-        bar
-}
-
-}code
-
-2~ Variables
-
-_* Variables are always in capital letters.
-
-_* Variables that used in config always start with LH_ prefix.
-
-_* Internal temporary variables should start with the _LH_ prefix.
-
-_* Local variables start with __LH_ prefix.
-
-_* Use braces around variables; eg. write ${FOO} instead of $FOO.
-
-_* Always protect variables with respect to potential whitespaces, write
-"${FOO}" not ${FOO}.
-
-_* For consistency reasons, always use quotes when assigning values to
-variables:
-
-Bad:
-
-code{
-
-FOO=bar
-
-}code
-
-Good:
-
-code{
-
-FOO="bar"
-
-}code
-
-_* If multiple variables are used, quote the full expression:
-
-Bad:
-
-code{
-
-if [ -f "${FOO}"/foo/"${BAR}"/bar ]
-then
-        foobar
-fi
-
-}code
-
-Good:
-
-code{
-
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-        foobar
-fi
-
-}code
-
-2~ Miscellaneous
-
-_* 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; ...".
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 2d7c277..2992673 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 10:53+0100\n"
+"POT-Creation-Date: 2010-11-30 11:05+0100\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -151,26 +151,31 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:57
-msgid "<< project_procedures.ssi"
+msgid "<< project_coding_style.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:59
-msgid ":B~ Examples ~#"
+msgid "<< project_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:61
-msgid "<< user_examples.ssi"
+msgid ":B~ Examples ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:63
+msgid "<< user_examples.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:65
 msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:71
 msgid ""
 "Other material that formerly appeared in this section is out of date and/or "
 "has not been approved for release. It has therefore been omitted, but can "
@@ -180,38 +185,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:71
-msgid "% << other_customization-bootup.ssi"
-msgstr ""
-
-#. type: Plain text
 #: en/live-manual.ssm:73
-msgid "% << other_customization-binary.ssi"
+msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:75
-msgid "% << other_common-tasks.ssi"
+msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:77
-msgid "% << other_live-environment.ssi"
+msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:79
-msgid "% << other_faq.ssi"
+msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:81
-msgid "% << other_howtos.ssi"
+msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:83
-msgid "% << other_coding-style.ssi"
+msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/other_coding-style.ssi.po b/manual/po/de/other_coding-style.ssi.po
deleted file mode 100644
index 81ab20f..0000000
--- a/manual/po/de/other_coding-style.ssi.po
+++ /dev/null
@@ -1,350 +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/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: 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/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 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
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: 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/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: 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_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 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/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:2
-msgid "B~ Coding Style"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:4
-msgid "1~ Coding Style"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:6
-msgid ""
-"This chapter documents the coding style used in live-helper and (ideally) in "
-"live-initramfs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:8
-msgid "2~ Compatibility"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:10
-msgid ""
-"_* 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/other_coding-style.ssi:12
-msgid "_* Only use the POSIX subset - for example, use $(foo) over `foo`."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:14
-msgid "_* You can check your scripts with 'sh -n' and 'checkbashisms'"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:16
-msgid "2~ Indenting"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:18
-msgid "_* Always use tabs over spaces."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:20
-msgid "2~ Wrapping"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:22
-msgid "_* Generally, lines are 80 chars at maximum."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:24
-msgid "_* Use the \"Linux style\" of line breaks:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:26 en/other_coding-style.ssi:49
-#: en/other_coding-style.ssi:86 en/other_coding-style.ssi:104
-msgid "Bad:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:32
-#, no-wrap
-msgid ""
-"if foo; then\n"
-"        bar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:36 en/other_coding-style.ssi:59
-#: en/other_coding-style.ssi:94 en/other_coding-style.ssi:115
-msgid "Good:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:43
-#, no-wrap
-msgid ""
-"if foo\n"
-"then\n"
-"        bar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:47
-msgid "_* The same holds for functions:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:55
-#, no-wrap
-msgid ""
-"foo () {\n"
-"        bar\n"
-"}\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:66
-#, no-wrap
-msgid ""
-"foo ()\n"
-"{\n"
-"        bar\n"
-"}\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:70
-msgid "2~ Variables"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:72
-msgid "_* Variables are always in capital letters."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:74
-msgid "_* Variables that used in config always start with LH_ prefix."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:76
-msgid "_* Internal temporary variables should start with the _LH_ prefix."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:78
-msgid "_* Local variables start with __LH_ prefix."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:80
-msgid "_* Use braces around variables; eg. write ${FOO} instead of $FOO."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:82
-msgid ""
-"_* Always protect variables with respect to potential whitespaces, write "
-"\"${FOO}\" not ${FOO}."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:84
-msgid ""
-"_* For consistency reasons, always use quotes when assigning values to "
-"variables:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:90
-msgid "FOO=bar"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:98
-msgid "FOO=\"bar\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:102
-msgid "_* If multiple variables are used, quote the full expression:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:111
-#, no-wrap
-msgid ""
-"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:122
-#, no-wrap
-msgid ""
-"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:126
-msgid "2~ Miscellaneous"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:128
-msgid ""
-"_* 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/other_coding-style.ssi:129
-msgid ""
-"_* 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 ""
diff --git a/manual/po/de/user_customization-installer.ssi.po b/manual/po/de/user_customization-installer.ssi.po
index a8ad424..6b7a9c1 100644
--- a/manual/po/de/user_customization-installer.ssi.po
+++ b/manual/po/de/user_customization-installer.ssi.po
@@ -12,7 +12,7 @@ msgstr ""
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 4e1bf3d..a396100 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 10:53+0100\n"
+"POT-Creation-Date: 2010-11-30 11:05+0100\n"
 "PO-Revision-Date: 2010-10-21 07:06-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -151,26 +151,31 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:57
-msgid "<< project_procedures.ssi"
+msgid "<< project_coding_style.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:59
-msgid ":B~ Examples ~#"
+msgid "<< project_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:61
-msgid "<< user_examples.ssi"
+msgid ":B~ Examples ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:63
+msgid "<< user_examples.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:65
 msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:71
 msgid ""
 "Other material that formerly appeared in this section is out of date and/or "
 "has not been approved for release. It has therefore been omitted, but can "
@@ -180,38 +185,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:71
-msgid "% << other_customization-bootup.ssi"
-msgstr ""
-
-#. type: Plain text
 #: en/live-manual.ssm:73
-msgid "% << other_customization-binary.ssi"
+msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:75
-msgid "% << other_common-tasks.ssi"
+msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:77
-msgid "% << other_live-environment.ssi"
+msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:79
-msgid "% << other_faq.ssi"
+msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:81
-msgid "% << other_howtos.ssi"
+msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:83
-msgid "% << other_coding-style.ssi"
+msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/fr/other_coding-style.ssi.po b/manual/po/fr/other_coding-style.ssi.po
deleted file mode 100644
index b86af4d..0000000
--- a/manual/po/fr/other_coding-style.ssi.po
+++ /dev/null
@@ -1,350 +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/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: 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/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 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
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: 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/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: 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_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 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/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/other_coding-style.ssi:2
-msgid "B~ Coding Style"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:4
-msgid "1~ Coding Style"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:6
-msgid ""
-"This chapter documents the coding style used in live-helper and (ideally) in "
-"live-initramfs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:8
-msgid "2~ Compatibility"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:10
-msgid ""
-"_* 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/other_coding-style.ssi:12
-msgid "_* Only use the POSIX subset - for example, use $(foo) over `foo`."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:14
-msgid "_* You can check your scripts with 'sh -n' and 'checkbashisms'"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:16
-msgid "2~ Indenting"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:18
-msgid "_* Always use tabs over spaces."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:20
-msgid "2~ Wrapping"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:22
-msgid "_* Generally, lines are 80 chars at maximum."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:24
-msgid "_* Use the \"Linux style\" of line breaks:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:26 en/other_coding-style.ssi:49
-#: en/other_coding-style.ssi:86 en/other_coding-style.ssi:104
-msgid "Bad:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:32
-#, no-wrap
-msgid ""
-"if foo; then\n"
-"        bar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:36 en/other_coding-style.ssi:59
-#: en/other_coding-style.ssi:94 en/other_coding-style.ssi:115
-msgid "Good:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:43
-#, no-wrap
-msgid ""
-"if foo\n"
-"then\n"
-"        bar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:47
-msgid "_* The same holds for functions:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:55
-#, no-wrap
-msgid ""
-"foo () {\n"
-"        bar\n"
-"}\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:66
-#, no-wrap
-msgid ""
-"foo ()\n"
-"{\n"
-"        bar\n"
-"}\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:70
-msgid "2~ Variables"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:72
-msgid "_* Variables are always in capital letters."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:74
-msgid "_* Variables that used in config always start with LH_ prefix."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:76
-msgid "_* Internal temporary variables should start with the _LH_ prefix."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:78
-msgid "_* Local variables start with __LH_ prefix."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:80
-msgid "_* Use braces around variables; eg. write ${FOO} instead of $FOO."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:82
-msgid ""
-"_* Always protect variables with respect to potential whitespaces, write "
-"\"${FOO}\" not ${FOO}."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:84
-msgid ""
-"_* For consistency reasons, always use quotes when assigning values to "
-"variables:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:90
-msgid "FOO=bar"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:98
-msgid "FOO=\"bar\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:102
-msgid "_* If multiple variables are used, quote the full expression:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:111
-#, no-wrap
-msgid ""
-"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:122
-#, no-wrap
-msgid ""
-"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:126
-msgid "2~ Miscellaneous"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:128
-msgid ""
-"_* 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/other_coding-style.ssi:129
-msgid ""
-"_* 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 ""
diff --git a/manual/po/fr/user_customization-installer.ssi.po b/manual/po/fr/user_customization-installer.ssi.po
index 373c049..2f2af26 100644
--- a/manual/po/fr/user_customization-installer.ssi.po
+++ b/manual/po/fr/user_customization-installer.ssi.po
@@ -12,7 +12,7 @@ msgstr ""
 "Language-Team: none\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 3ec4b5c..b61a6ef 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 10:53+0100\n"
+"POT-Creation-Date: 2010-11-30 11:05+0100\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -151,26 +151,31 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:57
-msgid "<< project_procedures.ssi"
+msgid "<< project_coding_style.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:59
-msgid ":B~ Examples ~#"
+msgid "<< project_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:61
-msgid "<< user_examples.ssi"
+msgid ":B~ Examples ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:63
+msgid "<< user_examples.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:65
 msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:71
 msgid ""
 "Other material that formerly appeared in this section is out of date and/or "
 "has not been approved for release. It has therefore been omitted, but can "
@@ -180,38 +185,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:71
-msgid "% << other_customization-bootup.ssi"
-msgstr ""
-
-#. type: Plain text
 #: en/live-manual.ssm:73
-msgid "% << other_customization-binary.ssi"
+msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:75
-msgid "% << other_common-tasks.ssi"
+msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:77
-msgid "% << other_live-environment.ssi"
+msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:79
-msgid "% << other_faq.ssi"
+msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:81
-msgid "% << other_howtos.ssi"
+msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:83
-msgid "% << other_coding-style.ssi"
+msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/other_coding-style.ssi.po b/manual/po/pt_BR/other_coding-style.ssi.po
deleted file mode 100644
index f1e0e44..0000000
--- a/manual/po/pt_BR/other_coding-style.ssi.po
+++ /dev/null
@@ -1,350 +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/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: 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/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 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
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: 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/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: 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_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 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/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/other_coding-style.ssi:2
-msgid "B~ Coding Style"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:4
-msgid "1~ Coding Style"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:6
-msgid ""
-"This chapter documents the coding style used in live-helper and (ideally) in "
-"live-initramfs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:8
-msgid "2~ Compatibility"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:10
-msgid ""
-"_* 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/other_coding-style.ssi:12
-msgid "_* Only use the POSIX subset - for example, use $(foo) over `foo`."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:14
-msgid "_* You can check your scripts with 'sh -n' and 'checkbashisms'"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:16
-msgid "2~ Indenting"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:18
-msgid "_* Always use tabs over spaces."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:20
-msgid "2~ Wrapping"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:22
-msgid "_* Generally, lines are 80 chars at maximum."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:24
-msgid "_* Use the \"Linux style\" of line breaks:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:26 en/other_coding-style.ssi:49
-#: en/other_coding-style.ssi:86 en/other_coding-style.ssi:104
-msgid "Bad:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:32
-#, no-wrap
-msgid ""
-"if foo; then\n"
-"        bar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:36 en/other_coding-style.ssi:59
-#: en/other_coding-style.ssi:94 en/other_coding-style.ssi:115
-msgid "Good:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:43
-#, no-wrap
-msgid ""
-"if foo\n"
-"then\n"
-"        bar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:47
-msgid "_* The same holds for functions:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:55
-#, no-wrap
-msgid ""
-"foo () {\n"
-"        bar\n"
-"}\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:66
-#, no-wrap
-msgid ""
-"foo ()\n"
-"{\n"
-"        bar\n"
-"}\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:70
-msgid "2~ Variables"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:72
-msgid "_* Variables are always in capital letters."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:74
-msgid "_* Variables that used in config always start with LH_ prefix."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:76
-msgid "_* Internal temporary variables should start with the _LH_ prefix."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:78
-msgid "_* Local variables start with __LH_ prefix."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:80
-msgid "_* Use braces around variables; eg. write ${FOO} instead of $FOO."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:82
-msgid ""
-"_* Always protect variables with respect to potential whitespaces, write "
-"\"${FOO}\" not ${FOO}."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:84
-msgid ""
-"_* For consistency reasons, always use quotes when assigning values to "
-"variables:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:90
-msgid "FOO=bar"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:98
-msgid "FOO=\"bar\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:102
-msgid "_* If multiple variables are used, quote the full expression:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:111
-#, no-wrap
-msgid ""
-"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:122
-#, no-wrap
-msgid ""
-"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:126
-msgid "2~ Miscellaneous"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:128
-msgid ""
-"_* 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/other_coding-style.ssi:129
-msgid ""
-"_* 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 ""
diff --git a/manual/po/pt_BR/user_customization-installer.ssi.po b/manual/po/pt_BR/user_customization-installer.ssi.po
index dcab1d5..54c2a33 100644
--- a/manual/po/pt_BR/user_customization-installer.ssi.po
+++ b/manual/po/pt_BR/user_customization-installer.ssi.po
@@ -12,7 +12,7 @@ msgstr ""
 "Language-Team: none\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index f4f9657..27b208b 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 10:53+0100\n"
+"POT-Creation-Date: 2010-11-30 11:05+0100\n"
 "PO-Revision-Date: 2010-10-23 00:04+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -152,26 +152,31 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:57
-msgid "<< project_procedures.ssi"
+msgid "<< project_coding_style.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:59
-msgid ":B~ Examples ~#"
+msgid "<< project_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:61
-msgid "<< user_examples.ssi"
+msgid ":B~ Examples ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:63
+msgid "<< user_examples.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:65
 msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:71
 msgid ""
 "Other material that formerly appeared in this section is out of date and/or "
 "has not been approved for release. It has therefore been omitted, but can "
@@ -181,38 +186,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:71
-msgid "% << other_customization-bootup.ssi"
-msgstr ""
-
-#. type: Plain text
 #: en/live-manual.ssm:73
-msgid "% << other_customization-binary.ssi"
+msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:75
-msgid "% << other_common-tasks.ssi"
+msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:77
-msgid "% << other_live-environment.ssi"
+msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:79
-msgid "% << other_faq.ssi"
+msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:81
-msgid "% << other_howtos.ssi"
+msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:83
-msgid "% << other_coding-style.ssi"
+msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/other_coding-style.ssi.po b/manual/po/ro/other_coding-style.ssi.po
deleted file mode 100644
index 980c8ad..0000000
--- a/manual/po/ro/other_coding-style.ssi.po
+++ /dev/null
@@ -1,351 +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/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: 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/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 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
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: 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/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: 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_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 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/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/other_coding-style.ssi:2
-msgid "B~ Coding Style"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:4
-msgid "1~ Coding Style"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:6
-msgid ""
-"This chapter documents the coding style used in live-helper and (ideally) in "
-"live-initramfs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:8
-msgid "2~ Compatibility"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:10
-msgid ""
-"_* 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/other_coding-style.ssi:12
-msgid "_* Only use the POSIX subset - for example, use $(foo) over `foo`."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:14
-msgid "_* You can check your scripts with 'sh -n' and 'checkbashisms'"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:16
-msgid "2~ Indenting"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:18
-msgid "_* Always use tabs over spaces."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:20
-msgid "2~ Wrapping"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:22
-msgid "_* Generally, lines are 80 chars at maximum."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:24
-msgid "_* Use the \"Linux style\" of line breaks:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:26 en/other_coding-style.ssi:49
-#: en/other_coding-style.ssi:86 en/other_coding-style.ssi:104
-msgid "Bad:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:32
-#, no-wrap
-msgid ""
-"if foo; then\n"
-"        bar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:36 en/other_coding-style.ssi:59
-#: en/other_coding-style.ssi:94 en/other_coding-style.ssi:115
-msgid "Good:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:43
-#, no-wrap
-msgid ""
-"if foo\n"
-"then\n"
-"        bar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:47
-msgid "_* The same holds for functions:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:55
-#, no-wrap
-msgid ""
-"foo () {\n"
-"        bar\n"
-"}\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:66
-#, no-wrap
-msgid ""
-"foo ()\n"
-"{\n"
-"        bar\n"
-"}\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:70
-msgid "2~ Variables"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:72
-msgid "_* Variables are always in capital letters."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:74
-msgid "_* Variables that used in config always start with LH_ prefix."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:76
-msgid "_* Internal temporary variables should start with the _LH_ prefix."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:78
-msgid "_* Local variables start with __LH_ prefix."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:80
-msgid "_* Use braces around variables; eg. write ${FOO} instead of $FOO."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:82
-msgid ""
-"_* Always protect variables with respect to potential whitespaces, write "
-"\"${FOO}\" not ${FOO}."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:84
-msgid ""
-"_* For consistency reasons, always use quotes when assigning values to "
-"variables:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:90
-msgid "FOO=bar"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:98
-msgid "FOO=\"bar\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:102
-msgid "_* If multiple variables are used, quote the full expression:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:111
-#, no-wrap
-msgid ""
-"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:122
-#, no-wrap
-msgid ""
-"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:126
-msgid "2~ Miscellaneous"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:128
-msgid ""
-"_* 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/other_coding-style.ssi:129
-msgid ""
-"_* 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 ""
diff --git a/manual/po/ro/user_customization-installer.ssi.po b/manual/po/ro/user_customization-installer.ssi.po
index a040b40..d9f0ab2 100644
--- a/manual/po/ro/user_customization-installer.ssi.po
+++ b/manual/po/ro/user_customization-installer.ssi.po
@@ -12,7 +12,7 @@ msgstr ""
 "Language-Team: none\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\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"
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index 69324e8..e7393ee 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -3,7 +3,6 @@
 [type: text] en/live-manual.ssm $lang:$lang/live-manual.ssm
 [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_coding-style.ssi $lang:$lang/other_coding-style.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
@@ -14,6 +13,7 @@
 [type: text] en/other_live-environment.ssi $lang:$lang/other_live-environment.ssi
 [type: text] en/other_resources.ssi $lang:$lang/other_resources.ssi
 [type: text] en/project_bugs.ssi $lang:$lang/project_bugs.ssi
+[type: text] en/project_coding-style.ssi $lang:$lang/project_coding-style.ssi
 [type: text] en/project_procedures.ssi $lang:$lang/project_procedures.ssi
 [type: text] en/user_basics.ssi $lang:$lang/user_basics.ssi
 [type: text] en/user_customization-contents.ssi $lang:$lang/user_customization-contents.ssi
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index af1fa99..441476b 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 10:53+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"
@@ -151,26 +151,31 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:57
-msgid "<< project_procedures.ssi"
+msgid "<< project_coding_style.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:59
-msgid ":B~ Examples ~#"
+msgid "<< project_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:61
-msgid "<< user_examples.ssi"
+msgid ":B~ Examples ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:63
+msgid "<< user_examples.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:65
 msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:71
 msgid ""
 "Other material that formerly appeared in this section is out of date and/or "
 "has not been approved for release. It has therefore been omitted, but can "
@@ -180,38 +185,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:71
-msgid "% << other_customization-bootup.ssi"
-msgstr ""
-
-#. type: Plain text
 #: en/live-manual.ssm:73
-msgid "% << other_customization-binary.ssi"
+msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:75
-msgid "% << other_common-tasks.ssi"
+msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:77
-msgid "% << other_live-environment.ssi"
+msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:79
-msgid "% << other_faq.ssi"
+msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:81
-msgid "% << other_howtos.ssi"
+msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:83
-msgid "% << other_coding-style.ssi"
+msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/other_coding-style.ssi.pot b/manual/pot/other_coding-style.ssi.pot
deleted file mode 100644
index a1dfa3c..0000000
--- a/manual/pot/other_coding-style.ssi.pot
+++ /dev/null
@@ -1,350 +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/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: 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/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 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
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: 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/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: 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_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 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/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:2
-msgid "B~ Coding Style"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:4
-msgid "1~ Coding Style"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:6
-msgid ""
-"This chapter documents the coding style used in live-helper and (ideally) in "
-"live-initramfs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:8
-msgid "2~ Compatibility"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:10
-msgid ""
-"_* 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/other_coding-style.ssi:12
-msgid "_* Only use the POSIX subset - for example, use $(foo) over `foo`."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:14
-msgid "_* You can check your scripts with 'sh -n' and 'checkbashisms'"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:16
-msgid "2~ Indenting"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:18
-msgid "_* Always use tabs over spaces."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:20
-msgid "2~ Wrapping"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:22
-msgid "_* Generally, lines are 80 chars at maximum."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:24
-msgid "_* Use the \"Linux style\" of line breaks:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:26 en/other_coding-style.ssi:49
-#: en/other_coding-style.ssi:86 en/other_coding-style.ssi:104
-msgid "Bad:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:32
-#, no-wrap
-msgid ""
-"if foo; then\n"
-"        bar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:36 en/other_coding-style.ssi:59
-#: en/other_coding-style.ssi:94 en/other_coding-style.ssi:115
-msgid "Good:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:43
-#, no-wrap
-msgid ""
-"if foo\n"
-"then\n"
-"        bar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:47
-msgid "_* The same holds for functions:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:55
-#, no-wrap
-msgid ""
-"foo () {\n"
-"        bar\n"
-"}\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:66
-#, no-wrap
-msgid ""
-"foo ()\n"
-"{\n"
-"        bar\n"
-"}\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:70
-msgid "2~ Variables"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:72
-msgid "_* Variables are always in capital letters."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:74
-msgid "_* Variables that used in config always start with LH_ prefix."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:76
-msgid "_* Internal temporary variables should start with the _LH_ prefix."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:78
-msgid "_* Local variables start with __LH_ prefix."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:80
-msgid "_* Use braces around variables; eg. write ${FOO} instead of $FOO."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:82
-msgid ""
-"_* Always protect variables with respect to potential whitespaces, write "
-"\"${FOO}\" not ${FOO}."
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:84
-msgid ""
-"_* For consistency reasons, always use quotes when assigning values to "
-"variables:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:90
-msgid "FOO=bar"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:98
-msgid "FOO=\"bar\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:102
-msgid "_* If multiple variables are used, quote the full expression:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:111
-#, no-wrap
-msgid ""
-"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:122
-#, no-wrap
-msgid ""
-"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:126
-msgid "2~ Miscellaneous"
-msgstr ""
-
-#. type: Plain text
-#: en/other_coding-style.ssi:128
-msgid ""
-"_* 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/other_coding-style.ssi:129
-msgid ""
-"_* 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 ""
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index cfda310..d2ba330 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -53,6 +53,8 @@
 
 << project_bugs.ssi
 
+<< project_coding_style.ssi
+
 << project_procedures.ssi
 
 :B~ Examples ~#
@@ -79,8 +81,6 @@ only after it has been reviewed.
 
 % << other_howtos.ssi
 
-% << other_coding-style.ssi
-
 % << other_resources.ssi
 
 % << other_configuration-layout.ssi
diff --git a/manual/pt_BR/other_coding-style.ssi b/manual/pt_BR/other_coding-style.ssi
deleted file mode 100644
index 15efcdb..0000000
--- a/manual/pt_BR/other_coding-style.ssi
+++ /dev/null
@@ -1,135 +0,0 @@
-B~ Coding Style
-
-1~ Coding Style
-
-This chapter documents the coding style used in live-helper and (ideally) in
-live-initramfs.
-
-2~ Compatibility
-
-_* 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`.
-
-_* You can check your scripts with 'sh -n' and 'checkbashisms'
-
-2~ Indenting
-
-_* Always use tabs over spaces.
-
-2~ Wrapping
-
-_* Generally, lines are 80 chars at maximum.
-
-_* Use the "Linux style" of line breaks:
-
-Bad:
-
-code{
-
-if foo; then
-        bar
-fi
-
-}code
-
-Good:
-
-code{
-
-if foo
-then
-        bar
-fi
-
-}code
-
-_* The same holds for functions:
-
-Bad:
-
-code{
-
-foo () {
-        bar
-}
-
-}code
-
-Good:
-
-code{
-
-foo ()
-{
-        bar
-}
-
-}code
-
-2~ Variables
-
-_* Variables are always in capital letters.
-
-_* Variables that used in config always start with LH_ prefix.
-
-_* Internal temporary variables should start with the _LH_ prefix.
-
-_* Local variables start with __LH_ prefix.
-
-_* Use braces around variables; eg. write ${FOO} instead of $FOO.
-
-_* Always protect variables with respect to potential whitespaces, write
-"${FOO}" not ${FOO}.
-
-_* For consistency reasons, always use quotes when assigning values to
-variables:
-
-Bad:
-
-code{
-
-FOO=bar
-
-}code
-
-Good:
-
-code{
-
-FOO="bar"
-
-}code
-
-_* If multiple variables are used, quote the full expression:
-
-Bad:
-
-code{
-
-if [ -f "${FOO}"/foo/"${BAR}"/bar ]
-then
-        foobar
-fi
-
-}code
-
-Good:
-
-code{
-
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-        foobar
-fi
-
-}code
-
-2~ Miscellaneous
-
-_* 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; ...".
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index cfda310..d2ba330 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -53,6 +53,8 @@
 
 << project_bugs.ssi
 
+<< project_coding_style.ssi
+
 << project_procedures.ssi
 
 :B~ Examples ~#
@@ -79,8 +81,6 @@ only after it has been reviewed.
 
 % << other_howtos.ssi
 
-% << other_coding-style.ssi
-
 % << other_resources.ssi
 
 % << other_configuration-layout.ssi
diff --git a/manual/ro/other_coding-style.ssi b/manual/ro/other_coding-style.ssi
deleted file mode 100644
index 15efcdb..0000000
--- a/manual/ro/other_coding-style.ssi
+++ /dev/null
@@ -1,135 +0,0 @@
-B~ Coding Style
-
-1~ Coding Style
-
-This chapter documents the coding style used in live-helper and (ideally) in
-live-initramfs.
-
-2~ Compatibility
-
-_* 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`.
-
-_* You can check your scripts with 'sh -n' and 'checkbashisms'
-
-2~ Indenting
-
-_* Always use tabs over spaces.
-
-2~ Wrapping
-
-_* Generally, lines are 80 chars at maximum.
-
-_* Use the "Linux style" of line breaks:
-
-Bad:
-
-code{
-
-if foo; then
-        bar
-fi
-
-}code
-
-Good:
-
-code{
-
-if foo
-then
-        bar
-fi
-
-}code
-
-_* The same holds for functions:
-
-Bad:
-
-code{
-
-foo () {
-        bar
-}
-
-}code
-
-Good:
-
-code{
-
-foo ()
-{
-        bar
-}
-
-}code
-
-2~ Variables
-
-_* Variables are always in capital letters.
-
-_* Variables that used in config always start with LH_ prefix.
-
-_* Internal temporary variables should start with the _LH_ prefix.
-
-_* Local variables start with __LH_ prefix.
-
-_* Use braces around variables; eg. write ${FOO} instead of $FOO.
-
-_* Always protect variables with respect to potential whitespaces, write
-"${FOO}" not ${FOO}.
-
-_* For consistency reasons, always use quotes when assigning values to
-variables:
-
-Bad:
-
-code{
-
-FOO=bar
-
-}code
-
-Good:
-
-code{
-
-FOO="bar"
-
-}code
-
-_* If multiple variables are used, quote the full expression:
-
-Bad:
-
-code{
-
-if [ -f "${FOO}"/foo/"${BAR}"/bar ]
-then
-        foobar
-fi
-
-}code
-
-Good:
-
-code{
-
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-        foobar
-fi
-
-}code
-
-2~ Miscellaneous
-
-_* 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; ...".

-- 
live-manual



More information about the debian-live-changes mailing list