[SCM] live-manual branch, debian-next, updated. debian/3.0_a11-1-36-g26f15f4

[Ben Armstrong]

The following commit has been merged in the debian-next branch:
commit 26f15f44e7c0baab075277352574768bf8443e1a
Author: Ben Armstrong <synrg at debian.org>
Date:   Sat Apr 14 14:22:58 2012 -0300

    Updating workflow to omit 'make commit' unless translating.

diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index 87b47ae..6b050d0 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -171,13 +171,7 @@ code{
 
 _* Note that you should commit any changes on the debian-next branch, not on the debian branch.
 
-_* 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{
-
- $ make commit
-
-}code
+_* Do not use #{make commit}# unless you are updating translations in this commit, and in that case, do not mix changes to the English manual and translations in the same commit, but use separate commits for each. See the {Translation}#translation section for more details.
 
 _* Then
 

-- 
live-manual