Rev 3097: Fix Makefiles rules for doc generation (Ian Clatworthy, #175207) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3097
revision-id:pqm at pqm.ubuntu.com-20071210020804-xbbzol1ndjmec105
parent: pqm at pqm.ubuntu.com-20071209175609-xg89vkzd5bcbn2mz
parent: ian.clatworthy at internode.on.net-20071210011242-6pwby1gp3mvi5l0a
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-12-10 02:08:04 +0000
message:
  Fix Makefiles rules for doc generation (Ian Clatworthy, #175207)
removed:
  doc/en/user-reference/index.txt index.txt-20070830033353-ud9e03xsh24053oo-1
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3096.1.1
    revision-id:ian.clatworthy at internode.on.net-20071210011242-6pwby1gp3mvi5l0a
    parent: pqm at pqm.ubuntu.com-20071209175609-xg89vkzd5bcbn2mz
    parent: ian.clatworthy at internode.on.net-20071207070454-qub67g3pt82ru0qv
    committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
    branch nick: ianc-integration
    timestamp: Mon 2007-12-10 11:12:42 +1000
    message:
      Fix Makefiles rules for doc generation (Ian Clatworthy, #175207)
    removed:
      doc/en/user-reference/index.txt index.txt-20070830033353-ud9e03xsh24053oo-1
    modified:
      Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3092.3.1
    revision-id:ian.clatworthy at internode.on.net-20071207070454-qub67g3pt82ru0qv
    parent: pqm at pqm.ubuntu.com-20071207051359-iyupti9xt33jccin
    committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
    branch nick: bzr.make-docs
    timestamp: Fri 2007-12-07 17:04:54 +1000
    message:
      fix Makefile rules for doc generation
    removed:
      doc/en/user-reference/index.txt index.txt-20070830033353-ud9e03xsh24053oo-1
    modified:
      Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
=== removed file 'doc/en/user-reference/index.txt'
--- a/doc/en/user-reference/index.txt	2007-08-30 03:36:01 +0000
+++ b/doc/en/user-reference/index.txt	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#####################
-Bazaar User Reference
-#####################
-
-* `Hooks Reference <hooks.html>`_ |--| The various operations that Bazaar
-  lets you hook into
-
-.. |--| unicode:: U+2014

=== modified file 'Makefile'
--- a/Makefile	2007-12-05 20:12:27 +0000
+++ b/Makefile	2007-12-10 01:12:42 +0000
@@ -93,11 +93,15 @@
        doc/default.css \
        doc/en/quick-reference/quick-start-summary.svg \
        doc/en/quick-reference/quick-start-summary.png \
+       doc/en/quick-reference/quick-start-summary.pdf \
        $(wildcard doc/en/user-guide/images/*.png)
 htm_files := $(patsubst %.txt, %.html, $(txt_files)) 
 dev_txt_files := $(wildcard $(addsuffix /*.txt, doc/developers))
 dev_htm_files := $(patsubst %.txt, %.html, $(dev_txt_files)) 
 
+doc/en/user-guide/index.html: $(wildcard $(addsuffix /*.txt, doc/en/user-guide)) 
+	$(rst2html) --stylesheet=../../default.css $< $@
+
 doc/developers/%.html: doc/developers/%.txt
 	$(rst2html) --stylesheet=../default.css $< $@
 
@@ -107,19 +111,16 @@
 %.html: %.txt
 	$(rst2html) --stylesheet=../../default.css $< $@
 
-USER_GUIDE_DEPENDENCIES = $(wildcard $(addsuffix /*.txt, doc/en/user-guide)) 
-
 MAN_DEPENDENCIES = bzrlib/builtins.py \
 		 bzrlib/bundle/commands.py \
 		 bzrlib/conflicts.py \
+		 bzrlib/help_topics.py \
 		 bzrlib/sign_my_commits.py \
 		 generate_docs.py \
 		 tools/doc_generate/__init__.py \
 		 tools/doc_generate/autodoc_man.py \
 		 tools/doc_generate/autodoc_rstx.py
 
-doc/en/user-guide/index.txt: $(USER_GUIDE_DEPENDENCIES)
-
 doc/en/user-reference/bzr_man.txt: $(MAN_DEPENDENCIES)
 	$(PYTHON) generate_docs.py -o $@ rstx
 

=== modified file 'NEWS'
--- a/NEWS	2007-12-07 08:34:21 +0000
+++ b/NEWS	2007-12-10 01:12:42 +0000
@@ -9,6 +9,26 @@
 
   CHANGES:
    
+  FEATURES:
+
+  IMPROVEMENTS:
+
+  BUGFIXES:
+
+   * Fix Makefile rules for doc generation. (Ian Clatworthy, #175207)
+
+  INTERNALS:
+
+  API BREAKS:
+
+  TESTING:
+
+
+bzr 1.0rc2 2007-12-07
+=====================
+
+  CHANGES:
+   
    * If a traceback occurs, users are now asked to report the bug 
      through Launchpad (https://bugs.launchpad.net/bzr/), rather than 
      by mail to the mailing list.