Rev 6617: (richard-wilbur) Ensure build of English use guide always uses English text in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6617 [merge]
revision-id: pqm at pqm.ubuntu.com-20160421041052-clcye7ns1qcl2n7w
parent: pqm at pqm.ubuntu.com-20160201195605-o7rl92wf6uyum3fk
parent: jelmer at jelmer.uk-20160403163231-h72bo0uyek2gikw0
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2016-04-21 04:10:52 +0000
message:
  (richard-wilbur) Ensure build of English use guide always uses English text
   even when user's locale specifies a different language. (Jelmer Vernooij)
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  doc/en/release-notes/bzr-2.8.txt bzr2.8.txt-20160201192114-bqko1qsjlqgz40wl-1
=== modified file 'Makefile'
--- a/Makefile	2016-02-01 18:09:33 +0000
+++ b/Makefile	2016-04-03 16:32:31 +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'
--- a/doc/en/release-notes/bzr-2.8.txt	2016-02-01 19:26:41 +0000
+++ b/doc/en/release-notes/bzr-2.8.txt	2016-04-03 16:32:31 +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
 *************