Bazaar

Merge lp:~ian-clatworthy/bzr/pdf-chm-docs-for-2.0 into lp:bzr/2.0

  1. pdf-chm-docs-for-2.0
  2. Merge into 2.0
Proposed by Ian Clatworthy
Status: Merged
Merge reported by: Martin Pool
Merged at revision: not available
Proposed branch: lp:~ian-clatworthy/bzr/pdf-chm-docs-for-2.0
Merge into: lp:bzr/2.0
Diff against target: None lines
To merge this branch: bzr merge lp:~ian-clatworthy/bzr/pdf-chm-docs-for-2.0
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+11182@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

This patch allows our documentation to be converted to PDF and CHM (Windows Help) format. It also improves the HTML format by using topics instead of mega-documents more frequently.

Here's a summary of the main changes:

* added configuration settings to enable the various guides and tutorials to be converted to pdf

* improved the User Guide in HTML/CHM to use topics instead of one big file

* added a script to break the release notes up into topics

* edited the headings in the release notes to be just the version info, making the PDF and CHM contents read better

* dropped inline table of contents from most documents as otherwise they appear twice

There are still some things to sort out to get the developer docs and foreign languages appearing in different chm files. The version number (2.0rc2) is also hard-coded currently. I'll raise bugs for those and, time permitting, tackle them before 2.0 ships.

The CHM format is required/highly-desirable for the Windows installer so I'd like this reviewed (and hopefully approved) soon please.

Revision history for this message
Martin Pool (mbp) wrote :

Superseded by https://code.edge.launchpad.net/~ian-clatworthy/bzr/doc-site-per-language/+merge/11337

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2009-07-31 19:56:19 +0000
+++ .bzrignore 2009-09-03 05:09:22 +0000
@@ -53,6 +53,7 @@
53bzrlib/_rio_pyx.c53bzrlib/_rio_pyx.c
54bzrlib/_walkdirs_win32.c54bzrlib/_walkdirs_win32.c
55doc/en/release-notes/NEWS.txt55doc/en/release-notes/NEWS.txt
56doc/en/release-notes/bzr*
56doc/en/developer-guide/HACKING.txt57doc/en/developer-guide/HACKING.txt
57doc/en/user-reference/bzr_man.txt58doc/en/user-reference/bzr_man.txt
58# built extension modules59# built extension modules
5960
=== modified file 'Makefile'
--- Makefile 2009-08-03 20:38:39 +0000
+++ Makefile 2009-09-03 05:20:04 +0000
@@ -183,8 +183,8 @@
183doc/en/user-reference/bzr_man.txt: $(MAN_DEPENDENCIES)183doc/en/user-reference/bzr_man.txt: $(MAN_DEPENDENCIES)
184 $(PYTHON) tools/generate_docs.py -o $@ rstx184 $(PYTHON) tools/generate_docs.py -o $@ rstx
185185
186doc/en/release-notes/NEWS.txt: NEWS186doc/en/release-notes/NEWS.txt: NEWS tools/generate_release_notes.py
187 $(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')"187 $(PYTHON) tools/generate_release_notes.py NEWS $@
188188
189MAN_PAGES = man1/bzr.1189MAN_PAGES = man1/bzr.1
190man1/bzr.1: $(MAN_DEPENDENCIES)190man1/bzr.1: $(MAN_DEPENDENCIES)
@@ -206,8 +206,8 @@
206WEB_DOCS = $(derived_web_docs) $(non_txt_files)206WEB_DOCS = $(derived_web_docs) $(non_txt_files)
207ALL_DOCS = $(derived_web_docs) $(MAN_PAGES)207ALL_DOCS = $(derived_web_docs) $(MAN_PAGES)
208208
209# the main target to build all the docs209# the target to build all the old-style docs
210docs: $(ALL_DOCS)210old-docs: $(ALL_DOCS)
211211
212# produce a tree containing just the final docs, ready for uploading to the web212# produce a tree containing just the final docs, ready for uploading to the web
213HTMLDIR := html_docs213HTMLDIR := html_docs
@@ -223,6 +223,13 @@
223 $(HTMLDIR) $(derived_txt_files)223 $(HTMLDIR) $(derived_txt_files)
224 rm -f doc/*/user-guide/*.pdf224 rm -f doc/*/user-guide/*.pdf
225 rm -rf doc/*/user-guide/latex_prepared225 rm -rf doc/*/user-guide/latex_prepared
226 cd doc && make clean
227
228# The main target to build all the new-style docs. Requires Sphinx.
229docs: doc/en/release-notes/NEWS.txt doc/en/user-reference/bzr_man.txt
230 cd doc && make html
231 cd doc && make latex
232 cd doc/_build/latex && make all-pdf
226233
227234
228### Windows Support ###235### Windows Support ###
229236
=== modified file 'NEWS'
--- NEWS 2009-09-04 02:58:22 +0000
+++ NEWS 2009-09-04 05:20:37 +0000
@@ -3,9 +3,6 @@
3####################3####################
44
55
6.. contents:: List of Releases
7 :depth: 1
8
9bzr 2.0rc2 (not released yet)6bzr 2.0rc2 (not released yet)
10#############################7#############################
118
@@ -53,13 +50,17 @@
53* Help on hooks no longer says 'Not deprecated' for hooks that are50* Help on hooks no longer says 'Not deprecated' for hooks that are
54 currently supported. (Ian Clatworthy, #422415)51 currently supported. (Ian Clatworthy, #422415)
5552
53* PDF and CHM (Windows HtmlHelp) formats are now supported for the
54 user documentation. The HTML documentation is better broken up into
55 topics. (Ian Clatworthy)
56
56* The main table of contents now provides links to the new Migration Docs57* The main table of contents now provides links to the new Migration Docs
57 and Plugins Guide. (Ian Clatworthy)58 and Plugins Guide. (Ian Clatworthy)
5859
60
59bzr 2.0rc161bzr 2.0rc1
60##########62##########
6163
62
63:Codename: no worries64:Codename: no worries
64:2.0rc1: 2009-08-2665:2.0rc1: 2009-08-26
6566
@@ -524,8 +525,8 @@
524 ``countTestsCases``. (Robert Collins)525 ``countTestsCases``. (Robert Collins)
525526
526527
527bzr 1.17 "So late it's brunch" 2009-07-20528bzr 1.17
528#########################################529########
529:Codename: so-late-its-brunch530:Codename: so-late-its-brunch
530:1.17rc1: 2009-07-13531:1.17rc1: 2009-07-13
531:1.17: 2009-07-20532:1.17: 2009-07-20
@@ -774,8 +775,10 @@
774 this class and the UI. (Martin Pool)775 this class and the UI. (Martin Pool)
775776
776777
777bzr 1.16.1 2009-06-26778bzr 1.16.1
778#####################779##########
780
781:Released: 2009-06-26
779782
780End user testing of the 2a format revealed two serious bugs. The first,783End user testing of the 2a format revealed two serious bugs. The first,
781#365615, caused bzr to raise AbsentContentFactory errors when autopacking.784#365615, caused bzr to raise AbsentContentFactory errors when autopacking.
@@ -830,8 +833,8 @@
830 (Robert Collins, #376748)833 (Robert Collins, #376748)
831834
832835
833bzr 1.16 "It's yesterday in California" 2009-06-18836bzr 1.16
834##################################################837########
835:Codename: yesterday-in-california838:Codename: yesterday-in-california
836:1.16rc1: 2009-06-11839:1.16rc1: 2009-06-11
837:1.16: 2009-06-18840:1.16: 2009-06-18
@@ -2305,8 +2308,11 @@
2305 (Vincent Ladeuil)2308 (Vincent Ladeuil)
23062309
23072310
2308bzr 1.11 "Eyes up!" 2009-01-192311bzr 1.11
2309##############################2312########
2313
2314:Codename: "Eyes up!"
2315:Released: 2009-01-19
23102316
2311This first monthly release of Bazaar for 2009 improves Bazaar's operation2317This first monthly release of Bazaar for 2009 improves Bazaar's operation
2312in Windows, Mac OS X, and other situations where file names are matched2318in Windows, Mac OS X, and other situations where file names are matched
@@ -2332,8 +2338,11 @@
23322338
23332339
23342340
2335bzr 1.11rc1 "Eyes up!" 2009-01-092341bzr 1.11rc1
2336#################################2342###########
2343
2344:Codename: "Eyes up!"
2345:Released: 2009-01-09
23372346
2338Changes2347Changes
2339*******2348*******
@@ -2569,8 +2578,10 @@
25692578
25702579
25712580
2572bzr 1.10 2008-12-052581bzr 1.10
2573###################2582########
2583
2584:Released: 2008-12-05
25742585
2575Bazaar 1.10 has several performance improvements for copying revisions2586Bazaar 1.10 has several performance improvements for copying revisions
2576(especially for small updates to large projects). There has also been a2587(especially for small updates to large projects). There has also been a
@@ -2595,8 +2606,10 @@
2595 topologically. (John Arbash Meinel, #304841)2606 topologically. (John Arbash Meinel, #304841)
25962607
25972608
2598bzr 1.10rc1 2008-11-282609bzr 1.10rc1
2599######################2610###########
2611
2612:Released: 2008-11-28
26002613
2601This release of Bazaar focuses on performance improvements when pushing2614This release of Bazaar focuses on performance improvements when pushing
2602and pulling revisions, both locally and to remote networks. The popular2615and pulling revisions, both locally and to remote networks. The popular
@@ -2716,8 +2729,10 @@
2716* Doctests now only report the first failure. (Martin Pool)2729* Doctests now only report the first failure. (Martin Pool)
27172730
27182731
2719bzr 1.9 2008-11-072732bzr 1.9
2720##################2733#######
2734
2735:Released: 2008-11-07
27212736
2722This release of Bazaar adds a new repository format, ``1.9``, with smaller2737This release of Bazaar adds a new repository format, ``1.9``, with smaller
2723and more efficient index files. This format can be specified when2738and more efficient index files. This format can be specified when
@@ -2739,8 +2754,10 @@
2739 (John Arbash Meinel, #293746)2754 (John Arbash Meinel, #293746)
27402755
27412756
2742bzr 1.9rc1 2008-10-312757bzr 1.9rc1
2743#####################2758##########
2759
2760:Released: 2008-10-31
27442761
2745New Features2762New Features
2746************2763************
@@ -2857,8 +2874,10 @@
2857 configuration of authetication credentials.2874 configuration of authetication credentials.
28582875
28592876
2860bzr 1.8 2008-10-162877bzr 1.8
2861##################2878#######
2879
2880:Released: 2008-10-16
28622881
2863Bazaar 1.8 includes several fixes that improve working tree performance,2882Bazaar 1.8 includes several fixes that improve working tree performance,
2864display of revision logs, and merges. The bzr testsuite now passes on OS2883display of revision logs, and merges. The bzr testsuite now passes on OS
@@ -2879,8 +2898,10 @@
2879 that platform. (Alexander Belchenko, Martin Pool, #277481)2898 that platform. (Alexander Belchenko, Martin Pool, #277481)
28802899
28812900
2882bzr 1.8rc1 2008-10-072901bzr 1.8rc1
2883#####################2902##########
2903
2904:Released: 2008-10-07
28842905
2885Changes2906Changes
2886*******2907*******
@@ -3078,14 +3099,18 @@
3078 (Vincent Ladeuil)3099 (Vincent Ladeuil)
30793100
30803101
3081bzr 1.7.1 2008-10-013102bzr 1.7.1
3082####################3103#########
3104
3105:Released: 2008-10-01
30833106
3084No changes from 1.7.1rc1.3107No changes from 1.7.1rc1.
30853108
30863109
3087bzr 1.7.1rc1 2008-09-243110bzr 1.7.1rc1
3088#######################3111############
3112
3113:Released: 2008-09-24
30893114
3090This release just includes an update to how the merge algorithm handles3115This release just includes an update to how the merge algorithm handles
3091file paths when we encounter complex history.3116file paths when we encounter complex history.
@@ -3100,8 +3125,10 @@
3100 (John Arbash Meinel)3125 (John Arbash Meinel)
31013126
31023127
3103bzr 1.7 2008-09-233128bzr 1.7
3104##################3129#######
3130
3131:Released: 2008-09-23
31053132
3106This release includes many bug fixes and a few performance and feature3133This release includes many bug fixes and a few performance and feature
3107improvements. ``bzr rm`` will now scan for missing files and remove them,3134improvements. ``bzr rm`` will now scan for missing files and remove them,
@@ -3118,8 +3145,10 @@
3118 packaging qbzr. (Mark Hammond)3145 packaging qbzr. (Mark Hammond)
31193146
31203147
3121bzr 1.7rc2 2008-09-173148bzr 1.7rc2
3122#####################3149##########
3150
3151:Released: 2008-09-17
31233152
3124A few bug fixes from 1.7rc1. The biggest change is a new3153A few bug fixes from 1.7rc1. The biggest change is a new
3125``RemoteBranch.get_stacked_on_url`` rpc. This allows clients that are3154``RemoteBranch.get_stacked_on_url`` rpc. This allows clients that are
@@ -3143,8 +3172,10 @@
3143 (Andrew Bennetts)3172 (Andrew Bennetts)
31443173
31453174
3146bzr 1.7rc1 2008-09-093175bzr 1.7rc1
3147#####################3176##########
3177
3178:Released: 2008-09-09
31483179
3149This release candidate for bzr 1.7 has several bug fixes and a few3180This release candidate for bzr 1.7 has several bug fixes and a few
3150performance and feature improvements. ``bzr rm`` will now scan for3181performance and feature improvements. ``bzr rm`` will now scan for
@@ -3341,16 +3372,20 @@
3341 clients now use this mechanism. (Neil Martinsen-Burrell)3372 clients now use this mechanism. (Neil Martinsen-Burrell)
33423373
33433374
3344bzr 1.6.1 2008-09-053375bzr 1.6.1
3345####################3376#########
3377
3378:Released: 2008-09-05
33463379
3347A couple regressions were found in the 1.6 release. There was a3380A couple regressions were found in the 1.6 release. There was a
3348performance issue when using ``bzr+ssh`` to branch large repositories,3381performance issue when using ``bzr+ssh`` to branch large repositories,
3349and some problems with stacking and ``rich-root`` capable repositories.3382and some problems with stacking and ``rich-root`` capable repositories.
33503383
33513384
3352bzr 1.6.1rc2 2008-09-033385bzr 1.6.1rc2
3353#######################3386############
3387
3388:Released: 2008-09-03
33543389
3355Bug Fixes3390Bug Fixes
3356*********3391*********
@@ -3361,8 +3396,10 @@
3361 (John Arbash Meinel, #264321)3396 (John Arbash Meinel, #264321)
33623397
33633398
3364bzr 1.6.1rc1 2008-08-293399bzr 1.6.1rc1
3365#######################3400############
3401
3402:Released: 2008-08-29
33663403
3367This release fixes a few regressions found in the 1.6 client. Fetching3404This release fixes a few regressions found in the 1.6 client. Fetching
3368changes was using an O(N^2) buffering algorithm, so for large projects it3405changes was using an O(N^2) buffering algorithm, so for large projects it
@@ -3402,8 +3439,10 @@
3402 (John Arbash Meinel, #262333)3439 (John Arbash Meinel, #262333)
34033440
34043441
3405bzr 1.6 2008-08-253442bzr 1.6
3406##################3443#######
3444
3445:Released: 2008-08-25
34073446
3408Finally, the long awaited bzr 1.6 has been released. This release includes3447Finally, the long awaited bzr 1.6 has been released. This release includes
3409new features like Stacked Branches, improved weave merge, and an updated3448new features like Stacked Branches, improved weave merge, and an updated
@@ -3416,8 +3455,10 @@
3416TortoiseBzr in the standalone Windows installer.3455TortoiseBzr in the standalone Windows installer.
34173456
34183457
3419bzr 1.6rc5 2008-08-193458bzr 1.6rc5
3420#####################3459##########
3460
3461:Released: 2008-08-19
34213462
3422Bug Fixes3463Bug Fixes
3423*********3464*********
@@ -3429,8 +3470,10 @@
3429 (This change was reverted when merged to bzr.dev)3470 (This change was reverted when merged to bzr.dev)
34303471
34313472
3432bzr 1.6rc4 2008-08-183473bzr 1.6rc4
3433#####################3474##########
3475
3476:Released: 2008-08-18
34343477
3435Bug Fixes3478Bug Fixes
3436*********3479*********
@@ -3440,8 +3483,10 @@
3440 rather than preserving deltas. (John Arbash Meinel, #256757)3483 rather than preserving deltas. (John Arbash Meinel, #256757)
34413484
34423485
3443bzr 1.6rc3 2008-08-143486bzr 1.6rc3
3444#####################3487##########
3488
3489:Released: 2008-08-14
34453490
3446Changes3491Changes
3447*******3492*******
@@ -3474,8 +3519,10 @@
3474 development which is substantially faster. (Robert Collins)3519 development which is substantially faster. (Robert Collins)
34753520
34763521
3477bzr 1.6rc2 2008-08-133522bzr 1.6rc2
3478#####################3523##########
3524
3525:Released: 2008-08-13
34793526
3480This release candidate has a few minor bug fixes, and some regression3527This release candidate has a few minor bug fixes, and some regression
3481fixes for Windows.3528fixes for Windows.
@@ -3513,8 +3560,10 @@
3513 will get the same results. (John Arbash Meinel, #232188)3560 will get the same results. (John Arbash Meinel, #232188)
35143561
35153562
3516bzr 1.6rc1 2008-08-063563bzr 1.6rc1
3517#####################3564##########
3565
3566:Released: 2008-08-06
35183567
3519This release candidate for bzr 1.6 solidifies the new branch stacking3568This release candidate for bzr 1.6 solidifies the new branch stacking
3520feature. Bazaar now recommends that users upgrade all knit repositories,3569feature. Bazaar now recommends that users upgrade all knit repositories,
@@ -3650,8 +3699,10 @@
3650 (Ian Clatworthy)3699 (Ian Clatworthy)
36513700
36523701
3653bzr 1.6beta3 2008-07-173702bzr 1.6beta3
3654#######################3703############
3704
3705:Released: 2008-07-17
36553706
3656This release adds a new 'stacked branches' feature allowing branches to3707This release adds a new 'stacked branches' feature allowing branches to
3657share storage without being in the same repository or on the same machine.3708share storage without being in the same repository or on the same machine.
@@ -3823,8 +3874,10 @@
3823 (Robert Collins)3874 (Robert Collins)
38243875
38253876
3826bzr 1.6beta2 2008-06-103877bzr 1.6beta2
3827#######################3878############
3879
3880:Released: 2008-06-10
38283881
3829This release contains further progress towards our 1.6 goals of shallow3882This release contains further progress towards our 1.6 goals of shallow
3830repositories, and contains a fix for some user-affecting bugs in the3883repositories, and contains a fix for some user-affecting bugs in the
@@ -3907,9 +3960,10 @@
3907* Knit record serialisation is now stricter on what it will accept, to3960* Knit record serialisation is now stricter on what it will accept, to
3908 guard against potential internal bugs, or broken input. (Robert Collins)3961 guard against potential internal bugs, or broken input. (Robert Collins)
39093962
3910bzr 1.6beta1 2008-06-023963bzr 1.6beta1
3911#######################3964############
39123965
3966:Released: 2008-06-02
39133967
3914Commands that work on the revision history such as push, pull, missing,3968Commands that work on the revision history such as push, pull, missing,
3915uncommit and log are now substantially faster. This release adds a3969uncommit and log are now substantially faster. This release adds a
@@ -4127,8 +4181,10 @@
4127 (Martin Pool)4181 (Martin Pool)
41284182
41294183
4130bzr 1.5 2008-05-164184bzr 1.5
4131##################4185#######
4186
4187:Released: 2008-05-16
41324188
4133This release of Bazaar includes several updates to the documentation, and fixes4189This release of Bazaar includes several updates to the documentation, and fixes
4134to prepare for making rich root support the default format. Many bugs have been4190to prepare for making rich root support the default format. Many bugs have been
@@ -4149,8 +4205,10 @@
4149 (Ian Clatworthy)4205 (Ian Clatworthy)
41504206
41514207
4152bzr 1.5rc1 2008-05-094208bzr 1.5rc1
4153#####################4209##########
4210
4211:Released: 2008-05-09
41544212
4155Changes4213Changes
4156*******4214*******
@@ -4320,8 +4378,10 @@
4320 (Martin Pool)4378 (Martin Pool)
43214379
43224380
4323bzr 1.4 2008-04-284381bzr 1.4
4324##################4382#######
4383
4384:Released: 2008-04-28
43254385
4326This release of Bazaar includes handy improvements to the speed of log and4386This release of Bazaar includes handy improvements to the speed of log and
4327status, new options for several commands, improved documentation, and better4387status, new options for several commands, improved documentation, and better
@@ -4340,8 +4400,10 @@
4340 (John Arbash Meinel, Andrew Bennetts, #214894)4400 (John Arbash Meinel, Andrew Bennetts, #214894)
43414401
43424402
4343bzr 1.4rc2 2008-04-214403bzr 1.4rc2
4344#####################4404##########
4405
4406:Released: 2008-04-21
43454407
4346Bug Fixes4408Bug Fixes
4347*********4409*********
@@ -4364,8 +4426,10 @@
4364 (Robert Collins, John Arbash Meinel)4426 (Robert Collins, John Arbash Meinel)
43654427
43664428
4367bzr 1.4rc1 2008-04-114429bzr 1.4rc1
4368#####################4430##########
4431
4432:Released: 2008-04-11
43694433
4370Changes4434Changes
4371*******4435*******
@@ -4652,14 +4716,18 @@
4652 ``Graph.get_parent_map`` returns a dict of key:parents. (Robert Collins)4716 ``Graph.get_parent_map`` returns a dict of key:parents. (Robert Collins)
46534717
46544718
4655bzr 1.3.1 2008-04-094719bzr 1.3.1
4656####################4720#########
4721
4722:Released: 2008-04-09
46574723
4658No changes from 1.3.1rc1.4724No changes from 1.3.1rc1.
46594725
46604726
4661bzr 1.3.1rc1 2008-04-044727bzr 1.3.1rc1
4662#######################4728############
4729
4730:Released: 2008-04-04
46634731
4664Bug Fixes4732Bug Fixes
4665*********4733*********
@@ -4670,8 +4738,10 @@
4670 (#208418, Andrew Bennetts, Martin Pool, Robert Collins)4738 (#208418, Andrew Bennetts, Martin Pool, Robert Collins)
46714739
46724740
4673bzr 1.3 2008-03-204741bzr 1.3
4674##################4742#######
4743
4744:Released: 2008-03-20
46754745
4676Bazaar has become part of the GNU project <http://www.gnu.org>4746Bazaar has become part of the GNU project <http://www.gnu.org>
46774747
@@ -4687,8 +4757,10 @@
4687 (#202778, Martin Pool)4757 (#202778, Martin Pool)
46884758
46894759
4690bzr 1.3rc1 2008-03-164760bzr 1.3rc1
4691#####################4761##########
4762
4763:Released: 2008-03-16
46924764
4693Notes When Upgrading4765Notes When Upgrading
4694********************4766********************
@@ -4874,8 +4946,10 @@
4874 format. (Robert Collins)4946 format. (Robert Collins)
48754947
48764948
4877bzr 1.2 2008-02-154949bzr 1.2
4878##################4950#######
4951
4952:Released: 2008-02-15
48794953
4880Bug Fixes4954Bug Fixes
4881*********4955*********
@@ -4883,8 +4957,10 @@
4883* Fix failing test in Launchpad plugin. (Martin Pool)4957* Fix failing test in Launchpad plugin. (Martin Pool)
48844958
48854959
4886bzr 1.2rc1 2008-02-134960bzr 1.2rc1
4887#####################4961##########
4962
4963:Released: 2008-02-13
48884964
4889Notes When Upgrading4965Notes When Upgrading
4890********************4966********************
@@ -5085,13 +5161,17 @@
5085 revision names etc. (Robert Collins)5161 revision names etc. (Robert Collins)
50865162
50875163
5088bzr 1.1 2008-01-155164bzr 1.1
5089##################5165#######
5166
5167:Released: 2008-01-15
50905168
5091(no changes from 1.1rc1)5169(no changes from 1.1rc1)
50925170
5093bzr 1.1rc1 2008-01-055171bzr 1.1rc1
5094#####################5172##########
5173
5174:Released: 2008-01-05
50955175
5096Changes5176Changes
5097*******5177*******
@@ -5301,8 +5381,10 @@
5301 replaced by the new helper methods added in this release. (Robert Collins)5381 replaced by the new helper methods added in this release. (Robert Collins)
53025382
53035383
5304bzr 1.0 2007-12-145384bzr 1.0
5305##################5385#######
5386
5387:Released: 2007-12-14
53065388
5307Documentation5389Documentation
5308*************5390*************
@@ -5319,8 +5401,10 @@
5319 (Ian Clatworthy)5401 (Ian Clatworthy)
53205402
53215403
5322bzr 1.0rc3 2007-12-115404bzr 1.0rc3
5323#####################5405##########
5406
5407:Released: 2007-12-11
53245408
5325Changes5409Changes
5326*******5410*******
@@ -5361,8 +5445,10 @@
5361 (Vincent Ladeuil)5445 (Vincent Ladeuil)
53625446
53635447
5364bzr 1.0rc2 2007-12-075448bzr 1.0rc2
5365#####################5449##########
5450
5451:Released: 2007-12-07
53665452
5367Improvements5453Improvements
5368************5454************
@@ -5436,8 +5522,10 @@
5436 ``started`` methods. (Matt Nordhoff)5522 ``started`` methods. (Matt Nordhoff)
54375523
54385524
5439bzr 1.0rc1 2007-11-305525bzr 1.0rc1
5440#####################5526##########
5527
5528:Released: 2007-11-30
54415529
5442Notes When Upgrading5530Notes When Upgrading
5443********************5531********************
@@ -5713,8 +5801,10 @@
5713* InventoryEntry.diff is now deprecated. Please use diff.DiffTree instead.5801* InventoryEntry.diff is now deprecated. Please use diff.DiffTree instead.
57145802
57155803
5716bzr 0.92 2007-11-055804bzr 0.92
5717###################5805########
5806
5807:Released: 2007-11-05
57185808
5719Changes5809Changes
5720*******5810*******
@@ -5722,8 +5812,10 @@
5722 * New uninstaller on Win32. (Alexander Belchenko)5812 * New uninstaller on Win32. (Alexander Belchenko)
57235813
57245814
5725bzr 0.92rc1 2007-10-295815bzr 0.92rc1
5726######################5816###########
5817
5818:Released: 2007-10-29
57275819
5728Changes5820Changes
5729*******5821*******
@@ -6042,8 +6134,10 @@
6042 raises a Python warning. (Martin Pool)6134 raises a Python warning. (Martin Pool)
60436135
60446136
6045bzr 0.91 2007-09-266137bzr 0.91
6046###################6138########
6139
6140:Released: 2007-09-26
60476141
6048Bug Fixes6142Bug Fixes
6049*********6143*********
@@ -6064,15 +6158,19 @@
6064 (Andrew Bennetts)6158 (Andrew Bennetts)
60656159
60666160
6067bzr 0.91rc2 2007-09-116161bzr 0.91rc2
6068######################6162###########
6163
6164:Released: 2007-09-11
60696165
6070* Replaced incorrect tarball for previous release; a debug statement was left6166* Replaced incorrect tarball for previous release; a debug statement was left
6071 in bzrlib/remote.py.6167 in bzrlib/remote.py.
60726168
60736169
6074bzr 0.91rc1 2007-09-116170bzr 0.91rc1
6075######################6171###########
6172
6173:Released: 2007-09-11
60766174
6077Changes6175Changes
6078*******6176*******
@@ -6399,8 +6497,10 @@
6399 [] to revert all files is deprecated. (Aaron Bentley)6497 [] to revert all files is deprecated. (Aaron Bentley)
64006498
64016499
6402bzr 0.90 2007-08-286500bzr 0.90
6403###################6501########
6502
6503:Released: 2007-08-28
64046504
6405Improvements6505Improvements
6406************6506************
@@ -6423,8 +6523,10 @@
6423 and call ``create_repository`` on that. (Martin Pool)6523 and call ``create_repository`` on that. (Martin Pool)
64246524
64256525
6426bzr 0.90rc1 2007-08-146526bzr 0.90rc1
6427######################6527###########
6528
6529:Released: 2007-08-14
64286530
6429Bugfixes6531Bugfixes
6430********6532********
@@ -6696,8 +6798,10 @@
6696 parameter. Varargs-style parameters are deprecated. (Aaron Bentley)6798 parameter. Varargs-style parameters are deprecated. (Aaron Bentley)
66976799
66986800
6699bzr 0.18 2007-07-176801bzr 0.18
6700####################6802########
6803
6804:Released: 2007-07-17
67016805
6702Bugfixes6806Bugfixes
6703********6807********
@@ -6705,8 +6809,10 @@
6705* Fix 'bzr add' crash under Win32 (Kuno Meyer)6809* Fix 'bzr add' crash under Win32 (Kuno Meyer)
67066810
67076811
6708bzr 0.18rc1 2007-07-106812bzr 0.18rc1
6709#######################6813###########
6814
6815:Released: 2007-07-10
67106816
6711Bugfixes6817Bugfixes
6712********6818********
@@ -6957,8 +7063,10 @@
6957 (Vincent Ladeuil, #110448)7063 (Vincent Ladeuil, #110448)
69587064
69597065
6960bzr 0.17 2007-06-187066bzr 0.17
6961####################7067########
7068
7069:Released: 2007-06-18
69627070
6963Bugfixes7071Bugfixes
6964********7072********
@@ -6970,8 +7078,10 @@
6970 (Aaron Bentley, Ian Clatworthy, #120930)7078 (Aaron Bentley, Ian Clatworthy, #120930)
69717079
69727080
6973bzr 0.17rc1 2007-06-127081bzr 0.17rc1
6974#######################7082###########
7083
7084:Released: 2007-06-12
69757085
6976Notes When Upgrading7086Notes When Upgrading
6977********************7087********************
@@ -7072,8 +7182,10 @@
7072 your repository. (Previously Branch6 only supported revisions in your7182 your repository. (Previously Branch6 only supported revisions in your
7073 mainline). (John Arbash Meinel, #115343)7183 mainline). (John Arbash Meinel, #115343)
70747184
7075bzr 0.16 2007-05-077185bzr 0.16
7076####################7186########
7187
7188:Released: 2007-05-07
70777189
7078Bugfixes7190Bugfixes
7079********7191********
@@ -7103,8 +7215,10 @@
7103 diff`` and ``bzr status`` significantly improving the speed of7215 diff`` and ``bzr status`` significantly improving the speed of
7104 both. (John Arbash Meinel)7216 both. (John Arbash Meinel)
71057217
7106bzr 0.16rc2 2007-04-307218bzr 0.16rc2
7107#######################7219###########
7220
7221:Released: 2007-04-30
71087222
7109Bugfixes7223Bugfixes
7110********7224********
@@ -7127,8 +7241,10 @@
7127* ``WorkingTree4._iter_changes`` should not descend into unversioned7241* ``WorkingTree4._iter_changes`` should not descend into unversioned
7128 directories. (John Arbash Meinel, #110399)7242 directories. (John Arbash Meinel, #110399)
71297243
7130bzr 0.16rc1 2007-04-267244bzr 0.16rc1
7131#######################7245###########
7246
7247:Released: 2007-04-26
71327248
7133Notes When Upgrading7249Notes When Upgrading
7134********************7250********************
@@ -7435,8 +7551,10 @@
7435 implementation of new auth schemes for both http and proxy.7551 implementation of new auth schemes for both http and proxy.
7436 (Vincent Ladeuil)7552 (Vincent Ladeuil)
74377553
7438bzr 0.15 2007-04-017554bzr 0.15
7439###################7555########
7556
7557:Released: 2007-04-01
74407558
7441Bugfixes7559Bugfixes
7442********7560********
@@ -7448,8 +7566,10 @@
7448 checking out a branch that contains an old-format working tree.7566 checking out a branch that contains an old-format working tree.
7449 (Martin Pool)7567 (Martin Pool)
74507568
7451bzr 0.15rc3 2007-03-267569bzr 0.15rc3
7452#######################7570###########
7571
7572:Released: 2007-03-26
74537573
7454Changes7574Changes
7455*******7575*******
@@ -7524,8 +7644,10 @@
7524* Correctly handles mutiple permanent http redirections.7644* Correctly handles mutiple permanent http redirections.
7525 (vila, #88780)7645 (vila, #88780)
75267646
7527bzr 0.15rc2 2007-03-147647bzr 0.15rc2
7528#######################7648###########
7649
7650:Released: 2007-03-14
75297651
7530Notes When Upgrading7652Notes When Upgrading
7531********************7653********************
@@ -7578,8 +7700,10 @@
7578 (Wouter van Heyst, #53483)7700 (Wouter van Heyst, #53483)
75797701
75807702
7581bzr 0.15rc1 2007-03-077703bzr 0.15rc1
7582#######################7704###########
7705
7706:Released: 2007-03-07
75837707
7584Surprises7708Surprises
7585*********7709*********
@@ -7809,8 +7933,10 @@
7809 before the rest of the suite. (Martin Pool)7933 before the rest of the suite. (Martin Pool)
78107934
78117935
7812bzr 0.14 2007-01-237936bzr 0.14
7813####################7937########
7938
7939:Released: 2007-01-23
78147940
7815Improvements7941Improvements
7816************7942************
@@ -7829,8 +7955,10 @@
7829 it is in is below a repository. (James Westby, #77306)7955 it is in is below a repository. (James Westby, #77306)
78307956
78317957
7832bzr 0.14rc1 2007-01-167958bzr 0.14rc1
7833#######################7959###########
7960
7961:Released: 2007-01-16
78347962
7835Improvements7963Improvements
7836************7964************
@@ -7964,14 +8092,18 @@
7964 (Alexander Belchenko, #68124)8092 (Alexander Belchenko, #68124)
79658093
79668094
7967bzr 0.13 2006-12-058095bzr 0.13
7968####################8096########
8097
8098:Released: 2006-12-05
79698099
7970No changes from 0.13rc8100No changes from 0.13rc
79718101
79728102
7973bzr 0.13rc1 2006-11-278103bzr 0.13rc1
7974#######################8104###########
8105
8106:Released: 2006-11-27
79758107
7976Improvements8108Improvements
7977************8109************
@@ -8096,8 +8228,10 @@
8096* TestingHTTPRequestHandler really handles the Range header8228* TestingHTTPRequestHandler really handles the Range header
8097 (previously it was ignoring it and returning the whole file,).8229 (previously it was ignoring it and returning the whole file,).
80988230
8099bzr 0.12 2006-10-308231bzr 0.12
8100####################8232########
8233
8234:Released: 2006-10-30
81018235
8102Internals8236Internals
8103*********8237*********
@@ -8106,8 +8240,10 @@
8106 and remove benchmarks that take longer than 10min to run.8240 and remove benchmarks that take longer than 10min to run.
8107 (John Arbash Meinel)8241 (John Arbash Meinel)
81088242
8109bzr 0.12rc1 2006-10-238243bzr 0.12rc1
8110#######################8244###########
8245
8246:Released: 2006-10-23
81118247
8112Improvements8248Improvements
8113************8249************
@@ -8228,13 +8364,17 @@
8228 option to set the BzrDir, Repository and Branch formats of the8364 option to set the BzrDir, Repository and Branch formats of the
8229 created objects. (Robert Collins, John Arbash Meinel)8365 created objects. (Robert Collins, John Arbash Meinel)
82308366
8231bzr 0.11 2006-10-028367bzr 0.11
8232####################8368########
8369
8370:Released: 2006-10-02
82338371
8234* Smart server transport test failures on windows fixed. (Lukáš Lalinský).8372* Smart server transport test failures on windows fixed. (Lukáš Lalinský).
82358373
8236bzr 0.11rc2 2006-09-278374bzr 0.11rc2
8237#######################8375###########
8376
8377:Released: 2006-09-27
82388378
8239Bug Fixes8379Bug Fixes
8240*********8380*********
@@ -8244,8 +8384,10 @@
8244* Commit performance regression fixed. (Aaron Bentley, Robert Collins, John8384* Commit performance regression fixed. (Aaron Bentley, Robert Collins, John
8245 Arbash Meinel).8385 Arbash Meinel).
82468386
8247bzr 0.11rc1 2006-09-258387bzr 0.11rc1
8248#######################8388###########
8389
8390:Released: 2006-09-25
82498391
8250Improvements8392Improvements
8251************8393************
@@ -8438,8 +8580,10 @@
8438 allow upgrades to a richer interface than the VFS one provided by8580 allow upgrades to a richer interface than the VFS one provided by
8439 Transport. (Andrew Bennetts, Martin Pool)8581 Transport. (Andrew Bennetts, Martin Pool)
84408582
8441bzr 0.10 2006-08-298583bzr 0.10
8442####################8584########
8585
8586:Released: 2006-08-29
84438587
8444Improvements8588Improvements
8445************8589************
@@ -8516,8 +8660,10 @@
8516 need to be installed. This should help make the life of packagers8660 need to be installed. This should help make the life of packagers
8517 easier. (John Arbash Meinel)8661 easier. (John Arbash Meinel)
85188662
8519bzr 0.9.0 2006-08-118663bzr 0.9.0
8520#####################8664#########
8665
8666:Released: 2006-08-11
85218667
8522Surprises8668Surprises
8523*********8669*********
@@ -8784,16 +8930,20 @@
87848930
8785* "RevisionTree" is now in bzrlib/revisiontree.py. (Robert Collins)8931* "RevisionTree" is now in bzrlib/revisiontree.py. (Robert Collins)
87868932
8787bzr 0.8.2 2006-05-178933bzr 0.8.2
8788#####################8934#########
8935
8936:Released: 2006-05-17
87898937
8790Bug Fixes8938Bug Fixes
8791*********8939*********
87928940
8793* setup.py failed to install launchpad plugin. (Martin Pool)8941* setup.py failed to install launchpad plugin. (Martin Pool)
87948942
8795bzr 0.8.1 2006-05-168943bzr 0.8.1
8796#####################8944#########
8945
8946:Released: 2006-05-16
87978947
8798Bug Fixes8948Bug Fixes
8799*********8949*********
@@ -8846,8 +8996,10 @@
8846* Fix test case for bzr info in upgrading a standalone branch to metadir,8996* Fix test case for bzr info in upgrading a standalone branch to metadir,
8847 uses bzrlib api now. (Olaf Conradi)8997 uses bzrlib api now. (Olaf Conradi)
88488998
8849bzr 0.8 2006-05-088999bzr 0.8
8850###################9000#######
9001
9002:Released: 2006-05-08
88519003
8852Notes When Upgrading9004Notes When Upgrading
8853********************9005********************
@@ -9108,8 +9260,10 @@
9108* ``run_bzr`` and ``run_bzr_captured`` now accept a 'stdin="foo"'9260* ``run_bzr`` and ``run_bzr_captured`` now accept a 'stdin="foo"'
9109 parameter which will provide String("foo") to the command as its stdin.9261 parameter which will provide String("foo") to the command as its stdin.
91109262
9111bzr 0.7 2006-01-099263bzr 0.7
9112##################9264#######
9265
9266:Released: 2006-01-09
91139267
9114Changes9268Changes
9115*******9269*******
@@ -9404,8 +9558,10 @@
9404* ``bzrlib.osutils.safe_unicode`` now exists to provide parameter coercion9558* ``bzrlib.osutils.safe_unicode`` now exists to provide parameter coercion
9405 for functions that need unicode strings. (Robert Collins)9559 for functions that need unicode strings. (Robert Collins)
94069560
9407bzr 0.6 2005-10-289561bzr 0.6
9408##################9562#######
9563
9564:Released: 2005-10-28
94099565
9410Improvements9566Improvements
9411************9567************
@@ -9620,8 +9776,10 @@
9620 [-1] in the revision-history. (Andres Salomon)9776 [-1] in the revision-history. (Andres Salomon)
96219777
96229778
9623bzr 0.1.1 2005-10-129779bzr 0.1.1
9624####################9780#########
9781
9782:Released: 2005-10-12
96259783
9626Bug Fixes9784Bug Fixes
9627*********9785*********
@@ -9638,8 +9796,10 @@
9638* Avoid some unnecessary http operations in branch and pull.9796* Avoid some unnecessary http operations in branch and pull.
96399797
96409798
9641bzr 0.1 2005-10-119799bzr 0.1
9642##################9800#######
9801
9802:Released: 2005-10-11
96439803
9644Notes9804Notes
9645*****9805*****
@@ -9768,8 +9928,10 @@
9768 of tests to run, e.g. ``bzr selftest test_weave``9928 of tests to run, e.g. ``bzr selftest test_weave``
97699929
97709930
9771bzr 0.0.9 2005-09-239931bzr 0.0.9
9772####################9932#########
9933
9934:Released: 2005-09-23
97739935
9774Bug Fixes9936Bug Fixes
9775*********9937*********
@@ -9810,8 +9972,11 @@
9810 another (used by pull, merged, etc.)9972 another (used by pull, merged, etc.)
98119973
98129974
9813bzr 0.0.8 2005-09-209975bzr 0.0.8
9814####################9976#########
9977
9978:Released: 2005-09-20
9979
98159980
9816Improvements9981Improvements
9817************9982************
@@ -9861,8 +10026,10 @@
9861* Quieten warnings about locking; patch from Matt Lavin.10026* Quieten warnings about locking; patch from Matt Lavin.
986210027
986310028
9864bzr-0.0.7 2005-09-0210029bzr-0.0.7
9865####################10030#########
10031
10032:Released: 2005-09-02
986610033
9867New Features10034New Features
9868************10035************
@@ -9916,8 +10083,10 @@
991610083
991710084
991810085
9919bzr-0.0.6 2005-08-1810086bzr-0.0.6
9920####################10087#########
10088
10089:Released: 2005-08-18
992110090
9922New Features10091New Features
9923************10092************
@@ -10002,8 +10171,10 @@
10002* Fix bugs in committing only selected files or within a subdirectory.10171* Fix bugs in committing only selected files or within a subdirectory.
1000310172
1000410173
10005bzr-0.0.5 2005-06-1510174bzr-0.0.5
10006#####################10175#########
10176
10177:Released: 2005-06-15
1000710178
10008Changes10179Changes
10009*******10180*******
@@ -10144,8 +10315,10 @@
10144 2.4 is now only recommended.10315 2.4 is now only recommended.
1014510316
1014610317
10147bzr-0.0.4 2005-04-2210318bzr-0.0.4
10148#####################10319#########
10320
10321:Released: 2005-04-22
1014910322
10150Enhancements10323Enhancements
10151************10324************
@@ -10213,8 +10386,10 @@
10213 from QuantumG.10386 from QuantumG.
1021410387
1021510388
10216bzr-0.0.3 2005-04-0610389bzr-0.0.3
10217#####################10390#########
10391
10392:Released: 2005-04-06
1021810393
10219Enhancements10394Enhancements
10220************10395************
@@ -10268,8 +10443,11 @@
10268* Win32 fixes from Steve Brown.10443* Win32 fixes from Steve Brown.
1026910444
1027010445
10271bzr-0.0.2 "black cube" 2005-03-3110446bzr-0.0.2
10272###################################10447#########
10448
10449:Codename: "black cube"
10450:Released: 2005-03-31
1027310451
10274Enhancements10452Enhancements
10275************10453************
@@ -10297,8 +10475,10 @@
10297 the root directory only.10475 the root directory only.
1029810476
1029910477
10300bzr-0.0.1 2005-03-2610478bzr-0.0.1
10301#####################10479#########
10480
10481:Released: 2005-03-26
1030210482
10303Enhancements10483Enhancements
10304************10484************
@@ -10327,8 +10507,10 @@
10327 supported).10507 supported).
1032810508
1032910509
10330bzr-0.0.0.69 2005-03-2210510bzr-0.0.0.69
10331########################10511############
10512
10513:Released: 2005-03-22
1033210514
10333Enhancements10515Enhancements
10334************10516************
1033510517
=== added file 'doc/Bazaar-Logo-For-Manuals.png'
10336Binary files doc/Bazaar-Logo-For-Manuals.png 1970-01-01 00:00:00 +0000 and doc/Bazaar-Logo-For-Manuals.png 2009-09-02 16:03:51 +0000 differ10518Binary files doc/Bazaar-Logo-For-Manuals.png 1970-01-01 00:00:00 +0000 and doc/Bazaar-Logo-For-Manuals.png 2009-09-02 16:03:51 +0000 differ
=== modified file 'doc/_templates/index.html'
--- doc/_templates/index.html 2009-08-18 00:10:19 +0000
+++ doc/_templates/index.html 2009-09-03 02:29:16 +0000
@@ -16,9 +16,6 @@
16 <p class="biglink"><a class="biglink" href="{{ pathto("en/quick-reference/index") }}">Quick Reference</a><br/>16 <p class="biglink"><a class="biglink" href="{{ pathto("en/quick-reference/index") }}">Quick Reference</a><br/>
17 <span class="linkdescr">for your wall</span>17 <span class="linkdescr">for your wall</span>
18 </p>18 </p>
19 <p class="biglink"><a class="biglink" href="{{ pathto("en/user-reference/bzr_man") }}">User Reference</a><br/>
20 <span class="linkdescr">all the gory details</span>
21 </p>
22 </td><td width="50%">19 </td><td width="50%">
23 <p class="biglink"><a class="biglink" href="{{ pathto("en/release-notes/NEWS") }}">Release Notes</a><br/>20 <p class="biglink"><a class="biglink" href="{{ pathto("en/release-notes/NEWS") }}">Release Notes</a><br/>
24 <span class="linkdescr">what's new</span>21 <span class="linkdescr">what's new</span>
@@ -26,6 +23,23 @@
26 <p class="biglink"><a class="biglink" href="{{ pathto("en/upgrade-guide/index") }}">Upgrade Guide</a><br/>23 <p class="biglink"><a class="biglink" href="{{ pathto("en/upgrade-guide/index") }}">Upgrade Guide</a><br/>
27 <span class="linkdescr">moving to Bazaar 2.x</span>24 <span class="linkdescr">moving to Bazaar 2.x</span>
28 </p>25 </p>
26 <p class="biglink"><a class="biglink" href="{{ pathto("en/user-reference/bzr_man") }}">User Reference</a><br/>
27 <span class="linkdescr">all the gory details</span>
28 </p>
29 </td></tr>
30 </table>
31
32 <h2>Related links</h2>
33
34 <table class="contentstable" align="center" style="margin-left: 30px"><tr>
35 <td width="50%">
36 <p class="biglink"><a class="biglink" href="https://answers.launchpad.net/bzr">FAQ</a><br/>
37 <span class="linkdescr">frequently asked questions</span>
38 </p>
39 <p class="biglink"><a class="biglink" href="http://bazaar-vcs.org/BzrGlossary/">Glossary</a><br/>
40 <span class="linkdescr">help with terminology</span>
41 </p>
42 </td><td width="50%">
29 <p class="biglink"><a class="biglink" href="http://doc.bazaar-vcs.org/migration/en/">Migration Docs</a><br/>43 <p class="biglink"><a class="biglink" href="http://doc.bazaar-vcs.org/migration/en/">Migration Docs</a><br/>
30 <span class="linkdescr">for refugees of other tools</span>44 <span class="linkdescr">for refugees of other tools</span>
31 </p>45 </p>
@@ -35,31 +49,7 @@
35 </td></tr>49 </td></tr>
36 </table>50 </table>
3751
38 <p>Keen to help? See the <a href="{{ pathto("developers/index") }}">Developer Docs</a>52 <p>Keen to help? See the <a href="http://doc.bazaar-vcs.org/latest/developers/">Developer Docs</a>
39 for policies and tools on contributing code, tests and documentation.</p>53 for policies and tools on contributing code, tests and documentation.</p>
4054
41
42 <h2>Related Links</h2>
43
44 <table class="contentstable" align="center" style="margin-left: 30px"><tr>
45 <td width="25%">
46 <p><a href="https://answers.launchpad.net/bzr">FAQ</a>
47 </p>
48 </td><td width="25%">
49 <p><a href="http://bazaar-vcs.org/BzrGlossary/">Glossary</a>
50 </p>
51 </td><td width="25%">
52 <p><a href="{{ pathto("genindex") }}">Index</a>
53 </p>
54 </td><td width="25%">
55 <p><a href="{{ pathto("search") }}">Search</a>
56 </p>
57 </td></tr>
58 </table>
59
60 <hr>
61 <p>Other languages:
62 <a href="{{ pathto("index.es") }}">Spanish</a>,
63 <a href="{{ pathto("index.ru") }}">Russian</a>
64 </p>
65{% endblock %}55{% endblock %}
6656
=== modified file 'doc/_templates/layout.html'
--- doc/_templates/layout.html 2009-07-22 13:41:01 +0000
+++ doc/_templates/layout.html 2009-09-03 00:21:59 +0000
@@ -3,5 +3,6 @@
3{% block rootrellink %}3{% block rootrellink %}
4<li><a href="http://bazaar-vcs.org/">4<li><a href="http://bazaar-vcs.org/">
5 <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Home</a>&nbsp;|&nbsp;</li>5 <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Home</a>&nbsp;|&nbsp;</li>
6<a href="http://doc.bazaar-vcs.org/en/">Documentation</a>&nbsp;|&nbsp;</li>
6{{ super() }}7{{ super() }}
7{% endblock %}8{% endblock %}
89
=== modified file 'doc/conf.py'
--- doc/conf.py 2009-07-22 13:41:01 +0000
+++ doc/conf.py 2009-09-03 02:29:16 +0000
@@ -34,7 +34,7 @@
34#source_encoding = 'utf-8'34#source_encoding = 'utf-8'
3535
36# The master toctree document.36# The master toctree document.
37master_doc = 'contents'37master_doc = 'index'
3838
39# General information about the project.39# General information about the project.
40project = u'Bazaar'40project = u'Bazaar'
@@ -45,9 +45,9 @@
45# built documents.45# built documents.
46#46#
47# The short X.Y version.47# The short X.Y version.
48version = '1.18'48version = '2.0'
49# The full version, including alpha/beta/rc tags.49# The full version, including alpha/beta/rc tags.
50release = '1.18dev'50release = '2.0rc2'
5151
52# The language for content autogenerated by Sphinx. Refer to documentation52# The language for content autogenerated by Sphinx. Refer to documentation
53# for a list of supported languages.53# for a list of supported languages.
@@ -123,7 +123,7 @@
123#html_title = None123#html_title = None
124124
125# A shorter title for the navigation bar. Default is the same as html_title.125# A shorter title for the navigation bar. Default is the same as html_title.
126#html_short_title = None126html_short_title = "Table of Contents (%s)" % (release,)
127127
128# The name of an image file (relative to this directory) to place at the top128# The name of an image file (relative to this directory) to place at the top
129# of the sidebar.129# of the sidebar.
@@ -152,13 +152,13 @@
152152
153# Additional templates that should be rendered to pages, maps page names to153# Additional templates that should be rendered to pages, maps page names to
154# template names.154# template names.
155html_additional_pages = {'contents': 'index.html'}155html_additional_pages = {'index': 'index.html'}
156156
157# If false, no module index is generated.157# If false, no module index is generated.
158#html_use_modindex = True158html_use_modindex = False
159159
160# If false, no index is generated.160# If false, no index is generated.
161#html_use_index = True161html_use_index = False
162162
163# If true, the index is split into individual pages for each letter.163# If true, the index is split into individual pages for each letter.
164#html_split_index = False164#html_split_index = False
@@ -175,7 +175,7 @@
175#html_file_suffix = ''175#html_file_suffix = ''
176176
177# Output file base name for HTML help builder.177# Output file base name for HTML help builder.
178htmlhelp_basename = 'Bazaardoc'178htmlhelp_basename = 'bzr-en-user-docs'
179179
180180
181# -- Options for LaTeX output --------------------------------------------------181# -- Options for LaTeX output --------------------------------------------------
@@ -189,13 +189,29 @@
189# Grouping the document tree into LaTeX files. List of tuples189# Grouping the document tree into LaTeX files. List of tuples
190# (source start file, target name, title, author, documentclass [howto/manual]).190# (source start file, target name, title, author, documentclass [howto/manual]).
191latex_documents = [191latex_documents = [
192 ('contents', 'Bazaar.tex', u'Bazaar Documentation',192 # Manuals
193 u'Bazaar Developers', 'manual'),193 ('en/user-guide/index', 'bzr-en-user-guide.tex', u'Bazaar User Guide',
194 u'Bazaar Developers', 'manual'),
195 ('en/user-reference/bzr_man', 'bzr-en-user-reference.tex', u'Bazaar User Reference',
196 u'Bazaar Developers', 'manual'),
197 ('en/release-notes/NEWS', 'bzr-en-release-notes.tex', u'Bazaar Release Notes',
198 u'Bazaar Developers', 'manual'),
199 ('en/upgrade-guide/index', 'bzr-en-upgrade-guide.tex', u'Bazaar Upgrade Guide',
200 u'Bazaar Developers', 'manual'),
201 # Tutorials
202 ('en/mini-tutorial/index', 'bzr-en-tutorial-mini.tex', u'Bazaar in five minutes',
203 u'Bazaar Developers', 'howto'),
204 ('en/tutorials/tutorial', 'bzr-en-tutorial.tex', u'Bazaar Tutorial',
205 u'Bazaar Developers', 'howto'),
206 ('en/tutorials/using_bazaar_with_launchpad', 'bzr-en-tutorial-with-launchpad.tex',
207 u'Using Bazaar With Launchpad', u'Bazaar Developers', 'howto'),
208 ('en/tutorials/centralized_workflow', 'bzr-en-tutorial-centralized.tex',
209 u'Centralized Workflow Tutorial', u'Bazaar Developers', 'howto'),
194]210]
195211
196# The name of an image file (relative to this directory) to place at the top of212# The name of an image file (relative to this directory) to place at the top of
197# the title page.213# the title page.
198#latex_logo = None214latex_logo = 'Bazaar-Logo-For-Manuals.png'
199215
200# For "manual" documents, if this is true, then toplevel headings are parts,216# For "manual" documents, if this is true, then toplevel headings are parts,
201# not chapters.217# not chapters.
202218
=== modified file 'doc/en/mini-tutorial/index.txt'
--- doc/en/mini-tutorial/index.txt 2009-04-04 02:50:01 +0000
+++ doc/en/mini-tutorial/index.txt 2009-09-02 16:03:51 +0000
@@ -2,8 +2,6 @@
2Bazaar in five minutes2Bazaar in five minutes
3======================3======================
44
5.. contents::
6
7Introduction5Introduction
8============6============
97
108
=== modified file 'doc/en/tutorials/centralized_workflow.txt'
--- doc/en/tutorials/centralized_workflow.txt 2009-07-22 13:41:01 +0000
+++ doc/en/tutorials/centralized_workflow.txt 2009-09-02 16:03:51 +0000
@@ -1,6 +1,6 @@
1====================1=============================
2Centralized Workflow2Centralized Workflow Tutorial
3====================3=============================
44
55
6Overview6Overview
@@ -23,8 +23,6 @@
2323
24.. _Bazaar: http://bazaar-vcs.org24.. _Bazaar: http://bazaar-vcs.org
2525
26.. contents::
27
2826
29Initial Setup27Initial Setup
30=============28=============
3129
=== modified file 'doc/en/tutorials/tutorial.txt'
--- doc/en/tutorials/tutorial.txt 2009-06-27 08:10:13 +0000
+++ doc/en/tutorials/tutorial.txt 2009-09-02 16:03:51 +0000
@@ -11,8 +11,6 @@
11Bazaar Tutorial11Bazaar Tutorial
12===============12===============
1313
14Current for bzr-0.91, 2007-08
15
1614
17Introduction15Introduction
18============16============
@@ -24,8 +22,8 @@
24different." Otherwise, get some coffee or tea, get comfortable and get22different." Otherwise, get some coffee or tea, get comfortable and get
25ready to catch up. 23ready to catch up.
2624
27The Purposes of Revision Control25The purpose of revision control
28================================26===============================
2927
30Odds are that you have worked on some sort of textual data -- the sources28Odds are that you have worked on some sort of textual data -- the sources
31to a program, web sites or the config files that Unix system29to a program, web sites or the config files that Unix system
@@ -57,8 +55,8 @@
57We keep these logs so that if later there is some sort of problem with55We keep these logs so that if later there is some sort of problem with
58sftp, we can figure out when the problem probably happened. 56sftp, we can figure out when the problem probably happened.
5957
60How DRCS is Different58How DRCS is different
61---------------------59=====================
6260
63Many Revision Control Systems (RCS) are stored on servers. If one wants to61Many Revision Control Systems (RCS) are stored on servers. If one wants to
64work on the code stored within an RCS, then one needs to connect to the62work on the code stored within an RCS, then one needs to connect to the
@@ -282,6 +280,7 @@
282As a shortcut, ``bzr diff -p1`` produces a form that works with the 280As a shortcut, ``bzr diff -p1`` produces a form that works with the
283command ``patch -p1``.281command ``patch -p1``.
284282
283
285Committing changes284Committing changes
286==================285==================
287286
@@ -308,7 +307,7 @@
308can also be useful when you pick up your work after a break.)307can also be useful when you pick up your work after a break.)
309308
310Message from an editor309Message from an editor
311======================310----------------------
312311
313If you use neither the ``-m`` nor the ``-F`` option then bzr will open an312If you use neither the ``-m`` nor the ``-F`` option then bzr will open an
314editor for you to enter a message. The editor to run is controlled by313editor for you to enter a message. The editor to run is controlled by
@@ -355,9 +354,13 @@
355given then only those ones will be affected. ``bzr revert`` also clears the354given then only those ones will be affected. ``bzr revert`` also clears the
356list of pending merges revisions.355list of pending merges revisions.
357356
357
358Ignoring files358Ignoring files
359==============359==============
360360
361The .bzrignore file
362-------------------
363
361Many source trees contain some files that do not need to be versioned,364Many source trees contain some files that do not need to be versioned,
362such as editor backups, object or bytecode files, and built programs. You365such as editor backups, object or bytecode files, and built programs. You
363can simply not add them, but then they'll always crop up as unknown files.366can simply not add them, but then they'll always crop up as unknown files.
@@ -400,7 +403,7 @@
400 % bzr commit -m "Add ignore patterns"403 % bzr commit -m "Add ignore patterns"
401404
402405
403Global Ignores406Global ignores
404--------------407--------------
405408
406There are some ignored files which are not project specific, but more user409There are some ignored files which are not project specific, but more user
@@ -574,6 +577,7 @@
574 rsync, or other related file transfer methods. This is usually less safe577 rsync, or other related file transfer methods. This is usually less safe
575 than using ``push``, but may be faster or easier in some situations.578 than using ``push``, but may be faster or easier in some situations.
576579
580
577Moving changes between trees 581Moving changes between trees
578============================582============================
579583
580584
=== modified file 'doc/en/tutorials/using_bazaar_with_launchpad.txt'
--- doc/en/tutorials/using_bazaar_with_launchpad.txt 2009-07-22 13:41:01 +0000
+++ doc/en/tutorials/using_bazaar_with_launchpad.txt 2009-09-02 16:03:51 +0000
@@ -2,8 +2,6 @@
2Using Bazaar with Launchpad2Using Bazaar with Launchpad
3===========================3===========================
44
5.. contents::
6
75
8Motivation6Motivation
9==========7==========
108
=== modified file 'doc/en/upgrade-guide/index.txt'
--- doc/en/upgrade-guide/index.txt 2009-07-22 13:41:01 +0000
+++ doc/en/upgrade-guide/index.txt 2009-09-02 16:03:51 +0000
@@ -8,8 +8,6 @@
8.. level 3 ~~~~~~~~8.. level 3 ~~~~~~~~
9.. level 4 ^^^^^^^^ (it is better not to use nesting deeper than 3 levels)9.. level 4 ^^^^^^^^ (it is better not to use nesting deeper than 3 levels)
1010
11.. contents::
12
13.. include:: overview.txt11.. include:: overview.txt
14.. include:: data_migration.txt12.. include:: data_migration.txt
15.. include:: tips_and_tricks.txt13.. include:: tips_and_tricks.txt
1614
=== removed file 'doc/en/user-guide/index.txt'
--- doc/en/user-guide/index.txt 2009-07-26 15:58:33 +0000
+++ doc/en/user-guide/index.txt 1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
1#################
2Bazaar User Guide
3#################
4
5.. Please mark sections in included files as following:
6.. level 1 ========
7.. level 2 --------
8.. level 3 ~~~~~~~~
9.. level 4 ^^^^^^^^ (it is better not to use nesting deeper than 3 levels)
10
11.. contents:: :depth: 3
12
13
14Introduction
15############
16
17.. include:: introducing_bazaar.txt
18.. include:: core_concepts.txt
19.. include:: bazaar_workflows.txt
20
21
22Getting started
23###############
24
25.. include:: installing_bazaar.txt
26.. include:: entering_commands.txt
27.. include:: getting_help.txt
28.. include:: configuring_bazaar.txt
29.. include:: using_aliases.txt
30.. include:: plugins.txt
31.. include:: zen.txt
32
33
34Personal version control
35########################
36
37.. include:: solo_intro.txt
38.. include:: starting_a_project.txt
39.. include:: controlling_registration.txt
40.. include:: reviewing_changes.txt
41.. include:: recording_changes.txt
42.. include:: browsing_history.txt
43.. include:: releasing_a_project.txt
44.. include:: undoing_mistakes.txt
45
46
47Sharing with peers
48##################
49
50.. include:: partner_intro.txt
51.. include:: branching_a_project.txt
52.. include:: merging_changes.txt
53.. include:: resolving_conflicts.txt
54.. include:: annotating_changes.txt
55
56
57Team collaboration, central style
58#################################
59
60.. include:: central_intro.txt
61.. include:: publishing_a_branch.txt
62.. include:: using_checkouts.txt
63.. include:: working_offline_central.txt
64.. include:: reusing_a_checkout.txt
65
66
67Team collaboration, distributed style
68#####################################
69
70.. include:: distributed_intro.txt
71.. include:: organizing_branches.txt
72.. include:: using_gatekeepers.txt
73.. include:: sending_changes.txt
74
75
76Miscellaneous topics
77####################
78
79.. include:: part2_intro.txt
80.. include:: adv_merging.txt
81.. include:: shelving_changes.txt
82.. include:: filtered_views.txt
83.. include:: stacked.txt
84.. include:: server.txt
85.. include:: hooks.txt
86.. include:: version_info.txt
87
88
89A brief tour of some popular plugins
90####################################
91
92.. include:: bzrtools_plugin.txt
93.. include:: svn_plugin.txt
94.. include later looms_plugin.txt
95
96
97Integrating Bazaar into your environment
98########################################
99
100.. include:: web_browsing.txt
101.. include later - file_explorers.txt
102.. include later - desktop_integration.txt
103.. include later - editors_and_ides.txt
104.. include later - email.txt
105.. include:: bug_trackers.txt
106
107
108Appendices
109##########
110
111.. include:: specifying_revisions.txt
112.. include:: organizing_your_workspace.txt
113.. include:: shared_repository_layouts.txt
114.. include:: setting_up_email.txt
115.. include:: http_smart_server.txt
116.. include:: writing_a_plugin.txt
117
118.. |--| unicode:: U+2014
1190
=== renamed file 'doc/en/user-guide/index-for-2x.txt' => 'doc/en/user-guide/index.txt'
=== renamed file 'doc/contents.txt' => 'doc/index.txt'
--- doc/contents.txt 2009-08-18 00:10:19 +0000
+++ doc/index.txt 2009-09-03 02:29:16 +0000
@@ -4,8 +4,8 @@
4 contain the root `toctree` directive.4 contain the root `toctree` directive.
55
66
7Core documentation7Table of Contents
8==================8=================
99
10.. toctree::10.. toctree::
11 :maxdepth: 111 :maxdepth: 1
@@ -13,30 +13,6 @@
13 en/user-guide/index13 en/user-guide/index
14 en/tutorials/index14 en/tutorials/index
15 en/quick-reference/index15 en/quick-reference/index
16 en/user-reference/index16 en/release-notes/NEWS
17
18.. toctree::
19 :maxdepth: 1
20
21 en/release-notes/index
22 en/upgrade-guide/index17 en/upgrade-guide/index
23 developers/index18 en/user-reference/bzr_man
24
25
26Other languages:
27
28.. toctree::
29 :maxdepth: 1
30
31 index.es
32 index.ru
33
34
35Related links
36=============
37
38* `Frequently Asked Questions <http://bazaar-vcs.org/FAQ>`_
39* `Glossary <http://bazaar-vcs.org/BzrGlossary>`_
40* :ref:`genindex`
41* :ref:`search`
42
4319
=== removed file 'doc/index.txt'
--- doc/index.txt 2009-08-10 06:53:44 +0000
+++ doc/index.txt 1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
1============================
2Bazaar Main Document Catalog
3============================
4
5The latest version of these documents are available from Bazaar's
6documentation site, <http://doc.bazaar-vcs.org/>, and more documentation
7may be linked from <http://bazaar-vcs.org/Documentation>.
8
9Core Documentation
10==================
11
12* `User Guide <en/user-guide/index.html>`_
13
14* `User Reference <en/user-reference/bzr_man.html>`_
15
16* `Quick Start Card <_static/en/quick-reference/bzr-quick-reference.svg>`_
17 (`PDF <_static/en/quick-reference/bzr-quick-reference.pdf>`_,
18 `PNG <_static/en/quick-reference/bzr-quick-reference.png>`_)
19
20* `Release Notes <en/release-notes/NEWS.html>`_
21
22* `2.0 Upgrade Guide <en/upgrade-guide/index.html>`_
23
24
25Tutorials
26=========
27
28* `Bazaar in five minutes <en/mini-tutorial/index.html>`_
29
30* `A longer tutorial <en/tutorials/tutorial.html>`_
31
32* `Using Bazaar with Launchpad <en/tutorials/using_bazaar_with_launchpad.html>`_
33
34* `Centralized workflow <en/tutorials/centralized_workflow.html>`_
35
36
37Developer Documentation
38=======================
39
40* `Developer Document Catalog <developers/index.html>`_ |--| for developers
41 of Bazaar and plugins
42
43Web links
44=========
45
46* `Switching Guides <http://bazaar-vcs.org/BzrSwitching>`_
47 |--| for users moving from another VCS tool
48
49* `Migration Guide <http://bazaar-vcs.org/BzrMigration>`_
50 |--| for teams migrating history from another VCS tool
51
52* `Glossary <http://bazaar-vcs.org/BzrGlossary>`_
53
54* `Frequently Asked Questions <http://bazaar-vcs.org/FAQ>`_
55
56
57Other Languages
58===============
59
60* `Spanish Documentation <index.es.html>`_
61* `Russian Documentation <index.ru.html>`_ |--| документация на русском
62
63.. |--| unicode:: U+2014
64
65..
66 vim: ft=rst tw=74 ai
670
=== added file 'tools/generate_release_notes.py'
--- tools/generate_release_notes.py 1970-01-01 00:00:00 +0000
+++ tools/generate_release_notes.py 2009-09-03 05:09:22 +0000
@@ -0,0 +1,86 @@
1#!/usr/bin/python
2
3# Copyright 2009 Canonical Ltd.
4#
5# This program is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by
7# the Free Software Foundation; either version 2 of the License, or
8# (at your option) any later version.
9#
10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY; without even the implied warranty of
12# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13# GNU General Public License for more details.
14#
15# You should have received a copy of the GNU General Public License
16# along with this program; if not, write to the Free Software
17# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
19import os
20import sys
21from optparse import OptionParser
22
23sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
24
25
26def split_into_topics(lines, out_file, out_dir):
27 """Split a large NEWS file into topics, one per release.
28
29 Releases are detected by matching headings that look like
30 release names. Topics are created with matching names
31 replacing spaces with dashes.
32 """
33 topic_file = None
34 for index, line in enumerate(lines):
35 maybe_new_topic = line[:4] in ['bzr ', 'bzr-0',]
36 if maybe_new_topic and lines[index + 1].startswith('####'):
37 release = line.strip()
38 if topic_file is None:
39 # First topic found
40 out_file.write(".. toctree::\n :maxdepth: 1\n\n")
41 else:
42 # close the current topic
43 topic_file.close()
44 topic_file = open_topic_file(out_file, out_dir, release)
45 elif topic_file:
46 topic_file.write(line)
47 else:
48 # Still in the header - dump content straight to output
49 out_file.write(line)
50
51
52def open_topic_file(out_file, out_dir, release):
53 topic_name = release.replace(' ', '-')
54 out_file.write(" %s\n" % (topic_name,))
55 topic_path = os.path.join(out_dir, "%s.txt" % (topic_name,))
56 result = open(topic_path, 'w')
57 result.write("%s\n" % (release,))
58 return result
59
60
61def main(argv):
62 # Check usage
63 parser = OptionParser(usage="%prog SOURCE DESTINATION")
64 (options, args) = parser.parse_args(argv)
65 if len(args) != 2:
66 parser.print_help()
67 sys.exit(1)
68
69 # Open the files and do the work
70 infile_name = args[0]
71 outfile_name = args[1]
72 outdir = os.path.dirname(outfile_name)
73 infile = open(infile_name, 'r')
74 try:
75 lines = infile.readlines()
76 finally:
77 infile.close()
78 outfile = open(outfile_name, 'w')
79 try:
80 split_into_topics(lines, outfile, outdir)
81 finally:
82 outfile.close()
83
84
85if __name__ == '__main__':
86 main(sys.argv[1:])

Subscribers

People subscribed via source and target branches