[SCM] live-manual branch, debian, updated. debian/2.0_a12-1-26-g4c66e75

[Ben Armstrong]

The following commit has been merged in the debian branch:
commit b710454e4a934208955d37c251e38c68a8c31846
Author: Ben Armstrong <synrg at debian.org>
Date:   Wed Dec 8 17:15:00 2010 -0400

    Clarifying procedures for applying patches and submitting translations.

diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index e632776..a39f436 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -112,7 +112,7 @@ $ make build LANGUAGES=en
 
 3~ Applying patches
 
-Directly commiting to the repository is possible by anyone. However, we ask you to send bigger changes to the mailing list to discuss them first. In order to push to the repository, the following steps are required.
+Anyone can directly commit to the repository. However, we ask you to send bigger changes to the mailing list to discuss them first. To push to the repository, you must follow this procedure:
 
 _* Fetch the public commit key:
 
@@ -140,7 +140,7 @@ EOF
 
 }code
 
-_* Checkout a clone of the manual through ssh:
+_* Check out a clone of the manual through ssh:
 
 code{
 
@@ -148,7 +148,7 @@ $ git clone gitosis at live.debian.net:/live-manual.git
 
 }code
 
-_* After editing the files in manual/en/, please call the 'commit' target in the top level directory to sanitize the files and update the translation files:
+_* After editing the files in #{manual/en/}#, please call the 'commit' target in the top level directory to sanitize the files and update the translation files:
 
 code{
 
@@ -156,11 +156,11 @@ $ make commit
 
 }code
 
-_* After sanitizing commit the changes. Write commit messages, that consist of full useful sentences in English, starting with a capital letter and ending with a full stop. Usually starting with the form 'Fixing/Adding/Removing/Correcting/Translating':
+_* After sanitizing, commit the changes. Write commit messages that consist of full, useful sentences in English, starting with a capital letter and ending with a full stop. Usually, these will start with the form 'Fixing/Adding/Removing/Correcting/Translating', e.g.
 
 code{
 
-$ git commit -a
+$ git commit -a -m "Adding a section on applying patches."
 
 }code
 
@@ -174,8 +174,8 @@ $ git push
 
 3~ Translation
 
-Submitting a translation for a new language is recommended in two steps:
+To submit a translation for a new language, follow these two steps:
 
-_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html.in.pot files to your language with your favourite editor (such as poedit). Send translated files to the mailing list. It will then be included and autobuild for that language enabled.
+_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html.in.pot files to your language with your favourite editor (such as poedit). Send translated files to the mailing list. Once we have reviewed your submission, we will add the new language to the manual and will enable it in the autobuild.
 
 _* Once the new language is added, you can randomly start translating all other pot files.

-- 
live-manual