Bazaar

Merge lp:~ian-clatworthy/bzr/doc-site-per-language into lp:bzr/2.0

  1. doc-site-per-language
  2. Merge into 2.0
Proposed by Ian Clatworthy
Status: Superseded
Proposed branch: lp:~ian-clatworthy/bzr/doc-site-per-language
Merge into: lp:bzr/2.0
Diff against target: None lines
To merge this branch: bzr merge lp:~ian-clatworthy/bzr/doc-site-per-language
Reviewer Review Type Date Requested Status
Robert Collins (community) Needs Fixing
Review via email: mp+11287@code.launchpad.net

This proposal has been superseded by a proposal from 2009-09-08.

To post a comment you must log in.
Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

This patch extends/supersedes the PDF/CHM doc patch by pulling out the developer and foreign language docs into their own websites/chm files. This fixes numerous CHM-related bugs, e.g. searching now gives sensible and useful results.

Some other related changes included are:

* The Developer Guide has moved from under the 'user docs' directory to being under the Developer doc area so that links in CHM are local and work as expected

* For similar reasons, links from foreign language sites to explicit English docs via local URLs have also been removed

* The Russian and Spanish sites now have updated links to the preferred FAQ (LP Answers) and the Migration Docs

* The Russian and Spanish sites now use their native languages for next/previous/search, etc.

* A link to Emma's Contributing to the docs wiki-page has been added into the Developer docs TOC.

* The developer docs TOC has been split into separate documents (based on the current sections) so that the CHM file has 10 top-level topics in it's TOC, not 50 odd.

Ian C.

Revision history for this message
Robert Collins (lifeless) wrote :

I think this is a good start but it has some issues.

Is it rendered somewhere we can look at?

Nitty gritty:

Is there a source .svg or similar for the new png? Be good to have the
most editable form in bzr.

There is a /lot/ of duplication between the conf.py files. I don't think
that that is good, we should only have unique data in each configuration
file.

I'm a /big/ fan of nonrecursive Make; it would reduce duplication of
Makefile code here too. If you need to you could include Makefile
fragments into the top level make, but it is short enough that I suggest
just including the base rules inline[but parameterised] and then making
make doc depend on the things to build.

Lastly, why are we keeping the old doc rules at all? The docs seem to be
changing so much that those rules would produce garbage...

 review needsfixing

review: Needs Fixing
Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

> Is it rendered somewhere we can look at?

I've uploaded the Developer docs to http://doc.bazaar-vcs.org/developers/. I'm yet to upload the other docs though the English ones don't look any different externally - non-user docs are simply not there any more.

> Is there a source .svg or similar for the new png? Be good to have the
> most editable form in bzr.

It came from http://bazaar-vcs.org/LogoOptions. The svg is attached there I believe.

> There is a /lot/ of duplication between the conf.py files. I don't think
> that that is good, we should only have unique data in each configuration
> file.

I agree. This can come later though, probably post 2.0.

> Lastly, why are we keeping the old doc rules at all? The docs seem to be
> changing so much that those rules would produce garbage...

I've cleaned the Makefile up. It's *much* nicer now. I'll resubmit.

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-07 03:58:08 +0000
@@ -8,6 +8,7 @@
8bzr.18bzr.1
9./doc/*.html9./doc/*.html
10./doc/_build/10./doc/_build/
11./doc/*/_build/
11./tutorial.html12./tutorial.html
12BRANCH-INFO13BRANCH-INFO
13# setup.py working directory14# setup.py working directory
@@ -53,6 +54,7 @@
53bzrlib/_rio_pyx.c54bzrlib/_rio_pyx.c
54bzrlib/_walkdirs_win32.c55bzrlib/_walkdirs_win32.c
55doc/en/release-notes/NEWS.txt56doc/en/release-notes/NEWS.txt
57doc/en/release-notes/bzr*
56doc/en/developer-guide/HACKING.txt58doc/en/developer-guide/HACKING.txt
57doc/en/user-reference/bzr_man.txt59doc/en/user-reference/bzr_man.txt
58# built extension modules60# built extension modules
5961
=== modified file 'Makefile'
--- Makefile 2009-08-03 20:38:39 +0000
+++ Makefile 2009-09-07 07:52:38 +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,16 @@
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
233 cd doc/developers && make html
234 cd doc/es && make html
235 cd doc/ru && make html
226236
227237
228### Windows Support ###238### Windows Support ###
229239
=== modified file 'NEWS'
--- NEWS 2009-09-04 02:58:22 +0000
+++ NEWS 2009-09-07 07:52:38 +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,21 @@
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
57* The developer and foreign language documents are now separated
58 out so that searching in the HTML and CHM files produces more
59 useful results. (Ian Clatworthy)
60
56* The main table of contents now provides links to the new Migration Docs61* The main table of contents now provides links to the new Migration Docs
57 and Plugins Guide. (Ian Clatworthy)62 and Plugins Guide. (Ian Clatworthy)
5863
64
59bzr 2.0rc165bzr 2.0rc1
60##########66##########
6167
62
63:Codename: no worries68:Codename: no worries
64:2.0rc1: 2009-08-2669:2.0rc1: 2009-08-26
6570
@@ -524,8 +529,8 @@
524 ``countTestsCases``. (Robert Collins)529 ``countTestsCases``. (Robert Collins)
525530
526531
527bzr 1.17 "So late it's brunch" 2009-07-20532bzr 1.17
528#########################################533########
529:Codename: so-late-its-brunch534:Codename: so-late-its-brunch
530:1.17rc1: 2009-07-13535:1.17rc1: 2009-07-13
531:1.17: 2009-07-20536:1.17: 2009-07-20
@@ -774,8 +779,10 @@
774 this class and the UI. (Martin Pool)779 this class and the UI. (Martin Pool)
775780
776781
777bzr 1.16.1 2009-06-26782bzr 1.16.1
778#####################783##########
784
785:Released: 2009-06-26
779786
780End user testing of the 2a format revealed two serious bugs. The first,787End user testing of the 2a format revealed two serious bugs. The first,
781#365615, caused bzr to raise AbsentContentFactory errors when autopacking.788#365615, caused bzr to raise AbsentContentFactory errors when autopacking.
@@ -830,8 +837,8 @@
830 (Robert Collins, #376748)837 (Robert Collins, #376748)
831838
832839
833bzr 1.16 "It's yesterday in California" 2009-06-18840bzr 1.16
834##################################################841########
835:Codename: yesterday-in-california842:Codename: yesterday-in-california
836:1.16rc1: 2009-06-11843:1.16rc1: 2009-06-11
837:1.16: 2009-06-18844:1.16: 2009-06-18
@@ -2305,8 +2312,11 @@
2305 (Vincent Ladeuil)2312 (Vincent Ladeuil)
23062313
23072314
2308bzr 1.11 "Eyes up!" 2009-01-192315bzr 1.11
2309##############################2316########
2317
2318:Codename: "Eyes up!"
2319:Released: 2009-01-19
23102320
2311This first monthly release of Bazaar for 2009 improves Bazaar's operation2321This first monthly release of Bazaar for 2009 improves Bazaar's operation
2312in Windows, Mac OS X, and other situations where file names are matched2322in Windows, Mac OS X, and other situations where file names are matched
@@ -2332,8 +2342,11 @@
23322342
23332343
23342344
2335bzr 1.11rc1 "Eyes up!" 2009-01-092345bzr 1.11rc1
2336#################################2346###########
2347
2348:Codename: "Eyes up!"
2349:Released: 2009-01-09
23372350
2338Changes2351Changes
2339*******2352*******
@@ -2569,8 +2582,10 @@
25692582
25702583
25712584
2572bzr 1.10 2008-12-052585bzr 1.10
2573###################2586########
2587
2588:Released: 2008-12-05
25742589
2575Bazaar 1.10 has several performance improvements for copying revisions2590Bazaar 1.10 has several performance improvements for copying revisions
2576(especially for small updates to large projects). There has also been a2591(especially for small updates to large projects). There has also been a
@@ -2595,8 +2610,10 @@
2595 topologically. (John Arbash Meinel, #304841)2610 topologically. (John Arbash Meinel, #304841)
25962611
25972612
2598bzr 1.10rc1 2008-11-282613bzr 1.10rc1
2599######################2614###########
2615
2616:Released: 2008-11-28
26002617
2601This release of Bazaar focuses on performance improvements when pushing2618This release of Bazaar focuses on performance improvements when pushing
2602and pulling revisions, both locally and to remote networks. The popular2619and pulling revisions, both locally and to remote networks. The popular
@@ -2716,8 +2733,10 @@
2716* Doctests now only report the first failure. (Martin Pool)2733* Doctests now only report the first failure. (Martin Pool)
27172734
27182735
2719bzr 1.9 2008-11-072736bzr 1.9
2720##################2737#######
2738
2739:Released: 2008-11-07
27212740
2722This release of Bazaar adds a new repository format, ``1.9``, with smaller2741This release of Bazaar adds a new repository format, ``1.9``, with smaller
2723and more efficient index files. This format can be specified when2742and more efficient index files. This format can be specified when
@@ -2739,8 +2758,10 @@
2739 (John Arbash Meinel, #293746)2758 (John Arbash Meinel, #293746)
27402759
27412760
2742bzr 1.9rc1 2008-10-312761bzr 1.9rc1
2743#####################2762##########
2763
2764:Released: 2008-10-31
27442765
2745New Features2766New Features
2746************2767************
@@ -2857,8 +2878,10 @@
2857 configuration of authetication credentials.2878 configuration of authetication credentials.
28582879
28592880
2860bzr 1.8 2008-10-162881bzr 1.8
2861##################2882#######
2883
2884:Released: 2008-10-16
28622885
2863Bazaar 1.8 includes several fixes that improve working tree performance,2886Bazaar 1.8 includes several fixes that improve working tree performance,
2864display of revision logs, and merges. The bzr testsuite now passes on OS2887display of revision logs, and merges. The bzr testsuite now passes on OS
@@ -2879,8 +2902,10 @@
2879 that platform. (Alexander Belchenko, Martin Pool, #277481)2902 that platform. (Alexander Belchenko, Martin Pool, #277481)
28802903
28812904
2882bzr 1.8rc1 2008-10-072905bzr 1.8rc1
2883#####################2906##########
2907
2908:Released: 2008-10-07
28842909
2885Changes2910Changes
2886*******2911*******
@@ -3078,14 +3103,18 @@
3078 (Vincent Ladeuil)3103 (Vincent Ladeuil)
30793104
30803105
3081bzr 1.7.1 2008-10-013106bzr 1.7.1
3082####################3107#########
3108
3109:Released: 2008-10-01
30833110
3084No changes from 1.7.1rc1.3111No changes from 1.7.1rc1.
30853112
30863113
3087bzr 1.7.1rc1 2008-09-243114bzr 1.7.1rc1
3088#######################3115############
3116
3117:Released: 2008-09-24
30893118
3090This release just includes an update to how the merge algorithm handles3119This release just includes an update to how the merge algorithm handles
3091file paths when we encounter complex history.3120file paths when we encounter complex history.
@@ -3100,8 +3129,10 @@
3100 (John Arbash Meinel)3129 (John Arbash Meinel)
31013130
31023131
3103bzr 1.7 2008-09-233132bzr 1.7
3104##################3133#######
3134
3135:Released: 2008-09-23
31053136
3106This release includes many bug fixes and a few performance and feature3137This release includes many bug fixes and a few performance and feature
3107improvements. ``bzr rm`` will now scan for missing files and remove them,3138improvements. ``bzr rm`` will now scan for missing files and remove them,
@@ -3118,8 +3149,10 @@
3118 packaging qbzr. (Mark Hammond)3149 packaging qbzr. (Mark Hammond)
31193150
31203151
3121bzr 1.7rc2 2008-09-173152bzr 1.7rc2
3122#####################3153##########
3154
3155:Released: 2008-09-17
31233156
3124A few bug fixes from 1.7rc1. The biggest change is a new3157A few bug fixes from 1.7rc1. The biggest change is a new
3125``RemoteBranch.get_stacked_on_url`` rpc. This allows clients that are3158``RemoteBranch.get_stacked_on_url`` rpc. This allows clients that are
@@ -3143,8 +3176,10 @@
3143 (Andrew Bennetts)3176 (Andrew Bennetts)
31443177
31453178
3146bzr 1.7rc1 2008-09-093179bzr 1.7rc1
3147#####################3180##########
3181
3182:Released: 2008-09-09
31483183
3149This release candidate for bzr 1.7 has several bug fixes and a few3184This release candidate for bzr 1.7 has several bug fixes and a few
3150performance and feature improvements. ``bzr rm`` will now scan for3185performance and feature improvements. ``bzr rm`` will now scan for
@@ -3341,16 +3376,20 @@
3341 clients now use this mechanism. (Neil Martinsen-Burrell)3376 clients now use this mechanism. (Neil Martinsen-Burrell)
33423377
33433378
3344bzr 1.6.1 2008-09-053379bzr 1.6.1
3345####################3380#########
3381
3382:Released: 2008-09-05
33463383
3347A couple regressions were found in the 1.6 release. There was a3384A couple regressions were found in the 1.6 release. There was a
3348performance issue when using ``bzr+ssh`` to branch large repositories,3385performance issue when using ``bzr+ssh`` to branch large repositories,
3349and some problems with stacking and ``rich-root`` capable repositories.3386and some problems with stacking and ``rich-root`` capable repositories.
33503387
33513388
3352bzr 1.6.1rc2 2008-09-033389bzr 1.6.1rc2
3353#######################3390############
3391
3392:Released: 2008-09-03
33543393
3355Bug Fixes3394Bug Fixes
3356*********3395*********
@@ -3361,8 +3400,10 @@
3361 (John Arbash Meinel, #264321)3400 (John Arbash Meinel, #264321)
33623401
33633402
3364bzr 1.6.1rc1 2008-08-293403bzr 1.6.1rc1
3365#######################3404############
3405
3406:Released: 2008-08-29
33663407
3367This release fixes a few regressions found in the 1.6 client. Fetching3408This 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 it3409changes was using an O(N^2) buffering algorithm, so for large projects it
@@ -3402,8 +3443,10 @@
3402 (John Arbash Meinel, #262333)3443 (John Arbash Meinel, #262333)
34033444
34043445
3405bzr 1.6 2008-08-253446bzr 1.6
3406##################3447#######
3448
3449:Released: 2008-08-25
34073450
3408Finally, the long awaited bzr 1.6 has been released. This release includes3451Finally, the long awaited bzr 1.6 has been released. This release includes
3409new features like Stacked Branches, improved weave merge, and an updated3452new features like Stacked Branches, improved weave merge, and an updated
@@ -3416,8 +3459,10 @@
3416TortoiseBzr in the standalone Windows installer.3459TortoiseBzr in the standalone Windows installer.
34173460
34183461
3419bzr 1.6rc5 2008-08-193462bzr 1.6rc5
3420#####################3463##########
3464
3465:Released: 2008-08-19
34213466
3422Bug Fixes3467Bug Fixes
3423*********3468*********
@@ -3429,8 +3474,10 @@
3429 (This change was reverted when merged to bzr.dev)3474 (This change was reverted when merged to bzr.dev)
34303475
34313476
3432bzr 1.6rc4 2008-08-183477bzr 1.6rc4
3433#####################3478##########
3479
3480:Released: 2008-08-18
34343481
3435Bug Fixes3482Bug Fixes
3436*********3483*********
@@ -3440,8 +3487,10 @@
3440 rather than preserving deltas. (John Arbash Meinel, #256757)3487 rather than preserving deltas. (John Arbash Meinel, #256757)
34413488
34423489
3443bzr 1.6rc3 2008-08-143490bzr 1.6rc3
3444#####################3491##########
3492
3493:Released: 2008-08-14
34453494
3446Changes3495Changes
3447*******3496*******
@@ -3474,8 +3523,10 @@
3474 development which is substantially faster. (Robert Collins)3523 development which is substantially faster. (Robert Collins)
34753524
34763525
3477bzr 1.6rc2 2008-08-133526bzr 1.6rc2
3478#####################3527##########
3528
3529:Released: 2008-08-13
34793530
3480This release candidate has a few minor bug fixes, and some regression3531This release candidate has a few minor bug fixes, and some regression
3481fixes for Windows.3532fixes for Windows.
@@ -3513,8 +3564,10 @@
3513 will get the same results. (John Arbash Meinel, #232188)3564 will get the same results. (John Arbash Meinel, #232188)
35143565
35153566
3516bzr 1.6rc1 2008-08-063567bzr 1.6rc1
3517#####################3568##########
3569
3570:Released: 2008-08-06
35183571
3519This release candidate for bzr 1.6 solidifies the new branch stacking3572This release candidate for bzr 1.6 solidifies the new branch stacking
3520feature. Bazaar now recommends that users upgrade all knit repositories,3573feature. Bazaar now recommends that users upgrade all knit repositories,
@@ -3650,8 +3703,10 @@
3650 (Ian Clatworthy)3703 (Ian Clatworthy)
36513704
36523705
3653bzr 1.6beta3 2008-07-173706bzr 1.6beta3
3654#######################3707############
3708
3709:Released: 2008-07-17
36553710
3656This release adds a new 'stacked branches' feature allowing branches to3711This release adds a new 'stacked branches' feature allowing branches to
3657share storage without being in the same repository or on the same machine.3712share storage without being in the same repository or on the same machine.
@@ -3823,8 +3878,10 @@
3823 (Robert Collins)3878 (Robert Collins)
38243879
38253880
3826bzr 1.6beta2 2008-06-103881bzr 1.6beta2
3827#######################3882############
3883
3884:Released: 2008-06-10
38283885
3829This release contains further progress towards our 1.6 goals of shallow3886This release contains further progress towards our 1.6 goals of shallow
3830repositories, and contains a fix for some user-affecting bugs in the3887repositories, and contains a fix for some user-affecting bugs in the
@@ -3907,9 +3964,10 @@
3907* Knit record serialisation is now stricter on what it will accept, to3964* Knit record serialisation is now stricter on what it will accept, to
3908 guard against potential internal bugs, or broken input. (Robert Collins)3965 guard against potential internal bugs, or broken input. (Robert Collins)
39093966
3910bzr 1.6beta1 2008-06-023967bzr 1.6beta1
3911#######################3968############
39123969
3970:Released: 2008-06-02
39133971
3914Commands that work on the revision history such as push, pull, missing,3972Commands that work on the revision history such as push, pull, missing,
3915uncommit and log are now substantially faster. This release adds a3973uncommit and log are now substantially faster. This release adds a
@@ -4127,8 +4185,10 @@
4127 (Martin Pool)4185 (Martin Pool)
41284186
41294187
4130bzr 1.5 2008-05-164188bzr 1.5
4131##################4189#######
4190
4191:Released: 2008-05-16
41324192
4133This release of Bazaar includes several updates to the documentation, and fixes4193This release of Bazaar includes several updates to the documentation, and fixes
4134to prepare for making rich root support the default format. Many bugs have been4194to prepare for making rich root support the default format. Many bugs have been
@@ -4149,8 +4209,10 @@
4149 (Ian Clatworthy)4209 (Ian Clatworthy)
41504210
41514211
4152bzr 1.5rc1 2008-05-094212bzr 1.5rc1
4153#####################4213##########
4214
4215:Released: 2008-05-09
41544216
4155Changes4217Changes
4156*******4218*******
@@ -4320,8 +4382,10 @@
4320 (Martin Pool)4382 (Martin Pool)
43214383
43224384
4323bzr 1.4 2008-04-284385bzr 1.4
4324##################4386#######
4387
4388:Released: 2008-04-28
43254389
4326This release of Bazaar includes handy improvements to the speed of log and4390This release of Bazaar includes handy improvements to the speed of log and
4327status, new options for several commands, improved documentation, and better4391status, new options for several commands, improved documentation, and better
@@ -4340,8 +4404,10 @@
4340 (John Arbash Meinel, Andrew Bennetts, #214894)4404 (John Arbash Meinel, Andrew Bennetts, #214894)
43414405
43424406
4343bzr 1.4rc2 2008-04-214407bzr 1.4rc2
4344#####################4408##########
4409
4410:Released: 2008-04-21
43454411
4346Bug Fixes4412Bug Fixes
4347*********4413*********
@@ -4364,8 +4430,10 @@
4364 (Robert Collins, John Arbash Meinel)4430 (Robert Collins, John Arbash Meinel)
43654431
43664432
4367bzr 1.4rc1 2008-04-114433bzr 1.4rc1
4368#####################4434##########
4435
4436:Released: 2008-04-11
43694437
4370Changes4438Changes
4371*******4439*******
@@ -4652,14 +4720,18 @@
4652 ``Graph.get_parent_map`` returns a dict of key:parents. (Robert Collins)4720 ``Graph.get_parent_map`` returns a dict of key:parents. (Robert Collins)
46534721
46544722
4655bzr 1.3.1 2008-04-094723bzr 1.3.1
4656####################4724#########
4725
4726:Released: 2008-04-09
46574727
4658No changes from 1.3.1rc1.4728No changes from 1.3.1rc1.
46594729
46604730
4661bzr 1.3.1rc1 2008-04-044731bzr 1.3.1rc1
4662#######################4732############
4733
4734:Released: 2008-04-04
46634735
4664Bug Fixes4736Bug Fixes
4665*********4737*********
@@ -4670,8 +4742,10 @@
4670 (#208418, Andrew Bennetts, Martin Pool, Robert Collins)4742 (#208418, Andrew Bennetts, Martin Pool, Robert Collins)
46714743
46724744
4673bzr 1.3 2008-03-204745bzr 1.3
4674##################4746#######
4747
4748:Released: 2008-03-20
46754749
4676Bazaar has become part of the GNU project <http://www.gnu.org>4750Bazaar has become part of the GNU project <http://www.gnu.org>
46774751
@@ -4687,8 +4761,10 @@
4687 (#202778, Martin Pool)4761 (#202778, Martin Pool)
46884762
46894763
4690bzr 1.3rc1 2008-03-164764bzr 1.3rc1
4691#####################4765##########
4766
4767:Released: 2008-03-16
46924768
4693Notes When Upgrading4769Notes When Upgrading
4694********************4770********************
@@ -4874,8 +4950,10 @@
4874 format. (Robert Collins)4950 format. (Robert Collins)
48754951
48764952
4877bzr 1.2 2008-02-154953bzr 1.2
4878##################4954#######
4955
4956:Released: 2008-02-15
48794957
4880Bug Fixes4958Bug Fixes
4881*********4959*********
@@ -4883,8 +4961,10 @@
4883* Fix failing test in Launchpad plugin. (Martin Pool)4961* Fix failing test in Launchpad plugin. (Martin Pool)
48844962
48854963
4886bzr 1.2rc1 2008-02-134964bzr 1.2rc1
4887#####################4965##########
4966
4967:Released: 2008-02-13
48884968
4889Notes When Upgrading4969Notes When Upgrading
4890********************4970********************
@@ -5085,13 +5165,17 @@
5085 revision names etc. (Robert Collins)5165 revision names etc. (Robert Collins)
50865166
50875167
5088bzr 1.1 2008-01-155168bzr 1.1
5089##################5169#######
5170
5171:Released: 2008-01-15
50905172
5091(no changes from 1.1rc1)5173(no changes from 1.1rc1)
50925174
5093bzr 1.1rc1 2008-01-055175bzr 1.1rc1
5094#####################5176##########
5177
5178:Released: 2008-01-05
50955179
5096Changes5180Changes
5097*******5181*******
@@ -5301,8 +5385,10 @@
5301 replaced by the new helper methods added in this release. (Robert Collins)5385 replaced by the new helper methods added in this release. (Robert Collins)
53025386
53035387
5304bzr 1.0 2007-12-145388bzr 1.0
5305##################5389#######
5390
5391:Released: 2007-12-14
53065392
5307Documentation5393Documentation
5308*************5394*************
@@ -5319,8 +5405,10 @@
5319 (Ian Clatworthy)5405 (Ian Clatworthy)
53205406
53215407
5322bzr 1.0rc3 2007-12-115408bzr 1.0rc3
5323#####################5409##########
5410
5411:Released: 2007-12-11
53245412
5325Changes5413Changes
5326*******5414*******
@@ -5361,8 +5449,10 @@
5361 (Vincent Ladeuil)5449 (Vincent Ladeuil)
53625450
53635451
5364bzr 1.0rc2 2007-12-075452bzr 1.0rc2
5365#####################5453##########
5454
5455:Released: 2007-12-07
53665456
5367Improvements5457Improvements
5368************5458************
@@ -5436,8 +5526,10 @@
5436 ``started`` methods. (Matt Nordhoff)5526 ``started`` methods. (Matt Nordhoff)
54375527
54385528
5439bzr 1.0rc1 2007-11-305529bzr 1.0rc1
5440#####################5530##########
5531
5532:Released: 2007-11-30
54415533
5442Notes When Upgrading5534Notes When Upgrading
5443********************5535********************
@@ -5713,8 +5805,10 @@
5713* InventoryEntry.diff is now deprecated. Please use diff.DiffTree instead.5805* InventoryEntry.diff is now deprecated. Please use diff.DiffTree instead.
57145806
57155807
5716bzr 0.92 2007-11-055808bzr 0.92
5717###################5809########
5810
5811:Released: 2007-11-05
57185812
5719Changes5813Changes
5720*******5814*******
@@ -5722,8 +5816,10 @@
5722 * New uninstaller on Win32. (Alexander Belchenko)5816 * New uninstaller on Win32. (Alexander Belchenko)
57235817
57245818
5725bzr 0.92rc1 2007-10-295819bzr 0.92rc1
5726######################5820###########
5821
5822:Released: 2007-10-29
57275823
5728Changes5824Changes
5729*******5825*******
@@ -6042,8 +6138,10 @@
6042 raises a Python warning. (Martin Pool)6138 raises a Python warning. (Martin Pool)
60436139
60446140
6045bzr 0.91 2007-09-266141bzr 0.91
6046###################6142########
6143
6144:Released: 2007-09-26
60476145
6048Bug Fixes6146Bug Fixes
6049*********6147*********
@@ -6064,15 +6162,19 @@
6064 (Andrew Bennetts)6162 (Andrew Bennetts)
60656163
60666164
6067bzr 0.91rc2 2007-09-116165bzr 0.91rc2
6068######################6166###########
6167
6168:Released: 2007-09-11
60696169
6070* Replaced incorrect tarball for previous release; a debug statement was left6170* Replaced incorrect tarball for previous release; a debug statement was left
6071 in bzrlib/remote.py.6171 in bzrlib/remote.py.
60726172
60736173
6074bzr 0.91rc1 2007-09-116174bzr 0.91rc1
6075######################6175###########
6176
6177:Released: 2007-09-11
60766178
6077Changes6179Changes
6078*******6180*******
@@ -6399,8 +6501,10 @@
6399 [] to revert all files is deprecated. (Aaron Bentley)6501 [] to revert all files is deprecated. (Aaron Bentley)
64006502
64016503
6402bzr 0.90 2007-08-286504bzr 0.90
6403###################6505########
6506
6507:Released: 2007-08-28
64046508
6405Improvements6509Improvements
6406************6510************
@@ -6423,8 +6527,10 @@
6423 and call ``create_repository`` on that. (Martin Pool)6527 and call ``create_repository`` on that. (Martin Pool)
64246528
64256529
6426bzr 0.90rc1 2007-08-146530bzr 0.90rc1
6427######################6531###########
6532
6533:Released: 2007-08-14
64286534
6429Bugfixes6535Bugfixes
6430********6536********
@@ -6696,8 +6802,10 @@
6696 parameter. Varargs-style parameters are deprecated. (Aaron Bentley)6802 parameter. Varargs-style parameters are deprecated. (Aaron Bentley)
66976803
66986804
6699bzr 0.18 2007-07-176805bzr 0.18
6700####################6806########
6807
6808:Released: 2007-07-17
67016809
6702Bugfixes6810Bugfixes
6703********6811********
@@ -6705,8 +6813,10 @@
6705* Fix 'bzr add' crash under Win32 (Kuno Meyer)6813* Fix 'bzr add' crash under Win32 (Kuno Meyer)
67066814
67076815
6708bzr 0.18rc1 2007-07-106816bzr 0.18rc1
6709#######################6817###########
6818
6819:Released: 2007-07-10
67106820
6711Bugfixes6821Bugfixes
6712********6822********
@@ -6957,8 +7067,10 @@
6957 (Vincent Ladeuil, #110448)7067 (Vincent Ladeuil, #110448)
69587068
69597069
6960bzr 0.17 2007-06-187070bzr 0.17
6961####################7071########
7072
7073:Released: 2007-06-18
69627074
6963Bugfixes7075Bugfixes
6964********7076********
@@ -6970,8 +7082,10 @@
6970 (Aaron Bentley, Ian Clatworthy, #120930)7082 (Aaron Bentley, Ian Clatworthy, #120930)
69717083
69727084
6973bzr 0.17rc1 2007-06-127085bzr 0.17rc1
6974#######################7086###########
7087
7088:Released: 2007-06-12
69757089
6976Notes When Upgrading7090Notes When Upgrading
6977********************7091********************
@@ -7072,8 +7186,10 @@
7072 your repository. (Previously Branch6 only supported revisions in your7186 your repository. (Previously Branch6 only supported revisions in your
7073 mainline). (John Arbash Meinel, #115343)7187 mainline). (John Arbash Meinel, #115343)
70747188
7075bzr 0.16 2007-05-077189bzr 0.16
7076####################7190########
7191
7192:Released: 2007-05-07
70777193
7078Bugfixes7194Bugfixes
7079********7195********
@@ -7103,8 +7219,10 @@
7103 diff`` and ``bzr status`` significantly improving the speed of7219 diff`` and ``bzr status`` significantly improving the speed of
7104 both. (John Arbash Meinel)7220 both. (John Arbash Meinel)
71057221
7106bzr 0.16rc2 2007-04-307222bzr 0.16rc2
7107#######################7223###########
7224
7225:Released: 2007-04-30
71087226
7109Bugfixes7227Bugfixes
7110********7228********
@@ -7127,8 +7245,10 @@
7127* ``WorkingTree4._iter_changes`` should not descend into unversioned7245* ``WorkingTree4._iter_changes`` should not descend into unversioned
7128 directories. (John Arbash Meinel, #110399)7246 directories. (John Arbash Meinel, #110399)
71297247
7130bzr 0.16rc1 2007-04-267248bzr 0.16rc1
7131#######################7249###########
7250
7251:Released: 2007-04-26
71327252
7133Notes When Upgrading7253Notes When Upgrading
7134********************7254********************
@@ -7435,8 +7555,10 @@
7435 implementation of new auth schemes for both http and proxy.7555 implementation of new auth schemes for both http and proxy.
7436 (Vincent Ladeuil)7556 (Vincent Ladeuil)
74377557
7438bzr 0.15 2007-04-017558bzr 0.15
7439###################7559########
7560
7561:Released: 2007-04-01
74407562
7441Bugfixes7563Bugfixes
7442********7564********
@@ -7448,8 +7570,10 @@
7448 checking out a branch that contains an old-format working tree.7570 checking out a branch that contains an old-format working tree.
7449 (Martin Pool)7571 (Martin Pool)
74507572
7451bzr 0.15rc3 2007-03-267573bzr 0.15rc3
7452#######################7574###########
7575
7576:Released: 2007-03-26
74537577
7454Changes7578Changes
7455*******7579*******
@@ -7524,8 +7648,10 @@
7524* Correctly handles mutiple permanent http redirections.7648* Correctly handles mutiple permanent http redirections.
7525 (vila, #88780)7649 (vila, #88780)
75267650
7527bzr 0.15rc2 2007-03-147651bzr 0.15rc2
7528#######################7652###########
7653
7654:Released: 2007-03-14
75297655
7530Notes When Upgrading7656Notes When Upgrading
7531********************7657********************
@@ -7578,8 +7704,10 @@
7578 (Wouter van Heyst, #53483)7704 (Wouter van Heyst, #53483)
75797705
75807706
7581bzr 0.15rc1 2007-03-077707bzr 0.15rc1
7582#######################7708###########
7709
7710:Released: 2007-03-07
75837711
7584Surprises7712Surprises
7585*********7713*********
@@ -7809,8 +7937,10 @@
7809 before the rest of the suite. (Martin Pool)7937 before the rest of the suite. (Martin Pool)
78107938
78117939
7812bzr 0.14 2007-01-237940bzr 0.14
7813####################7941########
7942
7943:Released: 2007-01-23
78147944
7815Improvements7945Improvements
7816************7946************
@@ -7829,8 +7959,10 @@
7829 it is in is below a repository. (James Westby, #77306)7959 it is in is below a repository. (James Westby, #77306)
78307960
78317961
7832bzr 0.14rc1 2007-01-167962bzr 0.14rc1
7833#######################7963###########
7964
7965:Released: 2007-01-16
78347966
7835Improvements7967Improvements
7836************7968************
@@ -7964,14 +8096,18 @@
7964 (Alexander Belchenko, #68124)8096 (Alexander Belchenko, #68124)
79658097
79668098
7967bzr 0.13 2006-12-058099bzr 0.13
7968####################8100########
8101
8102:Released: 2006-12-05
79698103
7970No changes from 0.13rc8104No changes from 0.13rc
79718105
79728106
7973bzr 0.13rc1 2006-11-278107bzr 0.13rc1
7974#######################8108###########
8109
8110:Released: 2006-11-27
79758111
7976Improvements8112Improvements
7977************8113************
@@ -8096,8 +8232,10 @@
8096* TestingHTTPRequestHandler really handles the Range header8232* TestingHTTPRequestHandler really handles the Range header
8097 (previously it was ignoring it and returning the whole file,).8233 (previously it was ignoring it and returning the whole file,).
80988234
8099bzr 0.12 2006-10-308235bzr 0.12
8100####################8236########
8237
8238:Released: 2006-10-30
81018239
8102Internals8240Internals
8103*********8241*********
@@ -8106,8 +8244,10 @@
8106 and remove benchmarks that take longer than 10min to run.8244 and remove benchmarks that take longer than 10min to run.
8107 (John Arbash Meinel)8245 (John Arbash Meinel)
81088246
8109bzr 0.12rc1 2006-10-238247bzr 0.12rc1
8110#######################8248###########
8249
8250:Released: 2006-10-23
81118251
8112Improvements8252Improvements
8113************8253************
@@ -8228,13 +8368,17 @@
8228 option to set the BzrDir, Repository and Branch formats of the8368 option to set the BzrDir, Repository and Branch formats of the
8229 created objects. (Robert Collins, John Arbash Meinel)8369 created objects. (Robert Collins, John Arbash Meinel)
82308370
8231bzr 0.11 2006-10-028371bzr 0.11
8232####################8372########
8373
8374:Released: 2006-10-02
82338375
8234* Smart server transport test failures on windows fixed. (Lukáš Lalinský).8376* Smart server transport test failures on windows fixed. (Lukáš Lalinský).
82358377
8236bzr 0.11rc2 2006-09-278378bzr 0.11rc2
8237#######################8379###########
8380
8381:Released: 2006-09-27
82388382
8239Bug Fixes8383Bug Fixes
8240*********8384*********
@@ -8244,8 +8388,10 @@
8244* Commit performance regression fixed. (Aaron Bentley, Robert Collins, John8388* Commit performance regression fixed. (Aaron Bentley, Robert Collins, John
8245 Arbash Meinel).8389 Arbash Meinel).
82468390
8247bzr 0.11rc1 2006-09-258391bzr 0.11rc1
8248#######################8392###########
8393
8394:Released: 2006-09-25
82498395
8250Improvements8396Improvements
8251************8397************
@@ -8438,8 +8584,10 @@
8438 allow upgrades to a richer interface than the VFS one provided by8584 allow upgrades to a richer interface than the VFS one provided by
8439 Transport. (Andrew Bennetts, Martin Pool)8585 Transport. (Andrew Bennetts, Martin Pool)
84408586
8441bzr 0.10 2006-08-298587bzr 0.10
8442####################8588########
8589
8590:Released: 2006-08-29
84438591
8444Improvements8592Improvements
8445************8593************
@@ -8516,8 +8664,10 @@
8516 need to be installed. This should help make the life of packagers8664 need to be installed. This should help make the life of packagers
8517 easier. (John Arbash Meinel)8665 easier. (John Arbash Meinel)
85188666
8519bzr 0.9.0 2006-08-118667bzr 0.9.0
8520#####################8668#########
8669
8670:Released: 2006-08-11
85218671
8522Surprises8672Surprises
8523*********8673*********
@@ -8784,16 +8934,20 @@
87848934
8785* "RevisionTree" is now in bzrlib/revisiontree.py. (Robert Collins)8935* "RevisionTree" is now in bzrlib/revisiontree.py. (Robert Collins)
87868936
8787bzr 0.8.2 2006-05-178937bzr 0.8.2
8788#####################8938#########
8939
8940:Released: 2006-05-17
87898941
8790Bug Fixes8942Bug Fixes
8791*********8943*********
87928944
8793* setup.py failed to install launchpad plugin. (Martin Pool)8945* setup.py failed to install launchpad plugin. (Martin Pool)
87948946
8795bzr 0.8.1 2006-05-168947bzr 0.8.1
8796#####################8948#########
8949
8950:Released: 2006-05-16
87978951
8798Bug Fixes8952Bug Fixes
8799*********8953*********
@@ -8846,8 +9000,10 @@
8846* Fix test case for bzr info in upgrading a standalone branch to metadir,9000* Fix test case for bzr info in upgrading a standalone branch to metadir,
8847 uses bzrlib api now. (Olaf Conradi)9001 uses bzrlib api now. (Olaf Conradi)
88489002
8849bzr 0.8 2006-05-089003bzr 0.8
8850###################9004#######
9005
9006:Released: 2006-05-08
88519007
8852Notes When Upgrading9008Notes When Upgrading
8853********************9009********************
@@ -9108,8 +9264,10 @@
9108* ``run_bzr`` and ``run_bzr_captured`` now accept a 'stdin="foo"'9264* ``run_bzr`` and ``run_bzr_captured`` now accept a 'stdin="foo"'
9109 parameter which will provide String("foo") to the command as its stdin.9265 parameter which will provide String("foo") to the command as its stdin.
91109266
9111bzr 0.7 2006-01-099267bzr 0.7
9112##################9268#######
9269
9270:Released: 2006-01-09
91139271
9114Changes9272Changes
9115*******9273*******
@@ -9404,8 +9562,10 @@
9404* ``bzrlib.osutils.safe_unicode`` now exists to provide parameter coercion9562* ``bzrlib.osutils.safe_unicode`` now exists to provide parameter coercion
9405 for functions that need unicode strings. (Robert Collins)9563 for functions that need unicode strings. (Robert Collins)
94069564
9407bzr 0.6 2005-10-289565bzr 0.6
9408##################9566#######
9567
9568:Released: 2005-10-28
94099569
9410Improvements9570Improvements
9411************9571************
@@ -9620,8 +9780,10 @@
9620 [-1] in the revision-history. (Andres Salomon)9780 [-1] in the revision-history. (Andres Salomon)
96219781
96229782
9623bzr 0.1.1 2005-10-129783bzr 0.1.1
9624####################9784#########
9785
9786:Released: 2005-10-12
96259787
9626Bug Fixes9788Bug Fixes
9627*********9789*********
@@ -9638,8 +9800,10 @@
9638* Avoid some unnecessary http operations in branch and pull.9800* Avoid some unnecessary http operations in branch and pull.
96399801
96409802
9641bzr 0.1 2005-10-119803bzr 0.1
9642##################9804#######
9805
9806:Released: 2005-10-11
96439807
9644Notes9808Notes
9645*****9809*****
@@ -9768,8 +9932,10 @@
9768 of tests to run, e.g. ``bzr selftest test_weave``9932 of tests to run, e.g. ``bzr selftest test_weave``
97699933
97709934
9771bzr 0.0.9 2005-09-239935bzr 0.0.9
9772####################9936#########
9937
9938:Released: 2005-09-23
97739939
9774Bug Fixes9940Bug Fixes
9775*********9941*********
@@ -9810,8 +9976,11 @@
9810 another (used by pull, merged, etc.)9976 another (used by pull, merged, etc.)
98119977
98129978
9813bzr 0.0.8 2005-09-209979bzr 0.0.8
9814####################9980#########
9981
9982:Released: 2005-09-20
9983
98159984
9816Improvements9985Improvements
9817************9986************
@@ -9861,8 +10030,10 @@
9861* Quieten warnings about locking; patch from Matt Lavin.10030* Quieten warnings about locking; patch from Matt Lavin.
986210031
986310032
9864bzr-0.0.7 2005-09-0210033bzr-0.0.7
9865####################10034#########
10035
10036:Released: 2005-09-02
986610037
9867New Features10038New Features
9868************10039************
@@ -9916,8 +10087,10 @@
991610087
991710088
991810089
9919bzr-0.0.6 2005-08-1810090bzr-0.0.6
9920####################10091#########
10092
10093:Released: 2005-08-18
992110094
9922New Features10095New Features
9923************10096************
@@ -10002,8 +10175,10 @@
10002* Fix bugs in committing only selected files or within a subdirectory.10175* Fix bugs in committing only selected files or within a subdirectory.
1000310176
1000410177
10005bzr-0.0.5 2005-06-1510178bzr-0.0.5
10006#####################10179#########
10180
10181:Released: 2005-06-15
1000710182
10008Changes10183Changes
10009*******10184*******
@@ -10144,8 +10319,10 @@
10144 2.4 is now only recommended.10319 2.4 is now only recommended.
1014510320
1014610321
10147bzr-0.0.4 2005-04-2210322bzr-0.0.4
10148#####################10323#########
10324
10325:Released: 2005-04-22
1014910326
10150Enhancements10327Enhancements
10151************10328************
@@ -10213,8 +10390,10 @@
10213 from QuantumG.10390 from QuantumG.
1021410391
1021510392
10216bzr-0.0.3 2005-04-0610393bzr-0.0.3
10217#####################10394#########
10395
10396:Released: 2005-04-06
1021810397
10219Enhancements10398Enhancements
10220************10399************
@@ -10268,8 +10447,11 @@
10268* Win32 fixes from Steve Brown.10447* Win32 fixes from Steve Brown.
1026910448
1027010449
10271bzr-0.0.2 "black cube" 2005-03-3110450bzr-0.0.2
10272###################################10451#########
10452
10453:Codename: "black cube"
10454:Released: 2005-03-31
1027310455
10274Enhancements10456Enhancements
10275************10457************
@@ -10297,8 +10479,10 @@
10297 the root directory only.10479 the root directory only.
1029810480
1029910481
10300bzr-0.0.1 2005-03-2610482bzr-0.0.1
10301#####################10483#########
10484
10485:Released: 2005-03-26
1030210486
10303Enhancements10487Enhancements
10304************10488************
@@ -10327,8 +10511,10 @@
10327 supported).10511 supported).
1032810512
1032910513
10330bzr-0.0.0.69 2005-03-2210514bzr-0.0.0.69
10331########################10515############
10516
10517:Released: 2005-03-22
1033210518
10333Enhancements10519Enhancements
10334************10520************
1033510521
=== 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 differ10522Binary 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-07 07:44:36 +0000
@@ -18,6 +18,15 @@
18# documentation root, use os.path.abspath to make it absolute, like shown here.18# documentation root, use os.path.abspath to make it absolute, like shown here.
19#sys.path.append(os.path.abspath('.'))19#sys.path.append(os.path.abspath('.'))
2020
21# -- Bazaar-specific configuration ---------------------------------------------
22
23# NOTE: Editing this section is generally all that is required ...
24
25# We *could* get this from bzrlib but there's no certainly that the bzr on
26# the Python path is indeed the one we're building the documentation for ...
27bzr_version = (2, 0, 0, 'rc', 2)
28
29
21# -- General configuration -----------------------------------------------------30# -- General configuration -----------------------------------------------------
2231
23# Add any Sphinx extension module names here, as strings. They can be extensions32# Add any Sphinx extension module names here, as strings. They can be extensions
@@ -34,7 +43,7 @@
34#source_encoding = 'utf-8'43#source_encoding = 'utf-8'
3544
36# The master toctree document.45# The master toctree document.
37master_doc = 'contents'46master_doc = 'index'
3847
39# General information about the project.48# General information about the project.
40project = u'Bazaar'49project = u'Bazaar'
@@ -45,9 +54,9 @@
45# built documents.54# built documents.
46#55#
47# The short X.Y version.56# The short X.Y version.
48version = '1.18'57version = '.'.join(str(p) for p in bzr_version[:3])
49# The full version, including alpha/beta/rc tags.58# The full version, including alpha/beta/rc tags.
50release = '1.18dev'59release = version + ''.join(str(p) for p in bzr_version[3:])
5160
52# The language for content autogenerated by Sphinx. Refer to documentation61# The language for content autogenerated by Sphinx. Refer to documentation
53# for a list of supported languages.62# for a list of supported languages.
@@ -64,7 +73,7 @@
6473
65# List of directories, relative to source directory, that shouldn't be searched74# List of directories, relative to source directory, that shouldn't be searched
66# for source files.75# for source files.
67exclude_trees = ['_build']76exclude_trees = ['_build', 'ru', 'es', 'developers']
6877
69# The reST default role (used for this markup: `text`) to use for all documents.78# The reST default role (used for this markup: `text`) to use for all documents.
70#default_role = None79#default_role = None
@@ -123,7 +132,7 @@
123#html_title = None132#html_title = None
124133
125# A shorter title for the navigation bar. Default is the same as html_title.134# A shorter title for the navigation bar. Default is the same as html_title.
126#html_short_title = None135html_short_title = "Table of Contents (%s)" % (release,)
127136
128# The name of an image file (relative to this directory) to place at the top137# The name of an image file (relative to this directory) to place at the top
129# of the sidebar.138# of the sidebar.
@@ -152,13 +161,13 @@
152161
153# Additional templates that should be rendered to pages, maps page names to162# Additional templates that should be rendered to pages, maps page names to
154# template names.163# template names.
155html_additional_pages = {'contents': 'index.html'}164html_additional_pages = {'index': 'index.html'}
156165
157# If false, no module index is generated.166# If false, no module index is generated.
158#html_use_modindex = True167html_use_modindex = False
159168
160# If false, no index is generated.169# If false, no index is generated.
161#html_use_index = True170html_use_index = False
162171
163# If true, the index is split into individual pages for each letter.172# If true, the index is split into individual pages for each letter.
164#html_split_index = False173#html_split_index = False
@@ -175,7 +184,7 @@
175#html_file_suffix = ''184#html_file_suffix = ''
176185
177# Output file base name for HTML help builder.186# Output file base name for HTML help builder.
178htmlhelp_basename = 'Bazaardoc'187htmlhelp_basename = 'bzr-en-user-docs'
179188
180189
181# -- Options for LaTeX output --------------------------------------------------190# -- Options for LaTeX output --------------------------------------------------
@@ -189,13 +198,29 @@
189# Grouping the document tree into LaTeX files. List of tuples198# Grouping the document tree into LaTeX files. List of tuples
190# (source start file, target name, title, author, documentclass [howto/manual]).199# (source start file, target name, title, author, documentclass [howto/manual]).
191latex_documents = [200latex_documents = [
192 ('contents', 'Bazaar.tex', u'Bazaar Documentation',201 # Manuals
193 u'Bazaar Developers', 'manual'),202 ('en/user-guide/index', 'bzr-en-user-guide.tex', u'Bazaar User Guide',
203 u'Bazaar Developers', 'manual'),
204 ('en/user-reference/bzr_man', 'bzr-en-user-reference.tex', u'Bazaar User Reference',
205 u'Bazaar Developers', 'manual'),
206 ('en/release-notes/NEWS', 'bzr-en-release-notes.tex', u'Bazaar Release Notes',
207 u'Bazaar Developers', 'manual'),
208 ('en/upgrade-guide/index', 'bzr-en-upgrade-guide.tex', u'Bazaar Upgrade Guide',
209 u'Bazaar Developers', 'manual'),
210 # Tutorials
211 ('en/mini-tutorial/index', 'bzr-en-tutorial-mini.tex', u'Bazaar in five minutes',
212 u'Bazaar Developers', 'howto'),
213 ('en/tutorials/tutorial', 'bzr-en-tutorial.tex', u'Bazaar Tutorial',
214 u'Bazaar Developers', 'howto'),
215 ('en/tutorials/using_bazaar_with_launchpad', 'bzr-en-tutorial-with-launchpad.tex',
216 u'Using Bazaar With Launchpad', u'Bazaar Developers', 'howto'),
217 ('en/tutorials/centralized_workflow', 'bzr-en-tutorial-centralized.tex',
218 u'Centralized Workflow Tutorial', u'Bazaar Developers', 'howto'),
194]219]
195220
196# The name of an image file (relative to this directory) to place at the top of221# The name of an image file (relative to this directory) to place at the top of
197# the title page.222# the title page.
198#latex_logo = None223latex_logo = 'Bazaar-Logo-For-Manuals.png'
199224
200# For "manual" documents, if this is true, then toplevel headings are parts,225# For "manual" documents, if this is true, then toplevel headings are parts,
201# not chapters.226# not chapters.
202227
=== renamed file 'doc/en/developer-guide/HACKING.txt' => 'doc/developers/HACKING.txt'
=== added file 'doc/developers/Makefile'
--- doc/developers/Makefile 1970-01-01 00:00:00 +0000
+++ doc/developers/Makefile 2009-09-07 07:44:36 +0000
@@ -0,0 +1,88 @@
1# Makefile for Sphinx documentation
2#
3
4# You can set these variables from the command line.
5SPHINXOPTS =
6SPHINXBUILD = sphinx-build
7PAPER =
8
9# Internal variables.
10PAPEROPT_a4 = -D latex_paper_size=a4
11PAPEROPT_letter = -D latex_paper_size=letter
12ALLSPHINXOPTS = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
13
14.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
15
16help:
17 @echo "Please use \`make <target>' where <target> is one of"
18 @echo " html to make standalone HTML files"
19 @echo " dirhtml to make HTML files named index.html in directories"
20 @echo " pickle to make pickle files"
21 @echo " json to make JSON files"
22 @echo " htmlhelp to make HTML files and a HTML help project"
23 @echo " qthelp to make HTML files and a qthelp project"
24 @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
25 @echo " changes to make an overview of all changed/added/deprecated items"
26 @echo " linkcheck to check all external links for integrity"
27 @echo " doctest to run all doctests embedded in the documentation (if enabled)"
28
29clean:
30 -rm -rf _build/*
31
32html:
33 $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
34 @echo
35 @echo "Build finished. The HTML pages are in _build/html."
36
37dirhtml:
38 $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) _build/dirhtml
39 @echo
40 @echo "Build finished. The HTML pages are in _build/dirhtml."
41
42pickle:
43 $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) _build/pickle
44 @echo
45 @echo "Build finished; now you can process the pickle files."
46
47json:
48 $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) _build/json
49 @echo
50 @echo "Build finished; now you can process the JSON files."
51
52htmlhelp:
53 $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
54 @echo
55 @echo "Build finished; now you can run HTML Help Workshop with the" \
56 ".hhp project file in _build/htmlhelp."
57
58qthelp:
59 $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) _build/qthelp
60 @echo
61 @echo "Build finished; now you can run "qcollectiongenerator" with the" \
62 ".qhcp project file in _build/qthelp, like this:"
63 @echo "# qcollectiongenerator _build/qthelp/Bazaar.qhcp"
64 @echo "To view the help file:"
65 @echo "# assistant -collectionFile _build/qthelp/Bazaar.qhc"
66
67latex:
68 $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) _build/latex
69 @echo
70 @echo "Build finished; the LaTeX files are in _build/latex."
71 @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
72 "run these through (pdf)latex."
73
74changes:
75 $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) _build/changes
76 @echo
77 @echo "The overview file is in _build/changes."
78
79linkcheck:
80 $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) _build/linkcheck
81 @echo
82 @echo "Link check complete; look for any errors in the above output " \
83 "or in _build/linkcheck/output.txt."
84
85doctest:
86 $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) _build/doctest
87 @echo "Testing of doctests in the sources finished, look at the " \
88 "results in _build/doctest/output.txt."
089
=== added directory 'doc/developers/_static'
=== added file 'doc/developers/_static/bzr icon 16.png'
1Binary files doc/developers/_static/bzr icon 16.png 1970-01-01 00:00:00 +0000 and doc/developers/_static/bzr icon 16.png 2009-09-07 07:44:36 +0000 differ90Binary files doc/developers/_static/bzr icon 16.png 1970-01-01 00:00:00 +0000 and doc/developers/_static/bzr icon 16.png 2009-09-07 07:44:36 +0000 differ
=== added file 'doc/developers/_static/bzr.ico'
2Binary files doc/developers/_static/bzr.ico 1970-01-01 00:00:00 +0000 and doc/developers/_static/bzr.ico 2009-09-07 07:44:36 +0000 differ91Binary files doc/developers/_static/bzr.ico 1970-01-01 00:00:00 +0000 and doc/developers/_static/bzr.ico 2009-09-07 07:44:36 +0000 differ
=== added directory 'doc/developers/_templates'
=== added file 'doc/developers/_templates/layout.html'
--- doc/developers/_templates/layout.html 1970-01-01 00:00:00 +0000
+++ doc/developers/_templates/layout.html 2009-09-07 07:44:36 +0000
@@ -0,0 +1,8 @@
1{% extends "!layout.html" %}
2
3{% block rootrellink %}
4<li><a href="http://bazaar-vcs.org/">
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>
7{{ super() }}
8{% endblock %}
09
=== added file 'doc/developers/conf.py'
--- doc/developers/conf.py 1970-01-01 00:00:00 +0000
+++ doc/developers/conf.py 2009-09-07 07:44:36 +0000
@@ -0,0 +1,218 @@
1# -*- coding: utf-8 -*-
2#
3# Bazaar documentation build configuration file, created by
4# sphinx-quickstart on Tue Jul 21 17:04:52 2009.
5#
6# This file is execfile()d with the current directory set to its containing dir.
7#
8# Note that not all possible configuration values are present in this
9# autogenerated file.
10#
11# All configuration values have a default; values that are commented out
12# serve to show the default.
13
14import sys, os
15
16# If extensions (or modules to document with autodoc) are in another directory,
17# add these directories to sys.path here. If the directory is relative to the
18# documentation root, use os.path.abspath to make it absolute, like shown here.
19#sys.path.append(os.path.abspath('.'))
20
21# -- Bazaar-specific configuration ---------------------------------------------
22
23# NOTE: Editing this section is generally all that is required ...
24
25# We *could* get this from bzrlib but there's no certainly that the bzr on
26# the Python path is indeed the one we're building the documentation for ...
27bzr_version = (2, 0, 0, 'rc', 2)
28
29
30# -- General configuration -----------------------------------------------------
31
32# Add any Sphinx extension module names here, as strings. They can be extensions
33# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
34extensions = ['sphinx.ext.ifconfig']
35
36# Add any paths that contain templates here, relative to this directory.
37templates_path = ['_templates']
38
39# The suffix of source filenames.
40source_suffix = '.txt'
41
42# The encoding of source files.
43#source_encoding = 'utf-8'
44
45# The master toctree document.
46master_doc = 'index'
47
48# General information about the project.
49project = u'Bazaar'
50copyright = u'2009, Canonical Ltd'
51
52# The version info for the project you're documenting, acts as replacement for
53# |version| and |release|, also used in various other places throughout the
54# built documents.
55#
56# The short X.Y version.
57version = '.'.join(str(p) for p in bzr_version[:3])
58# The full version, including alpha/beta/rc tags.
59release = version + ''.join(str(p) for p in bzr_version[3:])
60
61# The language for content autogenerated by Sphinx. Refer to documentation
62# for a list of supported languages.
63#language = None
64
65# There are two options for replacing |today|: either, you set today to some
66# non-false value, then it is used:
67#today = ''
68# Else, today_fmt is used as the format for a strftime call.
69#today_fmt = '%B %d, %Y'
70
71# List of documents that shouldn't be included in the build.
72#unused_docs = []
73
74# List of directories, relative to source directory, that shouldn't be searched
75# for source files.
76exclude_trees = ['_build']
77
78# The reST default role (used for this markup: `text`) to use for all documents.
79#default_role = None
80
81# If true, '()' will be appended to :func: etc. cross-reference text.
82#add_function_parentheses = True
83
84# If true, the current module name will be prepended to all description
85# unit titles (such as .. function::).
86#add_module_names = True
87
88# If true, sectionauthor and moduleauthor directives will be shown in the
89# output. They are ignored by default.
90#show_authors = False
91
92# The name of the Pygments (syntax highlighting) style to use.
93pygments_style = 'sphinx'
94
95# A list of ignored prefixes for module index sorting.
96#modindex_common_prefix = []
97
98
99# -- Options for HTML output ---------------------------------------------------
100
101# The theme to use for HTML and HTML Help pages. Major themes that come with
102# Sphinx are currently 'default' and 'sphinxdoc'.
103html_theme = 'default'
104
105# Theme options are theme-specific and customize the look and feel of a theme
106# further. For a list of options available for each theme, see the
107# documentation.
108html_theme_options = {
109 'rightsidebar': True,
110
111 # Non-document areas: header (relbar), footer, sidebar, etc.
112 # Some useful colours here:
113 # * blue: darkblue, mediumblue, darkslateblue, cornflowerblue, royalblue,
114 # midnightblue
115 # * gray: dimgray, slategray, lightslategray
116 'sidebarbgcolor': "cornflowerblue",
117 'sidebarlinkcolor': "midnightblue",
118 'relbarbgcolor': "darkblue",
119 'footerbgcolor': "lightslategray",
120
121 # Text, heading and code colouring
122 'codebgcolor': "lightyellow",
123 'codetextcolor': "firebrick",
124 'linkcolor': "mediumblue",
125 }
126
127# Add any paths that contain custom themes here, relative to this directory.
128#html_theme_path = []
129
130# The name for this set of Sphinx documents. If None, it defaults to
131# "<project> v<release> documentation".
132#html_title = None
133
134# A shorter title for the navigation bar. Default is the same as html_title.
135html_short_title = "Table of Contents (%s)" % (release,)
136
137# The name of an image file (relative to this directory) to place at the top
138# of the sidebar.
139#html_logo = None
140
141# The name of an image file (within the static path) to use as favicon of the
142# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
143# pixels large.
144html_favicon = "bzr.ico"
145
146# Add any paths that contain custom static files (such as style sheets) here,
147# relative to this directory. They are copied after the builtin static files,
148# so a file named "default.css" will overwrite the builtin "default.css".
149html_static_path = ['_static']
150
151# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
152# using the given strftime format.
153#html_last_updated_fmt = '%b %d, %Y'
154
155# If true, SmartyPants will be used to convert quotes and dashes to
156# typographically correct entities.
157#html_use_smartypants = True
158
159# Custom sidebar templates, maps document names to template names.
160#html_sidebars = {}
161
162# Additional templates that should be rendered to pages, maps page names to
163# template names.
164#html_additional_pages = {'index': 'index.html'}
165
166# If false, no module index is generated.
167html_use_modindex = False
168
169# If false, no index is generated.
170html_use_index = False
171
172# If true, the index is split into individual pages for each letter.
173#html_split_index = False
174
175# If true, links to the reST sources are added to the pages.
176html_show_sourcelink = True
177
178# If true, an OpenSearch description file will be output, and all pages will
179# contain a <link> tag referring to it. The value of this option must be the
180# base URL from which the finished HTML is served.
181#html_use_opensearch = ''
182
183# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
184#html_file_suffix = ''
185
186# Output file base name for HTML help builder.
187htmlhelp_basename = 'bzr-en-devel-docs'
188
189
190# -- Options for LaTeX output --------------------------------------------------
191
192# The paper size ('letter' or 'a4').
193#latex_paper_size = 'letter'
194
195# The font size ('10pt', '11pt' or '12pt').
196#latex_font_size = '10pt'
197
198# Grouping the document tree into LaTeX files. List of tuples
199# (source start file, target name, title, author, documentclass [howto/manual]).
200latex_documents = [
201]
202
203# The name of an image file (relative to this directory) to place at the top of
204# the title page.
205latex_logo = '../Bazaar-Logo-For-Manuals.png'
206
207# For "manual" documents, if this is true, then toplevel headings are parts,
208# not chapters.
209#latex_use_parts = False
210
211# Additional stuff for the LaTeX preamble.
212#latex_preamble = ''
213
214# Documents to append as an appendix to all manuals.
215#latex_appendices = []
216
217# If false, no module index is generated.
218#latex_use_modindex = True
0219
=== added file 'doc/developers/implementation-notes.txt'
--- doc/developers/implementation-notes.txt 1970-01-01 00:00:00 +0000
+++ doc/developers/implementation-notes.txt 2009-09-07 07:44:36 +0000
@@ -0,0 +1,28 @@
1Implementation notes
2====================
3
4.. toctree::
5 :hidden:
6
7 btree_index_prefetch
8 last-modified
9 content-filtering
10 lca_tree_merging
11
12
13* `BTree Index Prefetch <btree_index_prefetch.html>`_ |--| How bzr decides
14 to pre-read extra nodes in the btree index.
15
16* `Computing last_modified values <last-modified.html>`_ for inventory
17 entries
18
19* `Content filtering <content-filtering.html>`_
20
21* `LCA Tree Merging <lca_tree_merging.html>`_ |--| Merging tree-shape when
22 there is not a single unique ancestor (criss-cross merge).
23
24
25.. |--| unicode:: U+2014
26
27..
28 vim: ft=rst tw=74 ai
029
=== modified file 'doc/developers/index.txt'
--- doc/developers/index.txt 2009-08-26 03:20:32 +0000
+++ doc/developers/index.txt 2009-09-07 07:44:36 +0000
@@ -2,142 +2,56 @@
2Bazaar Developer Document Catalog2Bazaar Developer Document Catalog
3=================================3=================================
44
55.. toctree::
6Overall developer documentation6 :hidden:
7===============================7
88 process
9* `Developer Guide <../en/developer-guide/HACKING.html>`_9 HACKING
1010 testing
11* `Architectural Overview <overview.html>`_ |--| describes some of the11 overview
12 most important classes and concepts.12 integration
13 plans
14 specifications
15 implementation-notes
16 miscellaneous-notes
17
18
19Core developer documentation
20============================
21
22* `Process Docs <process.html>`_ |--| How Bazaar is developed
23
24* `Developer Guide <HACKING.html>`_ |--| Guide to writing code for Bazaar
25
26* `Testing Guide <testing.html>`_ |--| Guide to writing tests for Bazaar
27
28* `Writer Guide <http://bazaar-vcs.org/ContributingToTheDocs>`_ (web link)
29 |--| Guide to writing documentation for Bazaar
30
31* `Architectural Overview <overview.html>`_ |--| Describes some of the
32 most important classes and concepts
33
34* `Integration Guide <integration.html>`_ |--| A guide to integrating Bazaar
35 into other applications
36
37* `Writing plugins <http://bazaar-vcs.org/WritingPlugins>`_ (web link)
38 |--| Advice on writing Bazaar plugins
1339
14* `bzrlib API reference <http://starship.python.net/crew/mwh/bzrlibapi/>`_ 40* `bzrlib API reference <http://starship.python.net/crew/mwh/bzrlibapi/>`_
15 (external link)41 (web link)
16 |--| automatically generated API reference information42 |--| Automatically generated API reference information
1743
18* `Integrating with Bazaar <http://bazaar-vcs.org/Integrating_with_Bazaar>`_44
19 (wiki) |--| a guide for writing Python programs that work with Bazaar.45Other developer documentation
2046=============================
21* `Revision Properties <revision-properties.html>`_ |--| An application47
22 can set arbitrary per-revision key/value pairs to store app-specific48* `Plans <plans.html>`_
23 data.49
2450* `Specifications <specifications.html>`_
25* `Testing <testing.html>`_ |--| Guide to writing tests for Bazaar.51
2652* `Implementation notes <implementation-notes.html>`_
27* `Writing plugins <http://bazaar-vcs.org/WritingPlugins>`_ (wiki) 53
28 |--| specific advice on writing Bazaar plugins.54* `Miscellaneous notes <miscellaneous-notes.html>`_
29
30Process
31=======
32
33* `The Bazaar Development Cycle <cycle.html>`_ |--| The monthly
34 development cycle and how to run it.
35
36* `Releasing Bazaar <releasing.html>`_ |--|
37 Checklist to make a release of Bazaar.
38
39* `Managing the Bazaar PPA <ppa.html>`_ |--| Packaging Bazaar for Ubuntu.
40
41* `Giving back <http://bazaar-vcs.org/BzrGivingBack>`_ (wiki) |--| How to get
42 your changes to Bazaar integrated into a release.
43
44* `Profiling notes <profiling.html>`_ |--| Instructions on how to profile
45 bzr code and visualize the results.
46
47* `EC2 resources <ec2.html>`_ |--| A team resource for
48 Windows packaging and testing, and Ubuntu testing.
49
50* `Tracking Bugs in Bazaar <bug-handling.html>`_ |--| How we use the bug
51 tracker.
52
53Plans
54=====
55
56* `Performance roadmap <performance-roadmap.html>`_ |--| The roadmap
57 for fixing performance in bzr over the next few releases.
58
59* `Co-located branches <colocated-branches.html>`_ |--| Planned(?) support
60 for storing multiple branches in one file-system directory.
61
62* `Bazaar Windows Shell Extension Options <tortoise-strategy.html>`_ |--|
63 Implmentation strategy for Bazaar Windows Shell Extensions, aka
64 TortoiseBzr.
65
66* `CHK Optimized index <improved_chk_index.html>`_
67
68Specifications
69==============
70
71* `API versioning <api-versioning.html>`_ |--| bzrlib API versioning.
72
73* `Apport error reporting <apport.html>`_ |--| Capture data to report
74 bugs.
75
76* `Authentication ring <authentication-ring.html>`_ |--| Configuring
77 authentication.
78
79* `Bundles <bundles.html>`_ |--| All about bzr bundles.
80
81* `Container format <container-format.html>`_ |--| Notes on a container format
82 for streaming and storing Bazaar data.
83
84* `Groupcompress <groupcompress-design.html>`_ |--| Notes on the compression
85 technology used in CHK repositories.
86
87* `Indices <indices.html>`_ |--| The index facilities available within bzrlib.
88
89* `Inventories <inventory.html>`_ |--| Tree shape abstraction.
90
91* `LCA merge <lca-merge.html>`_ |--| A nice new merge algorithm.
92
93* `Network protocol <network-protocol.html>`_ |--| Custom network protocol.
94
95* `Plugin APIs <plugin-api.html>`_ |--| APIs plugins should use.
96
97* `Repositories <repository.html>`_ |--| What repositories do and are used for.
98
99* `Repository stream <repository-stream.html>`_ |--| Notes on streaming data
100 for repositories (a layer above the container format).
101
102* `Integration Guide <integration.html>`_ |--| A guide to integrate bzrlib into
103 any python application.
104
105* `Bazaar and case-insensitive file systems <case-insensitive-file-systems.html>`_
106 |--| How Bazaar operates on case-insensitive file systems such as commonly
107 found on Windows, USB sticks, etc.
108
109* `Development repository formats <development-repo.html>`_ |--| How to
110 work with repository formats that are still under development.
111 Contains instructions for those implementing new formats, of course,
112 but also for (bleeding-edge) end users of those formats.
113
114Data formats
115============
116
117* `Knit pack repositories <packrepo.html>`_ |--| KnitPack repositories
118 (new in Bazaar 0.92).
119
120Implementation notes
121====================
122
123* `BTree Index Prefetch <btree_index_prefetch.html>`_ |--| How bzr decides
124 to pre-read extra nodes in the btree index.
125
126* `Computing last_modified values <last-modified.html>`_ for inventory
127 entries
128
129* `Content filtering <content-filtering.html>`_
130
131* `LCA Tree Merging <lca_tree_merging.html>`_ |--| Merging tree-shape when
132 there is not a single unique ancestor (criss-cross merge).
133
134Miscellaneous
135=============
136
137* `dirstate <dirstate.html>`_ |--| An observation re. the dirstate file
138
139* `"bzr update" performance analysis <update.html>`_ |--| "bzr update"
140 performance analysis
14155
14256
143.. |--| unicode:: U+201457.. |--| unicode:: U+2014
14458
=== added file 'doc/developers/make.bat'
--- doc/developers/make.bat 1970-01-01 00:00:00 +0000
+++ doc/developers/make.bat 2009-09-07 07:44:36 +0000
@@ -0,0 +1,112 @@
1@ECHO OFF
2
3REM Command file for Sphinx documentation
4
5set SPHINXBUILD=sphinx-build
6set ALLSPHINXOPTS=-d _build/doctrees %SPHINXOPTS% .
7if NOT "%PAPER%" == "" (
8 set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
9)
10
11if "%1" == "" goto help
12
13if "%1" == "help" (
14 :help
15 echo.Please use `make ^<target^>` where ^<target^> is one of
16 echo. html to make standalone HTML files
17 echo. dirhtml to make HTML files named index.html in directories
18 echo. pickle to make pickle files
19 echo. json to make JSON files
20 echo. htmlhelp to make HTML files and a HTML help project
21 echo. qthelp to make HTML files and a qthelp project
22 echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter
23 echo. changes to make an overview over all changed/added/deprecated items
24 echo. linkcheck to check all external links for integrity
25 echo. doctest to run all doctests embedded in the documentation if enabled
26 goto end
27)
28
29if "%1" == "clean" (
30 for /d %%i in (_build\*) do rmdir /q /s %%i
31 del /q /s _build\*
32 goto end
33)
34
35if "%1" == "html" (
36 %SPHINXBUILD% -b html %ALLSPHINXOPTS% _build/html
37 echo.
38 echo.Build finished. The HTML pages are in _build/html.
39 goto end
40)
41
42if "%1" == "dirhtml" (
43 %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% _build/dirhtml
44 echo.
45 echo.Build finished. The HTML pages are in _build/dirhtml.
46 goto end
47)
48
49if "%1" == "pickle" (
50 %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% _build/pickle
51 echo.
52 echo.Build finished; now you can process the pickle files.
53 goto end
54)
55
56if "%1" == "json" (
57 %SPHINXBUILD% -b json %ALLSPHINXOPTS% _build/json
58 echo.
59 echo.Build finished; now you can process the JSON files.
60 goto end
61)
62
63if "%1" == "htmlhelp" (
64 %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% _build/htmlhelp
65 echo.
66 echo.Build finished; now you can run HTML Help Workshop with the ^
67.hhp project file in _build/htmlhelp.
68 goto end
69)
70
71if "%1" == "qthelp" (
72 %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% _build/qthelp
73 echo.
74 echo.Build finished; now you can run "qcollectiongenerator" with the ^
75.qhcp project file in _build/qthelp, like this:
76 echo.^> qcollectiongenerator _build\qthelp\Bazaar.qhcp
77 echo.To view the help file:
78 echo.^> assistant -collectionFile _build\qthelp\Bazaar.ghc
79 goto end
80)
81
82if "%1" == "latex" (
83 %SPHINXBUILD% -b latex %ALLSPHINXOPTS% _build/latex
84 echo.
85 echo.Build finished; the LaTeX files are in _build/latex.
86 goto end
87)
88
89if "%1" == "changes" (
90 %SPHINXBUILD% -b changes %ALLSPHINXOPTS% _build/changes
91 echo.
92 echo.The overview file is in _build/changes.
93 goto end
94)
95
96if "%1" == "linkcheck" (
97 %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% _build/linkcheck
98 echo.
99 echo.Link check complete; look for any errors in the above output ^
100or in _build/linkcheck/output.txt.
101 goto end
102)
103
104if "%1" == "doctest" (
105 %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% _build/doctest
106 echo.
107 echo.Testing of doctests in the sources finished, look at the ^
108results in _build/doctest/output.txt.
109 goto end
110)
111
112:end
0113
=== added file 'doc/developers/miscellaneous-notes.txt'
--- doc/developers/miscellaneous-notes.txt 1970-01-01 00:00:00 +0000
+++ doc/developers/miscellaneous-notes.txt 2009-09-07 07:44:36 +0000
@@ -0,0 +1,20 @@
1Miscellaneous notes
2===================
3
4.. toctree::
5 :hidden:
6
7 dirstate
8 update
9
10
11* `dirstate <dirstate.html>`_ |--| An observation re. the dirstate file
12
13* `"bzr update" performance analysis <update.html>`_ |--| "bzr update"
14 performance analysis
15
16
17.. |--| unicode:: U+2014
18
19..
20 vim: ft=rst tw=74 ai
021
=== added file 'doc/developers/plans.txt'
--- doc/developers/plans.txt 1970-01-01 00:00:00 +0000
+++ doc/developers/plans.txt 2009-09-07 07:44:36 +0000
@@ -0,0 +1,29 @@
1Plans
2=====
3
4.. toctree::
5 :hidden:
6
7 performance-roadmap
8 colocated-branches
9 tortoise-strategy
10 improved_chk_index
11
12
13* `Performance roadmap <performance-roadmap.html>`_ |--| The roadmap
14 for fixing performance in bzr over the next few releases.
15
16* `Co-located branches <colocated-branches.html>`_ |--| Planned(?) support
17 for storing multiple branches in one file-system directory.
18
19* `Bazaar Windows Shell Extension Options <tortoise-strategy.html>`_ |--|
20 Implmentation strategy for Bazaar Windows Shell Extensions, aka
21 TortoiseBzr.
22
23* `CHK Optimized index <improved_chk_index.html>`_
24
25
26.. |--| unicode:: U+2014
27
28..
29 vim: ft=rst tw=74 ai
030
=== added file 'doc/developers/process.txt'
--- doc/developers/process.txt 1970-01-01 00:00:00 +0000
+++ doc/developers/process.txt 2009-09-07 07:44:36 +0000
@@ -0,0 +1,39 @@
1Process Docs
2============
3
4.. toctree::
5 :hidden:
6
7 cycle
8 releasing
9 ppa
10 profiling
11 ec2
12 bug-handling
13
14
15* `The Bazaar Development Cycle <cycle.html>`_ |--| The monthly
16 development cycle and how to run it.
17
18* `Releasing Bazaar <releasing.html>`_ |--|
19 Checklist to make a release of Bazaar.
20
21* `Managing the Bazaar PPA <ppa.html>`_ |--| Packaging Bazaar for Ubuntu.
22
23* `Giving back <http://bazaar-vcs.org/BzrGivingBack>`_ (wiki) |--| How to get
24 your changes to Bazaar integrated into a release.
25
26* `Profiling notes <profiling.html>`_ |--| Instructions on how to profile
27 bzr code and visualize the results.
28
29* `EC2 resources <ec2.html>`_ |--| A team resource for
30 Windows packaging and testing, and Ubuntu testing.
31
32* `Tracking Bugs in Bazaar <bug-handling.html>`_ |--| How we use the bug
33 tracker.
34
35
36.. |--| unicode:: U+2014
37
38..
39 vim: ft=rst tw=74 ai
040
=== added file 'doc/developers/specifications.txt'
--- doc/developers/specifications.txt 1970-01-01 00:00:00 +0000
+++ doc/developers/specifications.txt 2009-09-07 07:44:36 +0000
@@ -0,0 +1,77 @@
1Specifications
2==============
3
4.. toctree::
5 :hidden:
6
7 revision-properties
8 api-versioning
9 apport
10 authentication-ring
11 bundles
12 container-format
13 groupcompress-design
14 indices
15 inventory
16 lca-merge
17 network-protocol
18 plugin-api
19 repository
20 repository-stream
21 case-insensitive-file-systems
22 development-repo
23 packrepo
24
25
26* `Revision Properties <revision-properties.html>`_ |--| An application
27 can set arbitrary per-revision key/value pairs to store app-specific
28 data.
29
30* `API versioning <api-versioning.html>`_ |--| bzrlib API versioning.
31
32* `Apport error reporting <apport.html>`_ |--| Capture data to report
33 bugs.
34
35* `Authentication ring <authentication-ring.html>`_ |--| Configuring
36 authentication.
37
38* `Bundles <bundles.html>`_ |--| All about bzr bundles.
39
40* `Container format <container-format.html>`_ |--| Notes on a container format
41 for streaming and storing Bazaar data.
42
43* `Groupcompress <groupcompress-design.html>`_ |--| Notes on the compression
44 technology used in CHK repositories.
45
46* `Indices <indices.html>`_ |--| The index facilities available within bzrlib.
47
48* `Inventories <inventory.html>`_ |--| Tree shape abstraction.
49
50* `LCA merge <lca-merge.html>`_ |--| A nice new merge algorithm.
51
52* `Network protocol <network-protocol.html>`_ |--| Custom network protocol.
53
54* `Plugin APIs <plugin-api.html>`_ |--| APIs plugins should use.
55
56* `Repositories <repository.html>`_ |--| What repositories do and are used for.
57
58* `Repository stream <repository-stream.html>`_ |--| Notes on streaming data
59 for repositories (a layer above the container format).
60
61* `Bazaar and case-insensitive file systems <case-insensitive-file-systems.html>`_
62 |--| How Bazaar operates on case-insensitive file systems such as commonly
63 found on Windows, USB sticks, etc.
64
65* `Development repository formats <development-repo.html>`_ |--| How to
66 work with repository formats that are still under development.
67 Contains instructions for those implementing new formats, of course,
68 but also for (bleeding-edge) end users of those formats.
69
70* `Knit pack repositories <packrepo.html>`_ |--| KnitPack repositories
71 (new in Bazaar 0.92).
72
73
74.. |--| unicode:: U+2014
75
76..
77 vim: ft=rst tw=74 ai
078
=== removed directory 'doc/en/developer-guide'
=== 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'
=== added file 'doc/es/Makefile'
--- doc/es/Makefile 1970-01-01 00:00:00 +0000
+++ doc/es/Makefile 2009-09-07 03:58:08 +0000
@@ -0,0 +1,88 @@
1# Makefile for Sphinx documentation
2#
3
4# You can set these variables from the command line.
5SPHINXOPTS =
6SPHINXBUILD = sphinx-build
7PAPER =
8
9# Internal variables.
10PAPEROPT_a4 = -D latex_paper_size=a4
11PAPEROPT_letter = -D latex_paper_size=letter
12ALLSPHINXOPTS = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
13
14.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
15
16help:
17 @echo "Please use \`make <target>' where <target> is one of"
18 @echo " html to make standalone HTML files"
19 @echo " dirhtml to make HTML files named index.html in directories"
20 @echo " pickle to make pickle files"
21 @echo " json to make JSON files"
22 @echo " htmlhelp to make HTML files and a HTML help project"
23 @echo " qthelp to make HTML files and a qthelp project"
24 @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
25 @echo " changes to make an overview of all changed/added/deprecated items"
26 @echo " linkcheck to check all external links for integrity"
27 @echo " doctest to run all doctests embedded in the documentation (if enabled)"
28
29clean:
30 -rm -rf _build/*
31
32html:
33 $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
34 @echo
35 @echo "Build finished. The HTML pages are in _build/html."
36
37dirhtml:
38 $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) _build/dirhtml
39 @echo
40 @echo "Build finished. The HTML pages are in _build/dirhtml."
41
42pickle:
43 $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) _build/pickle
44 @echo
45 @echo "Build finished; now you can process the pickle files."
46
47json:
48 $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) _build/json
49 @echo
50 @echo "Build finished; now you can process the JSON files."
51
52htmlhelp:
53 $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
54 @echo
55 @echo "Build finished; now you can run HTML Help Workshop with the" \
56 ".hhp project file in _build/htmlhelp."
57
58qthelp:
59 $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) _build/qthelp
60 @echo
61 @echo "Build finished; now you can run "qcollectiongenerator" with the" \
62 ".qhcp project file in _build/qthelp, like this:"
63 @echo "# qcollectiongenerator _build/qthelp/Bazaar.qhcp"
64 @echo "To view the help file:"
65 @echo "# assistant -collectionFile _build/qthelp/Bazaar.qhc"
66
67latex:
68 $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) _build/latex
69 @echo
70 @echo "Build finished; the LaTeX files are in _build/latex."
71 @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
72 "run these through (pdf)latex."
73
74changes:
75 $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) _build/changes
76 @echo
77 @echo "The overview file is in _build/changes."
78
79linkcheck:
80 $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) _build/linkcheck
81 @echo
82 @echo "Link check complete; look for any errors in the above output " \
83 "or in _build/linkcheck/output.txt."
84
85doctest:
86 $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) _build/doctest
87 @echo "Testing of doctests in the sources finished, look at the " \
88 "results in _build/doctest/output.txt."
089
=== added directory 'doc/es/_static'
=== added file 'doc/es/_static/bzr icon 16.png'
1Binary files doc/es/_static/bzr icon 16.png 1970-01-01 00:00:00 +0000 and doc/es/_static/bzr icon 16.png 2009-09-07 03:58:08 +0000 differ90Binary files doc/es/_static/bzr icon 16.png 1970-01-01 00:00:00 +0000 and doc/es/_static/bzr icon 16.png 2009-09-07 03:58:08 +0000 differ
=== added file 'doc/es/_static/bzr.ico'
2Binary files doc/es/_static/bzr.ico 1970-01-01 00:00:00 +0000 and doc/es/_static/bzr.ico 2009-09-07 03:58:08 +0000 differ91Binary files doc/es/_static/bzr.ico 1970-01-01 00:00:00 +0000 and doc/es/_static/bzr.ico 2009-09-07 03:58:08 +0000 differ
=== added directory 'doc/es/_static/es'
=== added directory 'doc/es/_static/es/quick-reference'
=== renamed file 'doc/es/quick-reference/Makefile' => 'doc/es/_static/es/quick-reference/Makefile'
--- doc/es/quick-reference/Makefile 2009-06-29 11:02:31 +0000
+++ doc/es/_static/es/quick-reference/Makefile 2009-09-07 03:58:08 +0000
@@ -1,5 +1,5 @@
1TARGETS=quick-start-summary.png quick-start-summary.pdf1TARGETS=bzr-quick-reference.png bzr-quick-reference.pdf
2OBJECTS=quick-start-summary.svg Makefile2OBJECTS=bzr-quick-reference.svg Makefile
33
4all: $(TARGETS)4all: $(TARGETS)
55
@@ -11,9 +11,9 @@
11.svg.png:11.svg.png:
12 rsvg-convert -d 300 -p 300 -z 3.3346 -f png -o $@ $<12 rsvg-convert -d 300 -p 300 -z 3.3346 -f png -o $@ $<
1313
14bzr-quickref.png: $(OBJECTS)14bzr-quick-reference.png: $(OBJECTS)
1515
16bzr-quickref.pdf: $(OBJECTS)16bzr-quick-reference.pdf: $(OBJECTS)
1717
18clean:18clean:
19 rm -f $(TARGETS)19 rm -f $(TARGETS)
2020
=== renamed file 'doc/es/quick-reference/quick-start-summary.pdf' => 'doc/es/_static/es/quick-reference/bzr-quick-reference.pdf'
=== renamed file 'doc/es/quick-reference/quick-start-summary.png' => 'doc/es/_static/es/quick-reference/bzr-quick-reference.png'
=== renamed file 'doc/es/quick-reference/quick-start-summary.svg' => 'doc/es/_static/es/quick-reference/bzr-quick-reference.svg'
=== added directory 'doc/es/_templates'
=== added file 'doc/es/_templates/layout.html'
--- doc/es/_templates/layout.html 1970-01-01 00:00:00 +0000
+++ doc/es/_templates/layout.html 2009-09-07 06:12:15 +0000
@@ -0,0 +1,8 @@
1{% extends "!layout.html" %}
2
3{% block rootrellink %}
4<li><a href="http://bazaar-vcs.org/">
5 <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Inicio</a>&nbsp;|&nbsp;</li>
6<a href="http://doc.bazaar-vcs.org/en/">Documentación</a>&nbsp;|&nbsp;</li>
7{{ super() }}
8{% endblock %}
09
=== added file 'doc/es/conf.py'
--- doc/es/conf.py 1970-01-01 00:00:00 +0000
+++ doc/es/conf.py 2009-09-07 06:12:15 +0000
@@ -0,0 +1,262 @@
1# -*- coding: utf-8 -*-
2#
3# Bazaar documentation build configuration file, created by
4# sphinx-quickstart on Tue Jul 21 17:04:52 2009.
5#
6# This file is execfile()d with the current directory set to its containing dir.
7#
8# Note that not all possible configuration values are present in this
9# autogenerated file.
10#
11# All configuration values have a default; values that are commented out
12# serve to show the default.
13
14import sys, os
15
16# If extensions (or modules to document with autodoc) are in another directory,
17# add these directories to sys.path here. If the directory is relative to the
18# documentation root, use os.path.abspath to make it absolute, like shown here.
19#sys.path.append(os.path.abspath('.'))
20
21
22# -- Bazaar-specific configuration ---------------------------------------------
23
24# NOTE: Editing this section is generally all that is required ...
25
26# We *could* get this from bzrlib but there's no certainly that the bzr on
27# the Python path is indeed the one we're building the documentation for ...
28bzr_version = (2, 0, 0, 'rc', 2)
29
30# The locale code for this documentation set
31bzr_locale = 'es'
32
33# Authors of the documents
34bzr_team = u'Bazaar Developers'
35
36# Translations
37bzr_titles = {
38 u'Table of Contents (%s)': u'Contenidos (%s)',
39 u'Bazaar User Guide': u'Guia de Usuario',
40 u'Bazaar User Reference': None,
41 u'Bazaar Release Notes': None,
42 u'Bazaar Upgrade Guide': None,
43 u'Bazaar in five minutes': u'Bazaar en cinco minutos',
44 u'Bazaar Tutorial': None,
45 u'Using Bazaar With Launchpad': None,
46 u'Centralized Workflow Tutorial': None,
47 }
48
49# Helper function for looking up translations
50def bzr_title(s):
51 return bzr_titles.get(s) or s
52
53
54# -- General configuration -----------------------------------------------------
55
56# Add any Sphinx extension module names here, as strings. They can be extensions
57# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
58extensions = ['sphinx.ext.ifconfig']
59
60# Add any paths that contain templates here, relative to this directory.
61templates_path = ['_templates']
62
63# The suffix of source filenames.
64source_suffix = '.txt'
65
66# The encoding of source files.
67#source_encoding = 'utf-8'
68
69# The master toctree document.
70master_doc = 'index'
71
72# General information about the project.
73project = u'Bazaar'
74copyright = u'2009, Canonical Ltd'
75
76# The version info for the project you're documenting, acts as replacement for
77# |version| and |release|, also used in various other places throughout the
78# built documents.
79#
80# The short X.Y version.
81version = '.'.join(str(p) for p in bzr_version[:3])
82# The full version, including alpha/beta/rc tags.
83release = version + ''.join(str(p) for p in bzr_version[3:])
84
85# The language for content autogenerated by Sphinx. Refer to documentation
86# for a list of supported languages.
87language = bzr_locale
88
89# There are two options for replacing |today|: either, you set today to some
90# non-false value, then it is used:
91#today = ''
92# Else, today_fmt is used as the format for a strftime call.
93#today_fmt = '%B %d, %Y'
94
95# List of documents that shouldn't be included in the build.
96#unused_docs = []
97
98# List of directories, relative to source directory, that shouldn't be searched
99# for source files.
100exclude_trees = ['_build']
101
102# The reST default role (used for this markup: `text`) to use for all documents.
103#default_role = None
104
105# If true, '()' will be appended to :func: etc. cross-reference text.
106#add_function_parentheses = True
107
108# If true, the current module name will be prepended to all description
109# unit titles (such as .. function::).
110#add_module_names = True
111
112# If true, sectionauthor and moduleauthor directives will be shown in the
113# output. They are ignored by default.
114#show_authors = False
115
116# The name of the Pygments (syntax highlighting) style to use.
117pygments_style = 'sphinx'
118
119# A list of ignored prefixes for module index sorting.
120#modindex_common_prefix = []
121
122
123# -- Options for HTML output ---------------------------------------------------
124
125# The theme to use for HTML and HTML Help pages. Major themes that come with
126# Sphinx are currently 'default' and 'sphinxdoc'.
127html_theme = 'default'
128
129# Theme options are theme-specific and customize the look and feel of a theme
130# further. For a list of options available for each theme, see the
131# documentation.
132html_theme_options = {
133 'rightsidebar': True,
134
135 # Non-document areas: header (relbar), footer, sidebar, etc.
136 # Some useful colours here:
137 # * blue: darkblue, mediumblue, darkslateblue, cornflowerblue, royalblue,
138 # midnightblue
139 # * gray: dimgray, slategray, lightslategray
140 'sidebarbgcolor': "cornflowerblue",
141 'sidebarlinkcolor': "midnightblue",
142 'relbarbgcolor': "darkblue",
143 'footerbgcolor': "lightslategray",
144
145 # Text, heading and code colouring
146 'codebgcolor': "lightyellow",
147 'codetextcolor': "firebrick",
148 'linkcolor': "mediumblue",
149 }
150
151# Add any paths that contain custom themes here, relative to this directory.
152#html_theme_path = []
153
154# The name for this set of Sphinx documents. If None, it defaults to
155# "<project> v<release> documentation".
156#html_title = None
157
158# A shorter title for the navigation bar. Default is the same as html_title.
159html_short_title = bzr_title(u"Table of Contents (%s)") % (release,)
160
161# The name of an image file (relative to this directory) to place at the top
162# of the sidebar.
163#html_logo = None
164
165# The name of an image file (within the static path) to use as favicon of the
166# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
167# pixels large.
168html_favicon = "bzr.ico"
169
170# Add any paths that contain custom static files (such as style sheets) here,
171# relative to this directory. They are copied after the builtin static files,
172# so a file named "default.css" will overwrite the builtin "default.css".
173html_static_path = ['_static']
174
175# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
176# using the given strftime format.
177#html_last_updated_fmt = '%b %d, %Y'
178
179# If true, SmartyPants will be used to convert quotes and dashes to
180# typographically correct entities.
181#html_use_smartypants = True
182
183# Custom sidebar templates, maps document names to template names.
184#html_sidebars = {}
185
186# Additional templates that should be rendered to pages, maps page names to
187# template names.
188#html_additional_pages = {'index': 'index.html'}
189
190# If false, no module index is generated.
191html_use_modindex = False
192
193# If false, no index is generated.
194html_use_index = False
195
196# If true, the index is split into individual pages for each letter.
197#html_split_index = False
198
199# If true, links to the reST sources are added to the pages.
200html_show_sourcelink = True
201
202# If true, an OpenSearch description file will be output, and all pages will
203# contain a <link> tag referring to it. The value of this option must be the
204# base URL from which the finished HTML is served.
205#html_use_opensearch = ''
206
207# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
208#html_file_suffix = ''
209
210# Output file base name for HTML help builder.
211htmlhelp_basename = 'bzr-%s-user-docs' % (bzr_locale,)
212
213
214# -- Options for LaTeX output --------------------------------------------------
215
216# The paper size ('letter' or 'a4').
217#latex_paper_size = 'letter'
218
219# The font size ('10pt', '11pt' or '12pt').
220#latex_font_size = '10pt'
221
222# Grouping the document tree into LaTeX files. List of tuples
223# (source start file, target name, title, author, documentclass [howto/manual]).
224latex_documents = [
225 # Manuals
226 #('user-guide/index', 'bzr-%s-user-guide.tex' % (bzr_locale,),
227 # bzr_title(u'Bazaar User Guide'), bzr_team, 'manual'),
228 #('user-reference/bzr_man', 'bzr-%s-user-reference.tex' % (bzr_locale,),
229 # bzr_title(u'Bazaar User Reference'), bzr_team, 'manual'),
230 #('release-notes/NEWS', 'bzr-%s-release-notes.tex' % (bzr_locale,),
231 # bzr_title(u'Bazaar Release Notes'), bzr_team, 'manual'),
232 #('upgrade-guide/index', 'bzr-%s-upgrade-guide.tex' % (bzr_locale,),
233 # bzr_title(u'Bazaar Upgrade Guide'), bzr_team, 'manual'),
234 # Tutorials
235 ('mini-tutorial/index', 'bzr-%s-tutorial-mini.tex' % (bzr_locale,),
236 bzr_title(u'Bazaar in five minutes'), bzr_team, 'howto'),
237 #('tutorials/tutorial', 'bzr-%s-tutorial.tex' % (bzr_locale,),
238 # bzr_title(u'Bazaar Tutorial'), bzr_team, 'howto'),
239 #('tutorials/using_bazaar_with_launchpad',
240 # 'bzr-%s-tutorial-with-launchpad.tex' % (bzr_locale,),
241 # bzr_title(u'Using Bazaar With Launchpad'), bzr_team, 'howto'),
242 #('tutorials/centralized_workflow',
243 # 'bzr-%s-tutorial-centralized.tex' % (bzr_locale,),
244 # bzr_title(u'Centralized Workflow Tutorial'), bzr_team, 'howto'),
245]
246
247# The name of an image file (relative to this directory) to place at the top of
248# the title page.
249latex_logo = 'Bazaar-Logo-For-Manuals.png'
250
251# For "manual" documents, if this is true, then toplevel headings are parts,
252# not chapters.
253#latex_use_parts = False
254
255# Additional stuff for the LaTeX preamble.
256#latex_preamble = ''
257
258# Documents to append as an appendix to all manuals.
259#latex_appendices = []
260
261# If false, no module index is generated.
262#latex_use_modindex = True
0263
=== removed directory 'doc/es/developer-guide'
=== renamed file 'doc/index.es.txt' => 'doc/es/index.txt'
--- doc/index.es.txt 2009-06-29 11:02:31 +0000
+++ doc/es/index.txt 2009-09-07 06:12:15 +0000
@@ -1,46 +1,47 @@
1==================================1=================================
2Indice de Documentacion de Bazaar2Indice de Documentacion de Bazaar
3==================================3=================================
44
5Las ultimas versiones de estos documentos se encuentran disponibles5Las ultimas versiones de estos documentos se encuentran disponibles
6en la pagina de Bazaar, http://doc.bazaar-vcs.org.6en la pagina de Bazaar, http://doc.bazaar-vcs.org/en/.
7
8.. toctree::
9 :hidden:
10
11 mini-tutorials/index
12 quick-reference/index
13 user-guide/index
14
715
8Documentacion Principal16Documentacion Principal
9=======================17=======================
1018
11* `Mini Tutorial <es/mini-tutorial/index.html>`_ 19* `Bazaar en cinco minutos <mini-tutorial/index.html>`_
1220
13* `Referencia Rapida <es/quick-reference/quick-start-summary.svg>`_21* `Referencia Rapida <quick-reference/index.html>`_
1422
15* `Guia de Usuario <es/user-guide/index.html>`_ 23* `Guia de Usuario <user-guide/index.html>`_
16
17* `Referencia <es/user-reference/bzr_man.html>`_
18
19* `Notas sobre la Version <es/release-notes/NEWS.html>`_
20
21* `Guia del Desarrollador <es/developer-guide/HACKING.html>`_
2224
2325
24Otra Documentacion26Otra Documentacion
25===================27==================
2628
27Mudandose a Bazaar (enlances web):29Mudandose a Bazaar (enlances web):
2830
29* `Guias de Mudanzas <http://bazaar-vcs.org/BzrSwitching>`_ 31* `Guias de Migracion <http://doc.bazaar-vcs.org/migration/en/>`_
30 - para los usuarios que se mudan de otros SCV
31
32* `Guias de Migracion <http://bazaar-vcs.org/BzrMigration>`_
33 - para equipos que mudan el historial de otros SCV32 - para equipos que mudan el historial de otros SCV
3433
34* `Guias de Plugins <http://doc.bazaar-vcs.org/plugins/en/>`_
35
35Otros Documentos (enlances web):36Otros Documentos (enlances web):
3637
37* `Glosario <http://bazaar-vcs.org/BzrGlossary>`_38* `Glosario <http://bazaar-vcs.org/BzrGlossary>`_
3839
39* `Preguntas Frecuentes <http://bazaar-vcs.org/FAQ>`_40* `Preguntas Frecuentes <https://answers.launchpad.net/bzr>`_
4041
41* `Referencia del API bzrlib <http://bazaar-vcs.org/BzrLib>`_42* `Referencia del API bzrlib <http://bazaar-vcs.org/BzrLib>`_
4243
43Especificaciones tecnicas, planes a futuro y varias44Especificaciones tecnicas, planes a futuro y varias
44notas tecnicas varias en Ingles:45notas tecnicas varias en Ingles:
4546
46* `Catalogo de Documentos para Desarrolladores <developers/index.html>`_47* `Catalogo de Documentos para Desarrolladores <http://doc.bazaar-vcs.org/latest/developers/>`_
4748
=== added file 'doc/es/make.bat'
--- doc/es/make.bat 1970-01-01 00:00:00 +0000
+++ doc/es/make.bat 2009-09-07 03:58:08 +0000
@@ -0,0 +1,112 @@
1@ECHO OFF
2
3REM Command file for Sphinx documentation
4
5set SPHINXBUILD=sphinx-build
6set ALLSPHINXOPTS=-d _build/doctrees %SPHINXOPTS% .
7if NOT "%PAPER%" == "" (
8 set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
9)
10
11if "%1" == "" goto help
12
13if "%1" == "help" (
14 :help
15 echo.Please use `make ^<target^>` where ^<target^> is one of
16 echo. html to make standalone HTML files
17 echo. dirhtml to make HTML files named index.html in directories
18 echo. pickle to make pickle files
19 echo. json to make JSON files
20 echo. htmlhelp to make HTML files and a HTML help project
21 echo. qthelp to make HTML files and a qthelp project
22 echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter
23 echo. changes to make an overview over all changed/added/deprecated items
24 echo. linkcheck to check all external links for integrity
25 echo. doctest to run all doctests embedded in the documentation if enabled
26 goto end
27)
28
29if "%1" == "clean" (
30 for /d %%i in (_build\*) do rmdir /q /s %%i
31 del /q /s _build\*
32 goto end
33)
34
35if "%1" == "html" (
36 %SPHINXBUILD% -b html %ALLSPHINXOPTS% _build/html
37 echo.
38 echo.Build finished. The HTML pages are in _build/html.
39 goto end
40)
41
42if "%1" == "dirhtml" (
43 %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% _build/dirhtml
44 echo.
45 echo.Build finished. The HTML pages are in _build/dirhtml.
46 goto end
47)
48
49if "%1" == "pickle" (
50 %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% _build/pickle
51 echo.
52 echo.Build finished; now you can process the pickle files.
53 goto end
54)
55
56if "%1" == "json" (
57 %SPHINXBUILD% -b json %ALLSPHINXOPTS% _build/json
58 echo.
59 echo.Build finished; now you can process the JSON files.
60 goto end
61)
62
63if "%1" == "htmlhelp" (
64 %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% _build/htmlhelp
65 echo.
66 echo.Build finished; now you can run HTML Help Workshop with the ^
67.hhp project file in _build/htmlhelp.
68 goto end
69)
70
71if "%1" == "qthelp" (
72 %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% _build/qthelp
73 echo.
74 echo.Build finished; now you can run "qcollectiongenerator" with the ^
75.qhcp project file in _build/qthelp, like this:
76 echo.^> qcollectiongenerator _build\qthelp\Bazaar.qhcp
77 echo.To view the help file:
78 echo.^> assistant -collectionFile _build\qthelp\Bazaar.ghc
79 goto end
80)
81
82if "%1" == "latex" (
83 %SPHINXBUILD% -b latex %ALLSPHINXOPTS% _build/latex
84 echo.
85 echo.Build finished; the LaTeX files are in _build/latex.
86 goto end
87)
88
89if "%1" == "changes" (
90 %SPHINXBUILD% -b changes %ALLSPHINXOPTS% _build/changes
91 echo.
92 echo.The overview file is in _build/changes.
93 goto end
94)
95
96if "%1" == "linkcheck" (
97 %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% _build/linkcheck
98 echo.
99 echo.Link check complete; look for any errors in the above output ^
100or in _build/linkcheck/output.txt.
101 goto end
102)
103
104if "%1" == "doctest" (
105 %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% _build/doctest
106 echo.
107 echo.Testing of doctests in the sources finished, look at the ^
108results in _build/doctest/output.txt.
109 goto end
110)
111
112:end
0113
=== added file 'doc/es/quick-reference/index.txt'
--- doc/es/quick-reference/index.txt 1970-01-01 00:00:00 +0000
+++ doc/es/quick-reference/index.txt 2009-09-07 03:58:08 +0000
@@ -0,0 +1,6 @@
1Referencia Rapida
2=================
3
4* `SVG format <../_static/es/quick-reference/bzr-quick-reference.svg>`_
5* `PDF format <../_static/es/quick-reference/bzr-quick-reference.pdf>`_
6* `PNG format <../_static/es/quick-reference/bzr-quick-reference.png>`_
07
=== removed directory 'doc/es/release-notes'
=== removed directory 'doc/es/user-reference'
=== 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 'doc/ru/Makefile'
--- doc/ru/Makefile 1970-01-01 00:00:00 +0000
+++ doc/ru/Makefile 2009-09-07 05:26:43 +0000
@@ -0,0 +1,88 @@
1# Makefile for Sphinx documentation
2#
3
4# You can set these variables from the command line.
5SPHINXOPTS =
6SPHINXBUILD = sphinx-build
7PAPER =
8
9# Internal variables.
10PAPEROPT_a4 = -D latex_paper_size=a4
11PAPEROPT_letter = -D latex_paper_size=letter
12ALLSPHINXOPTS = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
13
14.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
15
16help:
17 @echo "Please use \`make <target>' where <target> is one of"
18 @echo " html to make standalone HTML files"
19 @echo " dirhtml to make HTML files named index.html in directories"
20 @echo " pickle to make pickle files"
21 @echo " json to make JSON files"
22 @echo " htmlhelp to make HTML files and a HTML help project"
23 @echo " qthelp to make HTML files and a qthelp project"
24 @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
25 @echo " changes to make an overview of all changed/added/deprecated items"
26 @echo " linkcheck to check all external links for integrity"
27 @echo " doctest to run all doctests embedded in the documentation (if enabled)"
28
29clean:
30 -rm -rf _build/*
31
32html:
33 $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
34 @echo
35 @echo "Build finished. The HTML pages are in _build/html."
36
37dirhtml:
38 $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) _build/dirhtml
39 @echo
40 @echo "Build finished. The HTML pages are in _build/dirhtml."
41
42pickle:
43 $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) _build/pickle
44 @echo
45 @echo "Build finished; now you can process the pickle files."
46
47json:
48 $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) _build/json
49 @echo
50 @echo "Build finished; now you can process the JSON files."
51
52htmlhelp:
53 $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
54 @echo
55 @echo "Build finished; now you can run HTML Help Workshop with the" \
56 ".hhp project file in _build/htmlhelp."
57
58qthelp:
59 $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) _build/qthelp
60 @echo
61 @echo "Build finished; now you can run "qcollectiongenerator" with the" \
62 ".qhcp project file in _build/qthelp, like this:"
63 @echo "# qcollectiongenerator _build/qthelp/Bazaar.qhcp"
64 @echo "To view the help file:"
65 @echo "# assistant -collectionFile _build/qthelp/Bazaar.qhc"
66
67latex:
68 $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) _build/latex
69 @echo
70 @echo "Build finished; the LaTeX files are in _build/latex."
71 @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
72 "run these through (pdf)latex."
73
74changes:
75 $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) _build/changes
76 @echo
77 @echo "The overview file is in _build/changes."
78
79linkcheck:
80 $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) _build/linkcheck
81 @echo
82 @echo "Link check complete; look for any errors in the above output " \
83 "or in _build/linkcheck/output.txt."
84
85doctest:
86 $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) _build/doctest
87 @echo "Testing of doctests in the sources finished, look at the " \
88 "results in _build/doctest/output.txt."
089
=== added directory 'doc/ru/_static'
=== added file 'doc/ru/_static/bzr icon 16.png'
1Binary files doc/ru/_static/bzr icon 16.png 1970-01-01 00:00:00 +0000 and doc/ru/_static/bzr icon 16.png 2009-09-07 05:26:43 +0000 differ90Binary files doc/ru/_static/bzr icon 16.png 1970-01-01 00:00:00 +0000 and doc/ru/_static/bzr icon 16.png 2009-09-07 05:26:43 +0000 differ
=== added file 'doc/ru/_static/bzr.ico'
2Binary files doc/ru/_static/bzr.ico 1970-01-01 00:00:00 +0000 and doc/ru/_static/bzr.ico 2009-09-07 05:26:43 +0000 differ91Binary files doc/ru/_static/bzr.ico 1970-01-01 00:00:00 +0000 and doc/ru/_static/bzr.ico 2009-09-07 05:26:43 +0000 differ
=== added directory 'doc/ru/_static/ru'
=== renamed file 'doc/ru/quick-reference/Makefile' => 'doc/ru/_static/ru/Makefile'
--- doc/ru/quick-reference/Makefile 2008-08-19 06:29:48 +0000
+++ doc/ru/_static/ru/Makefile 2009-09-07 05:26:43 +0000
@@ -1,5 +1,5 @@
1TARGETS=quick-start-summary.png quick-start-summary.pdf1TARGETS=bzr-quick-reference.png bzr-quick-reference.pdf
2OBJECTS=quick-start-summary.svg Makefile2OBJECTS=bzr-quick-reference.svg Makefile
33
4all: $(TARGETS)4all: $(TARGETS)
55
@@ -11,9 +11,9 @@
11.svg.png:11.svg.png:
12 rsvg-convert -d 300 -p 300 -z 3.3346 -f png -o $@ $<12 rsvg-convert -d 300 -p 300 -z 3.3346 -f png -o $@ $<
1313
14bzr-quickref.png: $(OBJECTS)14bzr-quick-reference.png: $(OBJECTS)
1515
16bzr-quickref.pdf: $(OBJECTS)16bzr-quick-reference.pdf: $(OBJECTS)
1717
18clean:18clean:
19 rm -f $(TARGETS)19 rm -f $(TARGETS)
2020
=== renamed file 'doc/ru/quick-reference/quick-start-summary.pdf' => 'doc/ru/_static/ru/bzr-quick-reference.pdf'
=== renamed file 'doc/ru/quick-reference/quick-start-summary.png' => 'doc/ru/_static/ru/bzr-quick-reference.png'
=== renamed file 'doc/ru/quick-reference/quick-start-summary.svg' => 'doc/ru/_static/ru/bzr-quick-reference.svg'
=== added directory 'doc/ru/_templates'
=== added file 'doc/ru/conf.py'
--- doc/ru/conf.py 1970-01-01 00:00:00 +0000
+++ doc/ru/conf.py 2009-09-07 05:26:43 +0000
@@ -0,0 +1,263 @@
1# -*- coding: utf-8 -*-
2#
3# Bazaar documentation build configuration file, created by
4# sphinx-quickstart on Tue Jul 21 17:04:52 2009.
5#
6# This file is execfile()d with the current directory set to its containing dir.
7#
8# Note that not all possible configuration values are present in this
9# autogenerated file.
10#
11# All configuration values have a default; values that are commented out
12# serve to show the default.
13
14import sys, os
15
16# If extensions (or modules to document with autodoc) are in another directory,
17# add these directories to sys.path here. If the directory is relative to the
18# documentation root, use os.path.abspath to make it absolute, like shown here.
19#sys.path.append(os.path.abspath('.'))
20
21
22# -- Bazaar-specific configuration ---------------------------------------------
23
24# NOTE: Editing this section is generally all that is required ...
25
26# We *could* get this from bzrlib but there's no certainly that the bzr on
27# the Python path is indeed the one we're building the documentation for ...
28bzr_version = (2, 0, 0, 'rc', 2)
29
30# The locale code for this documentation set
31bzr_locale = 'ru'
32
33# Authors of the documents
34bzr_team = u'Bazaar Developers'
35
36# Translations
37bzr_titles = {
38 u'Table of Contents (%s)': u'Содержание (%s)',
39 u'Bazaar User Guide': None,
40 u'Bazaar User Reference': None,
41 u'Bazaar Release Notes': None,
42 u'Bazaar Upgrade Guide': None,
43 u'Bazaar in five minutes': u'Базар за пять минут',
44 u'Bazaar Tutorial': u'Большой учебник',
45 u'Using Bazaar With Launchpad': u'Использование Bazaar с Launchpad',
46 u'Centralized Workflow Tutorial': u'Работа в централизованном стиле',
47 }
48
49
50# Helper function for looking up translations
51def bzr_title(s):
52 return bzr_titles.get(s) or s
53
54
55# -- General configuration -----------------------------------------------------
56
57# Add any Sphinx extension module names here, as strings. They can be extensions
58# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
59extensions = ['sphinx.ext.ifconfig']
60
61# Add any paths that contain templates here, relative to this directory.
62templates_path = ['_templates']
63
64# The suffix of source filenames.
65source_suffix = '.txt'
66
67# The encoding of source files.
68#source_encoding = 'utf-8'
69
70# The master toctree document.
71master_doc = 'index'
72
73# General information about the project.
74project = u'Bazaar'
75copyright = u'2009, Canonical Ltd'
76
77# The version info for the project you're documenting, acts as replacement for
78# |version| and |release|, also used in various other places throughout the
79# built documents.
80#
81# The short X.Y version.
82version = '.'.join(str(p) for p in bzr_version[:3])
83# The full version, including alpha/beta/rc tags.
84release = version + ''.join(str(p) for p in bzr_version[3:])
85
86# The language for content autogenerated by Sphinx. Refer to documentation
87# for a list of supported languages.
88language = bzr_locale
89
90# There are two options for replacing |today|: either, you set today to some
91# non-false value, then it is used:
92#today = ''
93# Else, today_fmt is used as the format for a strftime call.
94#today_fmt = '%B %d, %Y'
95
96# List of documents that shouldn't be included in the build.
97#unused_docs = []
98
99# List of directories, relative to source directory, that shouldn't be searched
100# for source files.
101exclude_trees = ['_build']
102
103# The reST default role (used for this markup: `text`) to use for all documents.
104#default_role = None
105
106# If true, '()' will be appended to :func: etc. cross-reference text.
107#add_function_parentheses = True
108
109# If true, the current module name will be prepended to all description
110# unit titles (such as .. function::).
111#add_module_names = True
112
113# If true, sectionauthor and moduleauthor directives will be shown in the
114# output. They are ignored by default.
115#show_authors = False
116
117# The name of the Pygments (syntax highlighting) style to use.
118pygments_style = 'sphinx'
119
120# A list of ignored prefixes for module index sorting.
121#modindex_common_prefix = []
122
123
124# -- Options for HTML output ---------------------------------------------------
125
126# The theme to use for HTML and HTML Help pages. Major themes that come with
127# Sphinx are currently 'default' and 'sphinxdoc'.
128html_theme = 'default'
129
130# Theme options are theme-specific and customize the look and feel of a theme
131# further. For a list of options available for each theme, see the
132# documentation.
133html_theme_options = {
134 'rightsidebar': True,
135
136 # Non-document areas: header (relbar), footer, sidebar, etc.
137 # Some useful colours here:
138 # * blue: darkblue, mediumblue, darkslateblue, cornflowerblue, royalblue,
139 # midnightblue
140 # * gray: dimgray, slategray, lightslategray
141 'sidebarbgcolor': "cornflowerblue",
142 'sidebarlinkcolor': "midnightblue",
143 'relbarbgcolor': "darkblue",
144 'footerbgcolor': "lightslategray",
145
146 # Text, heading and code colouring
147 'codebgcolor': "lightyellow",
148 'codetextcolor': "firebrick",
149 'linkcolor': "mediumblue",
150 }
151
152# Add any paths that contain custom themes here, relative to this directory.
153#html_theme_path = []
154
155# The name for this set of Sphinx documents. If None, it defaults to
156# "<project> v<release> documentation".
157#html_title = None
158
159# A shorter title for the navigation bar. Default is the same as html_title.
160html_short_title = bzr_title(u"Table of Contents (%s)") % (release,)
161
162# The name of an image file (relative to this directory) to place at the top
163# of the sidebar.
164#html_logo = None
165
166# The name of an image file (within the static path) to use as favicon of the
167# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
168# pixels large.
169html_favicon = "bzr.ico"
170
171# Add any paths that contain custom static files (such as style sheets) here,
172# relative to this directory. They are copied after the builtin static files,
173# so a file named "default.css" will overwrite the builtin "default.css".
174html_static_path = ['_static']
175
176# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
177# using the given strftime format.
178#html_last_updated_fmt = '%b %d, %Y'
179
180# If true, SmartyPants will be used to convert quotes and dashes to
181# typographically correct entities.
182#html_use_smartypants = True
183
184# Custom sidebar templates, maps document names to template names.
185#html_sidebars = {}
186
187# Additional templates that should be rendered to pages, maps page names to
188# template names.
189#html_additional_pages = {'index': 'index.html'}
190
191# If false, no module index is generated.
192html_use_modindex = False
193
194# If false, no index is generated.
195html_use_index = False
196
197# If true, the index is split into individual pages for each letter.
198#html_split_index = False
199
200# If true, links to the reST sources are added to the pages.
201html_show_sourcelink = True
202
203# If true, an OpenSearch description file will be output, and all pages will
204# contain a <link> tag referring to it. The value of this option must be the
205# base URL from which the finished HTML is served.
206#html_use_opensearch = ''
207
208# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
209#html_file_suffix = ''
210
211# Output file base name for HTML help builder.
212htmlhelp_basename = 'bzr-%s-user-docs' % (bzr_locale,)
213
214
215# -- Options for LaTeX output --------------------------------------------------
216
217# The paper size ('letter' or 'a4').
218#latex_paper_size = 'letter'
219
220# The font size ('10pt', '11pt' or '12pt').
221#latex_font_size = '10pt'
222
223# Grouping the document tree into LaTeX files. List of tuples
224# (source start file, target name, title, author, documentclass [howto/manual]).
225latex_documents = [
226 # Manuals
227 #('user-guide/index', 'bzr-%s-user-guide.tex' % (bzr_locale,),
228 # bzr_title(u'Bazaar User Guide'), bzr_team, 'manual'),
229 #('user-reference/bzr_man', 'bzr-%s-user-reference.tex' % (bzr_locale,),
230 # bzr_title(u'Bazaar User Reference'), bzr_team, 'manual'),
231 #('release-notes/NEWS', 'bzr-%s-release-notes.tex' % (bzr_locale,),
232 # bzr_title(u'Bazaar Release Notes'), bzr_team, 'manual'),
233 #('upgrade-guide/index', 'bzr-%s-upgrade-guide.tex' % (bzr_locale,),
234 # bzr_title(u'Bazaar Upgrade Guide'), bzr_team, 'manual'),
235 # Tutorials
236 ('mini-tutorial/index', 'bzr-%s-tutorial-mini.tex' % (bzr_locale,),
237 bzr_title(u'Bazaar in five minutes'), bzr_team, 'howto'),
238 ('tutorials/tutorial', 'bzr-%s-tutorial.tex' % (bzr_locale,),
239 bzr_title(u'Bazaar Tutorial'), bzr_team, 'howto'),
240 ('tutorials/using_bazaar_with_launchpad',
241 'bzr-%s-tutorial-with-launchpad.tex' % (bzr_locale,),
242 bzr_title(u'Using Bazaar With Launchpad'), bzr_team, 'howto'),
243 ('tutorials/centralized_workflow',
244 'bzr-%s-tutorial-centralized.tex' % (bzr_locale,),
245 bzr_title(u'Centralized Workflow Tutorial'), bzr_team, 'howto'),
246]
247
248# The name of an image file (relative to this directory) to place at the top of
249# the title page.
250latex_logo = 'Bazaar-Logo-For-Manuals.png'
251
252# For "manual" documents, if this is true, then toplevel headings are parts,
253# not chapters.
254#latex_use_parts = False
255
256# Additional stuff for the LaTeX preamble.
257#latex_preamble = ''
258
259# Documents to append as an appendix to all manuals.
260#latex_appendices = []
261
262# If false, no module index is generated.
263#latex_use_modindex = True
0264
=== renamed file 'doc/index.ru.txt' => 'doc/ru/index.txt'
--- doc/index.ru.txt 2009-06-02 18:07:12 +0000
+++ doc/ru/index.txt 2009-09-07 05:26:43 +0000
@@ -3,45 +3,43 @@
3=================================3=================================
44
5Последняя версия этих документов доступа со страницы документации 5Последняя версия этих документов доступа со страницы документации
6на сайте Bazaar, <http://doc.bazaar-vcs.org/>. Еще больше информации 6на сайте Bazaar, <http://doc.bazaar-vcs.org/ru/>.
7можно получить по адресу <http://bazaar-vcs.org/Documentation>.7
8.. toctree::
9 :hidden:
10
11 user-guide/index
12 quick-reference/index
13 mini-tutorials/index
14 tutorials/tutorial
15 tutorials/using_bazaar_with_launchpad
16 tutorials/centralized_workflow
17
818
9Основная документация19Основная документация
10=====================20=====================
1121
12* `Руководство пользователя <ru/user-guide/index.html>`_22* `Руководство пользователя <user-guide/index.html>`_
1323
14* `Справочник пользователя <en/user-reference/bzr_man.html>`_ (англ.)24* `Карточка быстрого старта <quick-reference/index.html>`_
15
16* `Карточка быстрого старта <ru/quick-reference/quick-start-summary.svg>`_
17 (`PDF <ru/quick-reference/quick-start-summary.pdf>`_,
18 `PNG <ru/quick-reference/quick-start-summary.png>`_)
19
20* `Список изменений <en/release-notes/NEWS.html>`_ (англ.)
21
22* `Каталог информации для разработчиков <developers/index.html>`_ (англ.) |--|
23 для разработчиков Bazaar и плагинов
2425
25Учебники26Учебники
26========27========
2728
28* `Базар за пять минут <ru/mini-tutorial/index.html>`_29* `Базар за пять минут <mini-tutorial/index.html>`_
2930
30* `Большой учебник <ru/tutorials/tutorial.html>`_31* `Большой учебник <tutorials/tutorial.html>`_
3132
32* `Использование Bazaar с Launchpad 33* `Использование Bazaar с Launchpad
33 <ru/tutorials/using_bazaar_with_launchpad.html>`_34 <tutorials/using_bazaar_with_launchpad.html>`_
3435
35* `Работа в централизованном стиле36* `Работа в централизованном стиле
36 <ru/tutorials/centralized_workflow.html>`_37 <tutorials/centralized_workflow.html>`_
3738
38Ссылки в сети39Ссылки в сети
39=============40=============
4041
41* `Руководства по переходу <http://bazaar-vcs.org/BzrSwitching>`_42* `Руководство по миграции <http://doc.bazaar-vcs.org/migration/en/>`_
42 |--| для пользователей переходящих с других систем контроля версий
43
44* `Руководство по миграции <http://bazaar-vcs.org/BzrMigration>`_
45 |--| для команд переносящих историю с других систем контроля версий43 |--| для команд переносящих историю с других систем контроля версий
4644
47* `Словарь терминов <http://bazaar-vcs.org/BzrGlossary>`_ (англ.), 45* `Словарь терминов <http://bazaar-vcs.org/BzrGlossary>`_ (англ.),
@@ -49,13 +47,8 @@
49 47
50__ http://groups.google.com/group/ru_bzr/web/%D0%B3%D0%BB%D0%BE%D1%81%D1%81%D0%B0%D1%80%D0%B8%D0%B948__ http://groups.google.com/group/ru_bzr/web/%D0%B3%D0%BB%D0%BE%D1%81%D1%81%D0%B0%D1%80%D0%B8%D0%B9
5149
52* `Часто задаваемые вопросы <http://bazaar-vcs.org/FAQ>`_ (англ.)50* `Часто задаваемые вопросы <https://answers.launchpad.net/bzr>`_ (англ.)
5351
54Другие языки
55============
56
57* `Документация на английском <index.html>`_ |--| English Documentation
58* `Документация на испанском <index.es.html>`_
5952
60.. |--| unicode:: U+201453.. |--| unicode:: U+2014
6154
6255
=== added file 'doc/ru/make.bat'
--- doc/ru/make.bat 1970-01-01 00:00:00 +0000
+++ doc/ru/make.bat 2009-09-07 05:26:43 +0000
@@ -0,0 +1,112 @@
1@ECHO OFF
2
3REM Command file for Sphinx documentation
4
5set SPHINXBUILD=sphinx-build
6set ALLSPHINXOPTS=-d _build/doctrees %SPHINXOPTS% .
7if NOT "%PAPER%" == "" (
8 set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
9)
10
11if "%1" == "" goto help
12
13if "%1" == "help" (
14 :help
15 echo.Please use `make ^<target^>` where ^<target^> is one of
16 echo. html to make standalone HTML files
17 echo. dirhtml to make HTML files named index.html in directories
18 echo. pickle to make pickle files
19 echo. json to make JSON files
20 echo. htmlhelp to make HTML files and a HTML help project
21 echo. qthelp to make HTML files and a qthelp project
22 echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter
23 echo. changes to make an overview over all changed/added/deprecated items
24 echo. linkcheck to check all external links for integrity
25 echo. doctest to run all doctests embedded in the documentation if enabled
26 goto end
27)
28
29if "%1" == "clean" (
30 for /d %%i in (_build\*) do rmdir /q /s %%i
31 del /q /s _build\*
32 goto end
33)
34
35if "%1" == "html" (
36 %SPHINXBUILD% -b html %ALLSPHINXOPTS% _build/html
37 echo.
38 echo.Build finished. The HTML pages are in _build/html.
39 goto end
40)
41
42if "%1" == "dirhtml" (
43 %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% _build/dirhtml
44 echo.
45 echo.Build finished. The HTML pages are in _build/dirhtml.
46 goto end
47)
48
49if "%1" == "pickle" (
50 %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% _build/pickle
51 echo.
52 echo.Build finished; now you can process the pickle files.
53 goto end
54)
55
56if "%1" == "json" (
57 %SPHINXBUILD% -b json %ALLSPHINXOPTS% _build/json
58 echo.
59 echo.Build finished; now you can process the JSON files.
60 goto end
61)
62
63if "%1" == "htmlhelp" (
64 %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% _build/htmlhelp
65 echo.
66 echo.Build finished; now you can run HTML Help Workshop with the ^
67.hhp project file in _build/htmlhelp.
68 goto end
69)
70
71if "%1" == "qthelp" (
72 %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% _build/qthelp
73 echo.
74 echo.Build finished; now you can run "qcollectiongenerator" with the ^
75.qhcp project file in _build/qthelp, like this:
76 echo.^> qcollectiongenerator _build\qthelp\Bazaar.qhcp
77 echo.To view the help file:
78 echo.^> assistant -collectionFile _build\qthelp\Bazaar.ghc
79 goto end
80)
81
82if "%1" == "latex" (
83 %SPHINXBUILD% -b latex %ALLSPHINXOPTS% _build/latex
84 echo.
85 echo.Build finished; the LaTeX files are in _build/latex.
86 goto end
87)
88
89if "%1" == "changes" (
90 %SPHINXBUILD% -b changes %ALLSPHINXOPTS% _build/changes
91 echo.
92 echo.The overview file is in _build/changes.
93 goto end
94)
95
96if "%1" == "linkcheck" (
97 %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% _build/linkcheck
98 echo.
99 echo.Link check complete; look for any errors in the above output ^
100or in _build/linkcheck/output.txt.
101 goto end
102)
103
104if "%1" == "doctest" (
105 %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% _build/doctest
106 echo.
107 echo.Testing of doctests in the sources finished, look at the ^
108results in _build/doctest/output.txt.
109 goto end
110)
111
112:end
0113
=== added file 'doc/ru/quick-reference/index.txt'
--- doc/ru/quick-reference/index.txt 1970-01-01 00:00:00 +0000
+++ doc/ru/quick-reference/index.txt 2009-09-07 05:26:43 +0000
@@ -0,0 +1,6 @@
1Карточка быстрого старта
2========================
3
4* `SVG <../_static/ru/bzr-quick-reference.svg>`_
5* `PDF <../_static/ru/bzr-quick-reference.pdf>`_
6* `PNG <../_static/ru/bzr-quick-reference.png>`_
07
=== 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