Bazaar

Merge lp:~mbp/bzr/doc into lp:bzr

  1. doc
  2. Merge into bzr.dev
Proposed by Martin Pool
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merged at revision: 5503
Proposed branch: lp:~mbp/bzr/doc
Merge into: lp:bzr
Diff against target: 38 lines (+2/-13)
2 files modified
Makefile (+2/-2)
doc/en/release-notes/bzr-1.17.txt (+0/-11)
To merge this branch: bzr merge lp:~mbp/bzr/doc
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+38522@code.launchpad.net

Commit message

remove troublesome pointless news entry

Description of the change

Get rid of a dead-end news changelog entry that causes a silly failure updating doc.bazaar.canonical.com

<poolie> me either
<poolie> +/srv/doc.bazaar.canonical.com/bzr/bin/update-bzr-docs:36> dchroot -c karmic --directory /srv/doc.bazaar.canonical.com/bzr//bzr.dev make doc-website
<poolie> I: [karmic chroot] Running command: "make doc-website"
<poolie> python tools/generate_release_notes.py doc/en/release-notes/index.txt d......
<poolie> /bin/sh: Syntax error: "(" unexpected

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2010-10-13 00:26:41 +0000
+++ Makefile 2010-10-15 10:22:41 +0000
@@ -304,10 +304,10 @@
304 $(rst2html) --stylesheet=default.css $< $@304 $(rst2html) --stylesheet=default.css $< $@
305305
306%.html: %.txt306%.html: %.txt
307 $(rst2html) --stylesheet=../../default.css $< $@307 $(rst2html) --stylesheet=../../default.css $< "$@"
308308
309doc/en/release-notes/NEWS.txt: $(NEWS_FILES) tools/generate_release_notes.py309doc/en/release-notes/NEWS.txt: $(NEWS_FILES) tools/generate_release_notes.py
310 $(PYTHON) tools/generate_release_notes.py $@ $(NEWS_FILES)310 $(PYTHON) tools/generate_release_notes.py "$@" $(NEWS_FILES)
311311
312upgrade_guide_dependencies = $(wildcard $(addsuffix /*.txt, doc/en/upgrade-guide)) 312upgrade_guide_dependencies = $(wildcard $(addsuffix /*.txt, doc/en/upgrade-guide))
313313
314314
=== modified file 'doc/en/release-notes/bzr-1.17.txt'
--- doc/en/release-notes/bzr-1.17.txt 2010-10-08 08:15:14 +0000
+++ doc/en/release-notes/bzr-1.17.txt 2010-10-15 10:22:41 +0000
@@ -5,17 +5,6 @@
5.. toctree::5.. toctree::
6 :maxdepth: 16 :maxdepth: 1
77
8bzr 1.17.1 (unreleased)
9#######################
10
11Bug Fixes
12*********
13
14* The optional ``_knit_load_data_pyx`` C extension was never being
15 imported. This caused significant slowdowns when reading data from
16 knit format repositories. (Andrew Bennetts, #405653)
17
18
19bzr 1.178bzr 1.17
20########9########
21:Codename: so-late-its-brunch10:Codename: so-late-its-brunch