Merge lp:~jelmer/bzr/fix-en-use-guide into lp:bzr

[Jelmer Vernooij]

Ensure build of English use guide always uses English text even when user's locale specifies a different language.

Simple fix to prevent French text from leaking into English user reference.

[Vincent Ladeuil (vila)]

Nice catch !

review: Approve

[Richard Wilbur (richard-wilbur)]

Thanks, Jelmer, for finding the bug and the concise fix!
+1

review: Approve

[Richard Wilbur (richard-wilbur)]

sent to pqm by email

=== modified file 'Makefile'
--- Makefile	2016-02-01 18:09:33 +0000
+++ Makefile	2016-04-03 16:44:55 +0000
@@ -148,7 +148,7 @@
 NEWS_FILES = $(wildcard doc/en/release-notes/bzr-*.txt)
 
 doc/en/user-reference/index.txt: $(MAN_DEPENDENCIES)
-	$(PYTHON) tools/generate_docs.py -o $@ rstx
+	LANGUAGE=C $(PYTHON) tools/generate_docs.py -o $@ rstx
 
 doc/en/release-notes/index.txt: $(NEWS_FILES) tools/generate_release_notes.py
 	$(PYTHON) tools/generate_release_notes.py $@ $(NEWS_FILES)
 
=== modified file 'doc/en/release-notes/bzr-2.8.txt'
--- doc/en/release-notes/bzr-2.8.txt	2016-02-01 19:26:41 +0000
+++ doc/en/release-notes/bzr-2.8.txt	2016-04-03 16:44:55 +0000
@@ -32,6 +32,10 @@
 .. Fixes for situations where bzr would previously crash or give incorrect
    or undesirable results.
 
+ * When generating documentation with a custom locale set, make sure
+   doc/en/user-reference only contains English documentation.
+   (Jelmer Vernooij, #1565503)
+
 Documentation
 *************