[SCM] live-manual branch, debian, updated. debian/2.0_a2-1-2-g8b17ac0
Daniel Baumann
daniel at debian.org
Tue Jun 29 16:10:45 UTC 2010
The following commit has been merged in the debian branch:
commit 8b17ac092526cee4273b4f939c61414fb00fa43b
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Jun 29 18:10:12 2010 +0200
Updating contribution instructions wrt/ commit target for file sanitization.
diff --git a/manual/de/about/manual.xml b/manual/de/about/manual.xml
index 0c537cc..a87369f 100644
--- a/manual/de/about/manual.xml
+++ b/manual/de/about/manual.xml
@@ -207,13 +207,16 @@ order to push to the repository, the following steps are required. </para>
<listitem>
<para> Fetch the public commit key: </para>
<para>
- <screen>$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub $ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*</screen>
+ <screen>$ mkdir -p ~/.ssh/identity.d</screen> <screen>$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live</screen>
+<screen>$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub</screen> <screen>$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*</screen>
</para>
</listitem>
<listitem>
<para> Add the following section to your openssh-client config: </para>
<para>
- <screen> $ cat >> ~/.ssh/config << EOF Host live.debian.net Hostname live.debian.net User gitosis IdentityFile ~/.ssh/identity.d/live-manual at debian-live EOF</screen>
+ <screen> $ cat >> ~/.ssh/config << EOF</screen> <screen>Host live.debian.net</screen>
+<screen>Hostname live.debian.net</screen> <screen>User gitosis</screen>
+<screen>IdentityFile ~/.ssh/identity.d/live-manual at debian-live</screen> <screen>EOF</screen>
</para>
</listitem>
<listitem>
@@ -223,8 +226,16 @@ order to push to the repository, the following steps are required. </para>
</para>
</listitem>
<listitem>
- <para> Commit the file after editing. Write commit messages, that consist of full
-useful sentences, starting with a capital letter and ending with a full
+ <para> After editing the files in manual/en/, please call the 'commit' target in
+the toplevel directory to sanitize the files and update the translation
+files:</para>
+ <para>
+ <screen>$ make commit</screen>
+ </para>
+ </listitem>
+ <listitem>
+ <para> After sanitizing commit the changes. Write commit messages, that consist of
+full useful sentences, starting with a capital letter and ending with a full
stop. Usually starting with the form 'Fixing/Adding/Removing/Correcting/': </para>
<para>
<screen>$ git commit -a</screen>
diff --git a/manual/de/index.xml b/manual/de/index.xml
index 82b64f5..7fdc911 100644
--- a/manual/de/index.xml
+++ b/manual/de/index.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY pubdate "2010-06-28">
+<!ENTITY pubdate "2010-06-29">
<!ENTITY releaseinfo "2.0~a2">
<!ENTITY year "2010">
]>
diff --git a/manual/en/about/manual.xml b/manual/en/about/manual.xml
index a68ed73..9f01587 100644
--- a/manual/en/about/manual.xml
+++ b/manual/en/about/manual.xml
@@ -159,13 +159,21 @@
<listitem>
<para> Fetch the public commit key: </para>
<para>
- <screen>$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub $ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*</screen>
+ <screen>$ mkdir -p ~/.ssh/identity.d</screen>
+ <screen>$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live</screen>
+ <screen>$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub</screen>
+ <screen>$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*</screen>
</para>
</listitem>
<listitem>
<para> Add the following section to your openssh-client config: </para>
<para>
- <screen> $ cat >> ~/.ssh/config << EOF Host live.debian.net Hostname live.debian.net User gitosis IdentityFile ~/.ssh/identity.d/live-manual at debian-live EOF</screen>
+ <screen> $ cat >> ~/.ssh/config << EOF</screen>
+ <screen>Host live.debian.net</screen>
+ <screen>Hostname live.debian.net</screen>
+ <screen>User gitosis</screen>
+ <screen>IdentityFile ~/.ssh/identity.d/live-manual at debian-live</screen>
+ <screen>EOF</screen>
</para>
</listitem>
<listitem>
@@ -175,7 +183,13 @@
</para>
</listitem>
<listitem>
- <para> Commit the file after editing. Write commit messages, that consist of full useful sentences, starting with a capital letter and ending with a full stop. Usually starting with the form 'Fixing/Adding/Removing/Correcting/': </para>
+ <para> After editing the files in manual/en/, please call the 'commit' target in the toplevel directory to sanitize the files and update the translation files:</para>
+ <para>
+ <screen>$ make commit</screen>
+ </para>
+ </listitem>
+ <listitem>
+ <para> After sanitizing commit the changes. Write commit messages, that consist of full useful sentences, starting with a capital letter and ending with a full stop. Usually starting with the form 'Fixing/Adding/Removing/Correcting/': </para>
<para>
<screen>$ git commit -a</screen>
</para>
diff --git a/manual/en/index.xml b/manual/en/index.xml
index 63077a5..18d9efc 100644
--- a/manual/en/index.xml
+++ b/manual/en/index.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY pubdate "2010-06-28">
+<!ENTITY pubdate "2010-06-29">
<!ENTITY releaseinfo "2.0~a2">
<!ENTITY year "2010">
]>
diff --git a/manual/po/de/index.xml.po b/manual/po/de/index.xml.po
index baf4679..d0e4281 100644
--- a/manual/po/de/index.xml.po
+++ b/manual/po/de/index.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a2\n"
-"POT-Creation-Date: 2010-06-28 18:16+0300\n"
+"POT-Creation-Date: 2010-06-29 17:18+0300\n"
"PO-Revision-Date: 2010-06-18 17:51+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,7 +17,7 @@ msgstr ""
#. type: Content of the pubdate entity
#: en/index.xml:3
-msgid "2010-06-28"
+msgid "2010-06-29"
msgstr ""
#. type: Content of the releaseinfo entity
diff --git a/manual/po/de/manual.xml.po b/manual/po/de/manual.xml.po
index 29da7ba..16bc5f4 100644
--- a/manual/po/de/manual.xml.po
+++ b/manual/po/de/manual.xml.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a2\n"
-"POT-Creation-Date: 2010-06-28 18:16+0300\n"
+"POT-Creation-Date: 2010-06-29 17:29+0300\n"
"PO-Revision-Date: 2010-06-18 18:28+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -335,15 +335,15 @@ msgstr ""
#. type: Content of: <chapter><section><section><para>
#: en/about/manual.xml:145 en/about/manual.xml:149 en/about/manual.xml:153
-#: en/about/manual.xml:162 en/about/manual.xml:168 en/about/manual.xml:174
-#: en/about/manual.xml:180 en/about/manual.xml:186 en/other/basics.xml:43
-#: en/other/basics.xml:48 en/other/basics.xml:55 en/other/basics.xml:58
-#: en/other/basics.xml:70 en/other/basics.xml:79 en/other/basics.xml:83
-#: en/other/basics.xml:87 en/other/basics.xml:93 en/other/basics.xml:103
-#: en/other/basics.xml:116 en/other/basics.xml:120 en/other/basics.xml:124
-#: en/other/basics.xml:137 en/other/basics.xml:141 en/other/basics.xml:146
-#: en/other/basics.xml:158 en/other/basics.xml:168 en/other/basics.xml:180
-#: en/other/basics.xml:184 en/other/basics.xml:203 en/other/basics.xml:218
+#: en/about/manual.xml:182 en/about/manual.xml:188 en/about/manual.xml:194
+#: en/about/manual.xml:200 en/other/basics.xml:43 en/other/basics.xml:48
+#: en/other/basics.xml:55 en/other/basics.xml:58 en/other/basics.xml:70
+#: en/other/basics.xml:79 en/other/basics.xml:83 en/other/basics.xml:87
+#: en/other/basics.xml:93 en/other/basics.xml:103 en/other/basics.xml:116
+#: en/other/basics.xml:120 en/other/basics.xml:124 en/other/basics.xml:137
+#: en/other/basics.xml:141 en/other/basics.xml:146 en/other/basics.xml:158
+#: en/other/basics.xml:168 en/other/basics.xml:180 en/other/basics.xml:184
+#: en/other/basics.xml:203 en/other/basics.xml:218
#: en/other/customization_packages.xml:23
#: en/other/customization_packages.xml:27
#: en/other/customization_packages.xml:32
@@ -413,52 +413,131 @@ msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
#: en/about/manual.xml:162
#, no-wrap
-msgid "$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub $ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*"
+msgid "$ mkdir -p ~/.ssh/identity.d"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:163
+#, no-wrap
+msgid "$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:164
+#, no-wrap
+msgid "$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:165
+#, no-wrap
+msgid "$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about/manual.xml:166
+#: en/about/manual.xml:162
+msgid ""
+"<placeholder type=\"screen\" id=\"0\"/> <placeholder type=\"screen\" id="
+"\"1\"/> <placeholder type=\"screen\" id=\"2\"/> <placeholder type=\"screen\" "
+"id=\"3\"/>"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
+#: en/about/manual.xml:169
msgid "Add the following section to your openssh-client config:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about/manual.xml:168
+#: en/about/manual.xml:171
#, no-wrap
-msgid " $ cat >> ~/.ssh/config << EOF Host live.debian.net Hostname live.debian.net User gitosis IdentityFile ~/.ssh/identity.d/live-manual at debian-live EOF"
+msgid " $ cat >> ~/.ssh/config << EOF"
msgstr ""
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
#: en/about/manual.xml:172
-msgid "Checkout a clone of the manual through ssh:"
+#, no-wrap
+msgid "Host live.debian.net"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:173
+#, no-wrap
+msgid "Hostname live.debian.net"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
#: en/about/manual.xml:174
#, no-wrap
+msgid "User gitosis"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:175
+#, no-wrap
+msgid "IdentityFile ~/.ssh/identity.d/live-manual at debian-live"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:176
+#, no-wrap
+msgid "EOF"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
+#: en/about/manual.xml:171
+msgid ""
+"<placeholder type=\"screen\" id=\"0\"/> <placeholder type=\"screen\" id="
+"\"1\"/> <placeholder type=\"screen\" id=\"2\"/> <placeholder type=\"screen\" "
+"id=\"3\"/> <placeholder type=\"screen\" id=\"4\"/> <placeholder type=\"screen"
+"\" id=\"5\"/>"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
+#: en/about/manual.xml:180
+msgid "Checkout a clone of the manual through ssh:"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:182
+#, no-wrap
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about/manual.xml:178
+#: en/about/manual.xml:186
+msgid ""
+"After editing the files in manual/en/, please call the 'commit' target in "
+"the toplevel directory to sanitize the files and update the translation "
+"files:"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:188
+#, no-wrap
+msgid "$ make commit"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
+#: en/about/manual.xml:192
msgid ""
-"Commit the file after editing. Write commit messages, that consist of full "
-"useful sentences, starting with a capital letter and ending with a full "
+"After sanitizing commit the changes. Write commit messages, that consist of "
+"full useful sentences, starting with a capital letter and ending with a full "
"stop. Usually starting with the form 'Fixing/Adding/Removing/Correcting/':"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about/manual.xml:180
+#: en/about/manual.xml:194
#, no-wrap
msgid "$ git commit -a"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about/manual.xml:184
+#: en/about/manual.xml:198
msgid "Push the commit to the server:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about/manual.xml:186
+#: en/about/manual.xml:200
#, no-wrap
msgid "$ git push"
msgstr ""
diff --git a/manual/pot/index.xml.pot b/manual/pot/index.xml.pot
index 750ac6b..3e81441 100644
--- a/manual/pot/index.xml.pot
+++ b/manual/pot/index.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-28 18:16+0300\n"
+"POT-Creation-Date: 2010-06-29 17:18+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"
@@ -17,7 +17,7 @@ msgstr ""
#. type: Content of the pubdate entity
#: en/index.xml:3
-msgid "2010-06-28"
+msgid "2010-06-29"
msgstr ""
#. type: Content of the releaseinfo entity
diff --git a/manual/pot/manual.xml.pot b/manual/pot/manual.xml.pot
index 4deed2f..7f6eee3 100644
--- a/manual/pot/manual.xml.pot
+++ b/manual/pot/manual.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-28 18:16+0300\n"
+"POT-Creation-Date: 2010-06-29 17:29+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"
@@ -335,15 +335,15 @@ msgstr ""
#. type: Content of: <chapter><section><section><para>
#: en/about/manual.xml:145 en/about/manual.xml:149 en/about/manual.xml:153
-#: en/about/manual.xml:162 en/about/manual.xml:168 en/about/manual.xml:174
-#: en/about/manual.xml:180 en/about/manual.xml:186 en/other/basics.xml:43
-#: en/other/basics.xml:48 en/other/basics.xml:55 en/other/basics.xml:58
-#: en/other/basics.xml:70 en/other/basics.xml:79 en/other/basics.xml:83
-#: en/other/basics.xml:87 en/other/basics.xml:93 en/other/basics.xml:103
-#: en/other/basics.xml:116 en/other/basics.xml:120 en/other/basics.xml:124
-#: en/other/basics.xml:137 en/other/basics.xml:141 en/other/basics.xml:146
-#: en/other/basics.xml:158 en/other/basics.xml:168 en/other/basics.xml:180
-#: en/other/basics.xml:184 en/other/basics.xml:203 en/other/basics.xml:218
+#: en/about/manual.xml:182 en/about/manual.xml:188 en/about/manual.xml:194
+#: en/about/manual.xml:200 en/other/basics.xml:43 en/other/basics.xml:48
+#: en/other/basics.xml:55 en/other/basics.xml:58 en/other/basics.xml:70
+#: en/other/basics.xml:79 en/other/basics.xml:83 en/other/basics.xml:87
+#: en/other/basics.xml:93 en/other/basics.xml:103 en/other/basics.xml:116
+#: en/other/basics.xml:120 en/other/basics.xml:124 en/other/basics.xml:137
+#: en/other/basics.xml:141 en/other/basics.xml:146 en/other/basics.xml:158
+#: en/other/basics.xml:168 en/other/basics.xml:180 en/other/basics.xml:184
+#: en/other/basics.xml:203 en/other/basics.xml:218
#: en/other/customization_packages.xml:23
#: en/other/customization_packages.xml:27
#: en/other/customization_packages.xml:32
@@ -413,52 +413,131 @@ msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
#: en/about/manual.xml:162
#, no-wrap
-msgid "$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub $ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*"
+msgid "$ mkdir -p ~/.ssh/identity.d"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:163
+#, no-wrap
+msgid "$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:164
+#, no-wrap
+msgid "$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:165
+#, no-wrap
+msgid "$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about/manual.xml:166
+#: en/about/manual.xml:162
+msgid ""
+"<placeholder type=\"screen\" id=\"0\"/> <placeholder type=\"screen\" id="
+"\"1\"/> <placeholder type=\"screen\" id=\"2\"/> <placeholder type=\"screen\" "
+"id=\"3\"/>"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
+#: en/about/manual.xml:169
msgid "Add the following section to your openssh-client config:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about/manual.xml:168
+#: en/about/manual.xml:171
#, no-wrap
-msgid " $ cat >> ~/.ssh/config << EOF Host live.debian.net Hostname live.debian.net User gitosis IdentityFile ~/.ssh/identity.d/live-manual at debian-live EOF"
+msgid " $ cat >> ~/.ssh/config << EOF"
msgstr ""
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
#: en/about/manual.xml:172
-msgid "Checkout a clone of the manual through ssh:"
+#, no-wrap
+msgid "Host live.debian.net"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:173
+#, no-wrap
+msgid "Hostname live.debian.net"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
#: en/about/manual.xml:174
#, no-wrap
+msgid "User gitosis"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:175
+#, no-wrap
+msgid "IdentityFile ~/.ssh/identity.d/live-manual at debian-live"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:176
+#, no-wrap
+msgid "EOF"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
+#: en/about/manual.xml:171
+msgid ""
+"<placeholder type=\"screen\" id=\"0\"/> <placeholder type=\"screen\" id="
+"\"1\"/> <placeholder type=\"screen\" id=\"2\"/> <placeholder type=\"screen\" "
+"id=\"3\"/> <placeholder type=\"screen\" id=\"4\"/> <placeholder type=\"screen"
+"\" id=\"5\"/>"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
+#: en/about/manual.xml:180
+msgid "Checkout a clone of the manual through ssh:"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:182
+#, no-wrap
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about/manual.xml:178
+#: en/about/manual.xml:186
+msgid ""
+"After editing the files in manual/en/, please call the 'commit' target in "
+"the toplevel directory to sanitize the files and update the translation "
+"files:"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
+#: en/about/manual.xml:188
+#, no-wrap
+msgid "$ make commit"
+msgstr ""
+
+#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
+#: en/about/manual.xml:192
msgid ""
-"Commit the file after editing. Write commit messages, that consist of full "
-"useful sentences, starting with a capital letter and ending with a full "
+"After sanitizing commit the changes. Write commit messages, that consist of "
+"full useful sentences, starting with a capital letter and ending with a full "
"stop. Usually starting with the form 'Fixing/Adding/Removing/Correcting/':"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about/manual.xml:180
+#: en/about/manual.xml:194
#, no-wrap
msgid "$ git commit -a"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about/manual.xml:184
+#: en/about/manual.xml:198
msgid "Push the commit to the server:"
msgstr ""
#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about/manual.xml:186
+#: en/about/manual.xml:200
#, no-wrap
msgid "$ git push"
msgstr ""
diff --git a/manual/pot/project.xml.pot b/manual/pot/project.xml.pot
index 4115a23..2572aa6 100644
--- a/manual/pot/project.xml.pot
+++ b/manual/pot/project.xml.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-28 18:16+0300\n"
+"POT-Creation-Date: 2010-06-29 17:29+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"
--
live-manual
More information about the debian-live-changes
mailing list