Merge lp:~ian-clatworthy/bzr/pdf-chm-docs-for-2.0 into lp:bzr/2.0
- pdf-chm-docs-for-2.0
- Merge into 2.0
Proposed by
Ian Clatworthy
Status: | Merged |
---|---|
Merge reported by: | Martin Pool |
Merged at revision: | not available |
Proposed branch: | lp:~ian-clatworthy/bzr/pdf-chm-docs-for-2.0 |
Merge into: | lp:bzr/2.0 |
Diff against target: | None lines |
To merge this branch: | bzr merge lp:~ian-clatworthy/bzr/pdf-chm-docs-for-2.0 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
bzr-core | Pending | ||
Review via email: mp+11182@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote : | # |
Revision history for this message
Martin Pool (mbp) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file '.bzrignore' |
2 | --- .bzrignore 2009-07-31 19:56:19 +0000 |
3 | +++ .bzrignore 2009-09-03 05:09:22 +0000 |
4 | @@ -53,6 +53,7 @@ |
5 | bzrlib/_rio_pyx.c |
6 | bzrlib/_walkdirs_win32.c |
7 | doc/en/release-notes/NEWS.txt |
8 | +doc/en/release-notes/bzr* |
9 | doc/en/developer-guide/HACKING.txt |
10 | doc/en/user-reference/bzr_man.txt |
11 | # built extension modules |
12 | |
13 | === modified file 'Makefile' |
14 | --- Makefile 2009-08-03 20:38:39 +0000 |
15 | +++ Makefile 2009-09-03 05:20:04 +0000 |
16 | @@ -183,8 +183,8 @@ |
17 | doc/en/user-reference/bzr_man.txt: $(MAN_DEPENDENCIES) |
18 | $(PYTHON) tools/generate_docs.py -o $@ rstx |
19 | |
20 | -doc/en/release-notes/NEWS.txt: NEWS |
21 | - $(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')" |
22 | +doc/en/release-notes/NEWS.txt: NEWS tools/generate_release_notes.py |
23 | + $(PYTHON) tools/generate_release_notes.py NEWS $@ |
24 | |
25 | MAN_PAGES = man1/bzr.1 |
26 | man1/bzr.1: $(MAN_DEPENDENCIES) |
27 | @@ -206,8 +206,8 @@ |
28 | WEB_DOCS = $(derived_web_docs) $(non_txt_files) |
29 | ALL_DOCS = $(derived_web_docs) $(MAN_PAGES) |
30 | |
31 | -# the main target to build all the docs |
32 | -docs: $(ALL_DOCS) |
33 | +# the target to build all the old-style docs |
34 | +old-docs: $(ALL_DOCS) |
35 | |
36 | # produce a tree containing just the final docs, ready for uploading to the web |
37 | HTMLDIR := html_docs |
38 | @@ -223,6 +223,13 @@ |
39 | $(HTMLDIR) $(derived_txt_files) |
40 | rm -f doc/*/user-guide/*.pdf |
41 | rm -rf doc/*/user-guide/latex_prepared |
42 | + cd doc && make clean |
43 | + |
44 | +# The main target to build all the new-style docs. Requires Sphinx. |
45 | +docs: doc/en/release-notes/NEWS.txt doc/en/user-reference/bzr_man.txt |
46 | + cd doc && make html |
47 | + cd doc && make latex |
48 | + cd doc/_build/latex && make all-pdf |
49 | |
50 | |
51 | ### Windows Support ### |
52 | |
53 | === modified file 'NEWS' |
54 | --- NEWS 2009-09-04 02:58:22 +0000 |
55 | +++ NEWS 2009-09-04 05:20:37 +0000 |
56 | @@ -3,9 +3,6 @@ |
57 | #################### |
58 | |
59 | |
60 | -.. contents:: List of Releases |
61 | - :depth: 1 |
62 | - |
63 | bzr 2.0rc2 (not released yet) |
64 | ############################# |
65 | |
66 | @@ -53,13 +50,17 @@ |
67 | * Help on hooks no longer says 'Not deprecated' for hooks that are |
68 | currently supported. (Ian Clatworthy, #422415) |
69 | |
70 | +* PDF and CHM (Windows HtmlHelp) formats are now supported for the |
71 | + user documentation. The HTML documentation is better broken up into |
72 | + topics. (Ian Clatworthy) |
73 | + |
74 | * The main table of contents now provides links to the new Migration Docs |
75 | and Plugins Guide. (Ian Clatworthy) |
76 | |
77 | + |
78 | bzr 2.0rc1 |
79 | ########## |
80 | |
81 | - |
82 | :Codename: no worries |
83 | :2.0rc1: 2009-08-26 |
84 | |
85 | @@ -524,8 +525,8 @@ |
86 | ``countTestsCases``. (Robert Collins) |
87 | |
88 | |
89 | -bzr 1.17 "So late it's brunch" 2009-07-20 |
90 | -######################################### |
91 | +bzr 1.17 |
92 | +######## |
93 | :Codename: so-late-its-brunch |
94 | :1.17rc1: 2009-07-13 |
95 | :1.17: 2009-07-20 |
96 | @@ -774,8 +775,10 @@ |
97 | this class and the UI. (Martin Pool) |
98 | |
99 | |
100 | -bzr 1.16.1 2009-06-26 |
101 | -##################### |
102 | +bzr 1.16.1 |
103 | +########## |
104 | + |
105 | +:Released: 2009-06-26 |
106 | |
107 | End user testing of the 2a format revealed two serious bugs. The first, |
108 | #365615, caused bzr to raise AbsentContentFactory errors when autopacking. |
109 | @@ -830,8 +833,8 @@ |
110 | (Robert Collins, #376748) |
111 | |
112 | |
113 | -bzr 1.16 "It's yesterday in California" 2009-06-18 |
114 | -################################################## |
115 | +bzr 1.16 |
116 | +######## |
117 | :Codename: yesterday-in-california |
118 | :1.16rc1: 2009-06-11 |
119 | :1.16: 2009-06-18 |
120 | @@ -2305,8 +2308,11 @@ |
121 | (Vincent Ladeuil) |
122 | |
123 | |
124 | -bzr 1.11 "Eyes up!" 2009-01-19 |
125 | -############################## |
126 | +bzr 1.11 |
127 | +######## |
128 | + |
129 | +:Codename: "Eyes up!" |
130 | +:Released: 2009-01-19 |
131 | |
132 | This first monthly release of Bazaar for 2009 improves Bazaar's operation |
133 | in Windows, Mac OS X, and other situations where file names are matched |
134 | @@ -2332,8 +2338,11 @@ |
135 | |
136 | |
137 | |
138 | -bzr 1.11rc1 "Eyes up!" 2009-01-09 |
139 | -################################# |
140 | +bzr 1.11rc1 |
141 | +########### |
142 | + |
143 | +:Codename: "Eyes up!" |
144 | +:Released: 2009-01-09 |
145 | |
146 | Changes |
147 | ******* |
148 | @@ -2569,8 +2578,10 @@ |
149 | |
150 | |
151 | |
152 | -bzr 1.10 2008-12-05 |
153 | -################### |
154 | +bzr 1.10 |
155 | +######## |
156 | + |
157 | +:Released: 2008-12-05 |
158 | |
159 | Bazaar 1.10 has several performance improvements for copying revisions |
160 | (especially for small updates to large projects). There has also been a |
161 | @@ -2595,8 +2606,10 @@ |
162 | topologically. (John Arbash Meinel, #304841) |
163 | |
164 | |
165 | -bzr 1.10rc1 2008-11-28 |
166 | -###################### |
167 | +bzr 1.10rc1 |
168 | +########### |
169 | + |
170 | +:Released: 2008-11-28 |
171 | |
172 | This release of Bazaar focuses on performance improvements when pushing |
173 | and pulling revisions, both locally and to remote networks. The popular |
174 | @@ -2716,8 +2729,10 @@ |
175 | * Doctests now only report the first failure. (Martin Pool) |
176 | |
177 | |
178 | -bzr 1.9 2008-11-07 |
179 | -################## |
180 | +bzr 1.9 |
181 | +####### |
182 | + |
183 | +:Released: 2008-11-07 |
184 | |
185 | This release of Bazaar adds a new repository format, ``1.9``, with smaller |
186 | and more efficient index files. This format can be specified when |
187 | @@ -2739,8 +2754,10 @@ |
188 | (John Arbash Meinel, #293746) |
189 | |
190 | |
191 | -bzr 1.9rc1 2008-10-31 |
192 | -##################### |
193 | +bzr 1.9rc1 |
194 | +########## |
195 | + |
196 | +:Released: 2008-10-31 |
197 | |
198 | New Features |
199 | ************ |
200 | @@ -2857,8 +2874,10 @@ |
201 | configuration of authetication credentials. |
202 | |
203 | |
204 | -bzr 1.8 2008-10-16 |
205 | -################## |
206 | +bzr 1.8 |
207 | +####### |
208 | + |
209 | +:Released: 2008-10-16 |
210 | |
211 | Bazaar 1.8 includes several fixes that improve working tree performance, |
212 | display of revision logs, and merges. The bzr testsuite now passes on OS |
213 | @@ -2879,8 +2898,10 @@ |
214 | that platform. (Alexander Belchenko, Martin Pool, #277481) |
215 | |
216 | |
217 | -bzr 1.8rc1 2008-10-07 |
218 | -##################### |
219 | +bzr 1.8rc1 |
220 | +########## |
221 | + |
222 | +:Released: 2008-10-07 |
223 | |
224 | Changes |
225 | ******* |
226 | @@ -3078,14 +3099,18 @@ |
227 | (Vincent Ladeuil) |
228 | |
229 | |
230 | -bzr 1.7.1 2008-10-01 |
231 | -#################### |
232 | +bzr 1.7.1 |
233 | +######### |
234 | + |
235 | +:Released: 2008-10-01 |
236 | |
237 | No changes from 1.7.1rc1. |
238 | |
239 | |
240 | -bzr 1.7.1rc1 2008-09-24 |
241 | -####################### |
242 | +bzr 1.7.1rc1 |
243 | +############ |
244 | + |
245 | +:Released: 2008-09-24 |
246 | |
247 | This release just includes an update to how the merge algorithm handles |
248 | file paths when we encounter complex history. |
249 | @@ -3100,8 +3125,10 @@ |
250 | (John Arbash Meinel) |
251 | |
252 | |
253 | -bzr 1.7 2008-09-23 |
254 | -################## |
255 | +bzr 1.7 |
256 | +####### |
257 | + |
258 | +:Released: 2008-09-23 |
259 | |
260 | This release includes many bug fixes and a few performance and feature |
261 | improvements. ``bzr rm`` will now scan for missing files and remove them, |
262 | @@ -3118,8 +3145,10 @@ |
263 | packaging qbzr. (Mark Hammond) |
264 | |
265 | |
266 | -bzr 1.7rc2 2008-09-17 |
267 | -##################### |
268 | +bzr 1.7rc2 |
269 | +########## |
270 | + |
271 | +:Released: 2008-09-17 |
272 | |
273 | A few bug fixes from 1.7rc1. The biggest change is a new |
274 | ``RemoteBranch.get_stacked_on_url`` rpc. This allows clients that are |
275 | @@ -3143,8 +3172,10 @@ |
276 | (Andrew Bennetts) |
277 | |
278 | |
279 | -bzr 1.7rc1 2008-09-09 |
280 | -##################### |
281 | +bzr 1.7rc1 |
282 | +########## |
283 | + |
284 | +:Released: 2008-09-09 |
285 | |
286 | This release candidate for bzr 1.7 has several bug fixes and a few |
287 | performance and feature improvements. ``bzr rm`` will now scan for |
288 | @@ -3341,16 +3372,20 @@ |
289 | clients now use this mechanism. (Neil Martinsen-Burrell) |
290 | |
291 | |
292 | -bzr 1.6.1 2008-09-05 |
293 | -#################### |
294 | +bzr 1.6.1 |
295 | +######### |
296 | + |
297 | +:Released: 2008-09-05 |
298 | |
299 | A couple regressions were found in the 1.6 release. There was a |
300 | performance issue when using ``bzr+ssh`` to branch large repositories, |
301 | and some problems with stacking and ``rich-root`` capable repositories. |
302 | |
303 | |
304 | -bzr 1.6.1rc2 2008-09-03 |
305 | -####################### |
306 | +bzr 1.6.1rc2 |
307 | +############ |
308 | + |
309 | +:Released: 2008-09-03 |
310 | |
311 | Bug Fixes |
312 | ********* |
313 | @@ -3361,8 +3396,10 @@ |
314 | (John Arbash Meinel, #264321) |
315 | |
316 | |
317 | -bzr 1.6.1rc1 2008-08-29 |
318 | -####################### |
319 | +bzr 1.6.1rc1 |
320 | +############ |
321 | + |
322 | +:Released: 2008-08-29 |
323 | |
324 | This release fixes a few regressions found in the 1.6 client. Fetching |
325 | changes was using an O(N^2) buffering algorithm, so for large projects it |
326 | @@ -3402,8 +3439,10 @@ |
327 | (John Arbash Meinel, #262333) |
328 | |
329 | |
330 | -bzr 1.6 2008-08-25 |
331 | -################## |
332 | +bzr 1.6 |
333 | +####### |
334 | + |
335 | +:Released: 2008-08-25 |
336 | |
337 | Finally, the long awaited bzr 1.6 has been released. This release includes |
338 | new features like Stacked Branches, improved weave merge, and an updated |
339 | @@ -3416,8 +3455,10 @@ |
340 | TortoiseBzr in the standalone Windows installer. |
341 | |
342 | |
343 | -bzr 1.6rc5 2008-08-19 |
344 | -##################### |
345 | +bzr 1.6rc5 |
346 | +########## |
347 | + |
348 | +:Released: 2008-08-19 |
349 | |
350 | Bug Fixes |
351 | ********* |
352 | @@ -3429,8 +3470,10 @@ |
353 | (This change was reverted when merged to bzr.dev) |
354 | |
355 | |
356 | -bzr 1.6rc4 2008-08-18 |
357 | -##################### |
358 | +bzr 1.6rc4 |
359 | +########## |
360 | + |
361 | +:Released: 2008-08-18 |
362 | |
363 | Bug Fixes |
364 | ********* |
365 | @@ -3440,8 +3483,10 @@ |
366 | rather than preserving deltas. (John Arbash Meinel, #256757) |
367 | |
368 | |
369 | -bzr 1.6rc3 2008-08-14 |
370 | -##################### |
371 | +bzr 1.6rc3 |
372 | +########## |
373 | + |
374 | +:Released: 2008-08-14 |
375 | |
376 | Changes |
377 | ******* |
378 | @@ -3474,8 +3519,10 @@ |
379 | development which is substantially faster. (Robert Collins) |
380 | |
381 | |
382 | -bzr 1.6rc2 2008-08-13 |
383 | -##################### |
384 | +bzr 1.6rc2 |
385 | +########## |
386 | + |
387 | +:Released: 2008-08-13 |
388 | |
389 | This release candidate has a few minor bug fixes, and some regression |
390 | fixes for Windows. |
391 | @@ -3513,8 +3560,10 @@ |
392 | will get the same results. (John Arbash Meinel, #232188) |
393 | |
394 | |
395 | -bzr 1.6rc1 2008-08-06 |
396 | -##################### |
397 | +bzr 1.6rc1 |
398 | +########## |
399 | + |
400 | +:Released: 2008-08-06 |
401 | |
402 | This release candidate for bzr 1.6 solidifies the new branch stacking |
403 | feature. Bazaar now recommends that users upgrade all knit repositories, |
404 | @@ -3650,8 +3699,10 @@ |
405 | (Ian Clatworthy) |
406 | |
407 | |
408 | -bzr 1.6beta3 2008-07-17 |
409 | -####################### |
410 | +bzr 1.6beta3 |
411 | +############ |
412 | + |
413 | +:Released: 2008-07-17 |
414 | |
415 | This release adds a new 'stacked branches' feature allowing branches to |
416 | share storage without being in the same repository or on the same machine. |
417 | @@ -3823,8 +3874,10 @@ |
418 | (Robert Collins) |
419 | |
420 | |
421 | -bzr 1.6beta2 2008-06-10 |
422 | -####################### |
423 | +bzr 1.6beta2 |
424 | +############ |
425 | + |
426 | +:Released: 2008-06-10 |
427 | |
428 | This release contains further progress towards our 1.6 goals of shallow |
429 | repositories, and contains a fix for some user-affecting bugs in the |
430 | @@ -3907,9 +3960,10 @@ |
431 | * Knit record serialisation is now stricter on what it will accept, to |
432 | guard against potential internal bugs, or broken input. (Robert Collins) |
433 | |
434 | -bzr 1.6beta1 2008-06-02 |
435 | -####################### |
436 | +bzr 1.6beta1 |
437 | +############ |
438 | |
439 | +:Released: 2008-06-02 |
440 | |
441 | Commands that work on the revision history such as push, pull, missing, |
442 | uncommit and log are now substantially faster. This release adds a |
443 | @@ -4127,8 +4181,10 @@ |
444 | (Martin Pool) |
445 | |
446 | |
447 | -bzr 1.5 2008-05-16 |
448 | -################## |
449 | +bzr 1.5 |
450 | +####### |
451 | + |
452 | +:Released: 2008-05-16 |
453 | |
454 | This release of Bazaar includes several updates to the documentation, and fixes |
455 | to prepare for making rich root support the default format. Many bugs have been |
456 | @@ -4149,8 +4205,10 @@ |
457 | (Ian Clatworthy) |
458 | |
459 | |
460 | -bzr 1.5rc1 2008-05-09 |
461 | -##################### |
462 | +bzr 1.5rc1 |
463 | +########## |
464 | + |
465 | +:Released: 2008-05-09 |
466 | |
467 | Changes |
468 | ******* |
469 | @@ -4320,8 +4378,10 @@ |
470 | (Martin Pool) |
471 | |
472 | |
473 | -bzr 1.4 2008-04-28 |
474 | -################## |
475 | +bzr 1.4 |
476 | +####### |
477 | + |
478 | +:Released: 2008-04-28 |
479 | |
480 | This release of Bazaar includes handy improvements to the speed of log and |
481 | status, new options for several commands, improved documentation, and better |
482 | @@ -4340,8 +4400,10 @@ |
483 | (John Arbash Meinel, Andrew Bennetts, #214894) |
484 | |
485 | |
486 | -bzr 1.4rc2 2008-04-21 |
487 | -##################### |
488 | +bzr 1.4rc2 |
489 | +########## |
490 | + |
491 | +:Released: 2008-04-21 |
492 | |
493 | Bug Fixes |
494 | ********* |
495 | @@ -4364,8 +4426,10 @@ |
496 | (Robert Collins, John Arbash Meinel) |
497 | |
498 | |
499 | -bzr 1.4rc1 2008-04-11 |
500 | -##################### |
501 | +bzr 1.4rc1 |
502 | +########## |
503 | + |
504 | +:Released: 2008-04-11 |
505 | |
506 | Changes |
507 | ******* |
508 | @@ -4652,14 +4716,18 @@ |
509 | ``Graph.get_parent_map`` returns a dict of key:parents. (Robert Collins) |
510 | |
511 | |
512 | -bzr 1.3.1 2008-04-09 |
513 | -#################### |
514 | +bzr 1.3.1 |
515 | +######### |
516 | + |
517 | +:Released: 2008-04-09 |
518 | |
519 | No changes from 1.3.1rc1. |
520 | |
521 | |
522 | -bzr 1.3.1rc1 2008-04-04 |
523 | -####################### |
524 | +bzr 1.3.1rc1 |
525 | +############ |
526 | + |
527 | +:Released: 2008-04-04 |
528 | |
529 | Bug Fixes |
530 | ********* |
531 | @@ -4670,8 +4738,10 @@ |
532 | (#208418, Andrew Bennetts, Martin Pool, Robert Collins) |
533 | |
534 | |
535 | -bzr 1.3 2008-03-20 |
536 | -################## |
537 | +bzr 1.3 |
538 | +####### |
539 | + |
540 | +:Released: 2008-03-20 |
541 | |
542 | Bazaar has become part of the GNU project <http://www.gnu.org> |
543 | |
544 | @@ -4687,8 +4757,10 @@ |
545 | (#202778, Martin Pool) |
546 | |
547 | |
548 | -bzr 1.3rc1 2008-03-16 |
549 | -##################### |
550 | +bzr 1.3rc1 |
551 | +########## |
552 | + |
553 | +:Released: 2008-03-16 |
554 | |
555 | Notes When Upgrading |
556 | ******************** |
557 | @@ -4874,8 +4946,10 @@ |
558 | format. (Robert Collins) |
559 | |
560 | |
561 | -bzr 1.2 2008-02-15 |
562 | -################## |
563 | +bzr 1.2 |
564 | +####### |
565 | + |
566 | +:Released: 2008-02-15 |
567 | |
568 | Bug Fixes |
569 | ********* |
570 | @@ -4883,8 +4957,10 @@ |
571 | * Fix failing test in Launchpad plugin. (Martin Pool) |
572 | |
573 | |
574 | -bzr 1.2rc1 2008-02-13 |
575 | -##################### |
576 | +bzr 1.2rc1 |
577 | +########## |
578 | + |
579 | +:Released: 2008-02-13 |
580 | |
581 | Notes When Upgrading |
582 | ******************** |
583 | @@ -5085,13 +5161,17 @@ |
584 | revision names etc. (Robert Collins) |
585 | |
586 | |
587 | -bzr 1.1 2008-01-15 |
588 | -################## |
589 | +bzr 1.1 |
590 | +####### |
591 | + |
592 | +:Released: 2008-01-15 |
593 | |
594 | (no changes from 1.1rc1) |
595 | |
596 | -bzr 1.1rc1 2008-01-05 |
597 | -##################### |
598 | +bzr 1.1rc1 |
599 | +########## |
600 | + |
601 | +:Released: 2008-01-05 |
602 | |
603 | Changes |
604 | ******* |
605 | @@ -5301,8 +5381,10 @@ |
606 | replaced by the new helper methods added in this release. (Robert Collins) |
607 | |
608 | |
609 | -bzr 1.0 2007-12-14 |
610 | -################## |
611 | +bzr 1.0 |
612 | +####### |
613 | + |
614 | +:Released: 2007-12-14 |
615 | |
616 | Documentation |
617 | ************* |
618 | @@ -5319,8 +5401,10 @@ |
619 | (Ian Clatworthy) |
620 | |
621 | |
622 | -bzr 1.0rc3 2007-12-11 |
623 | -##################### |
624 | +bzr 1.0rc3 |
625 | +########## |
626 | + |
627 | +:Released: 2007-12-11 |
628 | |
629 | Changes |
630 | ******* |
631 | @@ -5361,8 +5445,10 @@ |
632 | (Vincent Ladeuil) |
633 | |
634 | |
635 | -bzr 1.0rc2 2007-12-07 |
636 | -##################### |
637 | +bzr 1.0rc2 |
638 | +########## |
639 | + |
640 | +:Released: 2007-12-07 |
641 | |
642 | Improvements |
643 | ************ |
644 | @@ -5436,8 +5522,10 @@ |
645 | ``started`` methods. (Matt Nordhoff) |
646 | |
647 | |
648 | -bzr 1.0rc1 2007-11-30 |
649 | -##################### |
650 | +bzr 1.0rc1 |
651 | +########## |
652 | + |
653 | +:Released: 2007-11-30 |
654 | |
655 | Notes When Upgrading |
656 | ******************** |
657 | @@ -5713,8 +5801,10 @@ |
658 | * InventoryEntry.diff is now deprecated. Please use diff.DiffTree instead. |
659 | |
660 | |
661 | -bzr 0.92 2007-11-05 |
662 | -################### |
663 | +bzr 0.92 |
664 | +######## |
665 | + |
666 | +:Released: 2007-11-05 |
667 | |
668 | Changes |
669 | ******* |
670 | @@ -5722,8 +5812,10 @@ |
671 | * New uninstaller on Win32. (Alexander Belchenko) |
672 | |
673 | |
674 | -bzr 0.92rc1 2007-10-29 |
675 | -###################### |
676 | +bzr 0.92rc1 |
677 | +########### |
678 | + |
679 | +:Released: 2007-10-29 |
680 | |
681 | Changes |
682 | ******* |
683 | @@ -6042,8 +6134,10 @@ |
684 | raises a Python warning. (Martin Pool) |
685 | |
686 | |
687 | -bzr 0.91 2007-09-26 |
688 | -################### |
689 | +bzr 0.91 |
690 | +######## |
691 | + |
692 | +:Released: 2007-09-26 |
693 | |
694 | Bug Fixes |
695 | ********* |
696 | @@ -6064,15 +6158,19 @@ |
697 | (Andrew Bennetts) |
698 | |
699 | |
700 | -bzr 0.91rc2 2007-09-11 |
701 | -###################### |
702 | +bzr 0.91rc2 |
703 | +########### |
704 | + |
705 | +:Released: 2007-09-11 |
706 | |
707 | * Replaced incorrect tarball for previous release; a debug statement was left |
708 | in bzrlib/remote.py. |
709 | |
710 | |
711 | -bzr 0.91rc1 2007-09-11 |
712 | -###################### |
713 | +bzr 0.91rc1 |
714 | +########### |
715 | + |
716 | +:Released: 2007-09-11 |
717 | |
718 | Changes |
719 | ******* |
720 | @@ -6399,8 +6497,10 @@ |
721 | [] to revert all files is deprecated. (Aaron Bentley) |
722 | |
723 | |
724 | -bzr 0.90 2007-08-28 |
725 | -################### |
726 | +bzr 0.90 |
727 | +######## |
728 | + |
729 | +:Released: 2007-08-28 |
730 | |
731 | Improvements |
732 | ************ |
733 | @@ -6423,8 +6523,10 @@ |
734 | and call ``create_repository`` on that. (Martin Pool) |
735 | |
736 | |
737 | -bzr 0.90rc1 2007-08-14 |
738 | -###################### |
739 | +bzr 0.90rc1 |
740 | +########### |
741 | + |
742 | +:Released: 2007-08-14 |
743 | |
744 | Bugfixes |
745 | ******** |
746 | @@ -6696,8 +6798,10 @@ |
747 | parameter. Varargs-style parameters are deprecated. (Aaron Bentley) |
748 | |
749 | |
750 | -bzr 0.18 2007-07-17 |
751 | -#################### |
752 | +bzr 0.18 |
753 | +######## |
754 | + |
755 | +:Released: 2007-07-17 |
756 | |
757 | Bugfixes |
758 | ******** |
759 | @@ -6705,8 +6809,10 @@ |
760 | * Fix 'bzr add' crash under Win32 (Kuno Meyer) |
761 | |
762 | |
763 | -bzr 0.18rc1 2007-07-10 |
764 | -####################### |
765 | +bzr 0.18rc1 |
766 | +########### |
767 | + |
768 | +:Released: 2007-07-10 |
769 | |
770 | Bugfixes |
771 | ******** |
772 | @@ -6957,8 +7063,10 @@ |
773 | (Vincent Ladeuil, #110448) |
774 | |
775 | |
776 | -bzr 0.17 2007-06-18 |
777 | -#################### |
778 | +bzr 0.17 |
779 | +######## |
780 | + |
781 | +:Released: 2007-06-18 |
782 | |
783 | Bugfixes |
784 | ******** |
785 | @@ -6970,8 +7078,10 @@ |
786 | (Aaron Bentley, Ian Clatworthy, #120930) |
787 | |
788 | |
789 | -bzr 0.17rc1 2007-06-12 |
790 | -####################### |
791 | +bzr 0.17rc1 |
792 | +########### |
793 | + |
794 | +:Released: 2007-06-12 |
795 | |
796 | Notes When Upgrading |
797 | ******************** |
798 | @@ -7072,8 +7182,10 @@ |
799 | your repository. (Previously Branch6 only supported revisions in your |
800 | mainline). (John Arbash Meinel, #115343) |
801 | |
802 | -bzr 0.16 2007-05-07 |
803 | -#################### |
804 | +bzr 0.16 |
805 | +######## |
806 | + |
807 | +:Released: 2007-05-07 |
808 | |
809 | Bugfixes |
810 | ******** |
811 | @@ -7103,8 +7215,10 @@ |
812 | diff`` and ``bzr status`` significantly improving the speed of |
813 | both. (John Arbash Meinel) |
814 | |
815 | -bzr 0.16rc2 2007-04-30 |
816 | -####################### |
817 | +bzr 0.16rc2 |
818 | +########### |
819 | + |
820 | +:Released: 2007-04-30 |
821 | |
822 | Bugfixes |
823 | ******** |
824 | @@ -7127,8 +7241,10 @@ |
825 | * ``WorkingTree4._iter_changes`` should not descend into unversioned |
826 | directories. (John Arbash Meinel, #110399) |
827 | |
828 | -bzr 0.16rc1 2007-04-26 |
829 | -####################### |
830 | +bzr 0.16rc1 |
831 | +########### |
832 | + |
833 | +:Released: 2007-04-26 |
834 | |
835 | Notes When Upgrading |
836 | ******************** |
837 | @@ -7435,8 +7551,10 @@ |
838 | implementation of new auth schemes for both http and proxy. |
839 | (Vincent Ladeuil) |
840 | |
841 | -bzr 0.15 2007-04-01 |
842 | -################### |
843 | +bzr 0.15 |
844 | +######## |
845 | + |
846 | +:Released: 2007-04-01 |
847 | |
848 | Bugfixes |
849 | ******** |
850 | @@ -7448,8 +7566,10 @@ |
851 | checking out a branch that contains an old-format working tree. |
852 | (Martin Pool) |
853 | |
854 | -bzr 0.15rc3 2007-03-26 |
855 | -####################### |
856 | +bzr 0.15rc3 |
857 | +########### |
858 | + |
859 | +:Released: 2007-03-26 |
860 | |
861 | Changes |
862 | ******* |
863 | @@ -7524,8 +7644,10 @@ |
864 | * Correctly handles mutiple permanent http redirections. |
865 | (vila, #88780) |
866 | |
867 | -bzr 0.15rc2 2007-03-14 |
868 | -####################### |
869 | +bzr 0.15rc2 |
870 | +########### |
871 | + |
872 | +:Released: 2007-03-14 |
873 | |
874 | Notes When Upgrading |
875 | ******************** |
876 | @@ -7578,8 +7700,10 @@ |
877 | (Wouter van Heyst, #53483) |
878 | |
879 | |
880 | -bzr 0.15rc1 2007-03-07 |
881 | -####################### |
882 | +bzr 0.15rc1 |
883 | +########### |
884 | + |
885 | +:Released: 2007-03-07 |
886 | |
887 | Surprises |
888 | ********* |
889 | @@ -7809,8 +7933,10 @@ |
890 | before the rest of the suite. (Martin Pool) |
891 | |
892 | |
893 | -bzr 0.14 2007-01-23 |
894 | -#################### |
895 | +bzr 0.14 |
896 | +######## |
897 | + |
898 | +:Released: 2007-01-23 |
899 | |
900 | Improvements |
901 | ************ |
902 | @@ -7829,8 +7955,10 @@ |
903 | it is in is below a repository. (James Westby, #77306) |
904 | |
905 | |
906 | -bzr 0.14rc1 2007-01-16 |
907 | -####################### |
908 | +bzr 0.14rc1 |
909 | +########### |
910 | + |
911 | +:Released: 2007-01-16 |
912 | |
913 | Improvements |
914 | ************ |
915 | @@ -7964,14 +8092,18 @@ |
916 | (Alexander Belchenko, #68124) |
917 | |
918 | |
919 | -bzr 0.13 2006-12-05 |
920 | -#################### |
921 | +bzr 0.13 |
922 | +######## |
923 | + |
924 | +:Released: 2006-12-05 |
925 | |
926 | No changes from 0.13rc |
927 | |
928 | |
929 | -bzr 0.13rc1 2006-11-27 |
930 | -####################### |
931 | +bzr 0.13rc1 |
932 | +########### |
933 | + |
934 | +:Released: 2006-11-27 |
935 | |
936 | Improvements |
937 | ************ |
938 | @@ -8096,8 +8228,10 @@ |
939 | * TestingHTTPRequestHandler really handles the Range header |
940 | (previously it was ignoring it and returning the whole file,). |
941 | |
942 | -bzr 0.12 2006-10-30 |
943 | -#################### |
944 | +bzr 0.12 |
945 | +######## |
946 | + |
947 | +:Released: 2006-10-30 |
948 | |
949 | Internals |
950 | ********* |
951 | @@ -8106,8 +8240,10 @@ |
952 | and remove benchmarks that take longer than 10min to run. |
953 | (John Arbash Meinel) |
954 | |
955 | -bzr 0.12rc1 2006-10-23 |
956 | -####################### |
957 | +bzr 0.12rc1 |
958 | +########### |
959 | + |
960 | +:Released: 2006-10-23 |
961 | |
962 | Improvements |
963 | ************ |
964 | @@ -8228,13 +8364,17 @@ |
965 | option to set the BzrDir, Repository and Branch formats of the |
966 | created objects. (Robert Collins, John Arbash Meinel) |
967 | |
968 | -bzr 0.11 2006-10-02 |
969 | -#################### |
970 | +bzr 0.11 |
971 | +######## |
972 | + |
973 | +:Released: 2006-10-02 |
974 | |
975 | * Smart server transport test failures on windows fixed. (Lukáš Lalinský). |
976 | |
977 | -bzr 0.11rc2 2006-09-27 |
978 | -####################### |
979 | +bzr 0.11rc2 |
980 | +########### |
981 | + |
982 | +:Released: 2006-09-27 |
983 | |
984 | Bug Fixes |
985 | ********* |
986 | @@ -8244,8 +8384,10 @@ |
987 | * Commit performance regression fixed. (Aaron Bentley, Robert Collins, John |
988 | Arbash Meinel). |
989 | |
990 | -bzr 0.11rc1 2006-09-25 |
991 | -####################### |
992 | +bzr 0.11rc1 |
993 | +########### |
994 | + |
995 | +:Released: 2006-09-25 |
996 | |
997 | Improvements |
998 | ************ |
999 | @@ -8438,8 +8580,10 @@ |
1000 | allow upgrades to a richer interface than the VFS one provided by |
1001 | Transport. (Andrew Bennetts, Martin Pool) |
1002 | |
1003 | -bzr 0.10 2006-08-29 |
1004 | -#################### |
1005 | +bzr 0.10 |
1006 | +######## |
1007 | + |
1008 | +:Released: 2006-08-29 |
1009 | |
1010 | Improvements |
1011 | ************ |
1012 | @@ -8516,8 +8660,10 @@ |
1013 | need to be installed. This should help make the life of packagers |
1014 | easier. (John Arbash Meinel) |
1015 | |
1016 | -bzr 0.9.0 2006-08-11 |
1017 | -##################### |
1018 | +bzr 0.9.0 |
1019 | +######### |
1020 | + |
1021 | +:Released: 2006-08-11 |
1022 | |
1023 | Surprises |
1024 | ********* |
1025 | @@ -8784,16 +8930,20 @@ |
1026 | |
1027 | * "RevisionTree" is now in bzrlib/revisiontree.py. (Robert Collins) |
1028 | |
1029 | -bzr 0.8.2 2006-05-17 |
1030 | -##################### |
1031 | +bzr 0.8.2 |
1032 | +######### |
1033 | + |
1034 | +:Released: 2006-05-17 |
1035 | |
1036 | Bug Fixes |
1037 | ********* |
1038 | |
1039 | * setup.py failed to install launchpad plugin. (Martin Pool) |
1040 | |
1041 | -bzr 0.8.1 2006-05-16 |
1042 | -##################### |
1043 | +bzr 0.8.1 |
1044 | +######### |
1045 | + |
1046 | +:Released: 2006-05-16 |
1047 | |
1048 | Bug Fixes |
1049 | ********* |
1050 | @@ -8846,8 +8996,10 @@ |
1051 | * Fix test case for bzr info in upgrading a standalone branch to metadir, |
1052 | uses bzrlib api now. (Olaf Conradi) |
1053 | |
1054 | -bzr 0.8 2006-05-08 |
1055 | -################### |
1056 | +bzr 0.8 |
1057 | +####### |
1058 | + |
1059 | +:Released: 2006-05-08 |
1060 | |
1061 | Notes When Upgrading |
1062 | ******************** |
1063 | @@ -9108,8 +9260,10 @@ |
1064 | * ``run_bzr`` and ``run_bzr_captured`` now accept a 'stdin="foo"' |
1065 | parameter which will provide String("foo") to the command as its stdin. |
1066 | |
1067 | -bzr 0.7 2006-01-09 |
1068 | -################## |
1069 | +bzr 0.7 |
1070 | +####### |
1071 | + |
1072 | +:Released: 2006-01-09 |
1073 | |
1074 | Changes |
1075 | ******* |
1076 | @@ -9404,8 +9558,10 @@ |
1077 | * ``bzrlib.osutils.safe_unicode`` now exists to provide parameter coercion |
1078 | for functions that need unicode strings. (Robert Collins) |
1079 | |
1080 | -bzr 0.6 2005-10-28 |
1081 | -################## |
1082 | +bzr 0.6 |
1083 | +####### |
1084 | + |
1085 | +:Released: 2005-10-28 |
1086 | |
1087 | Improvements |
1088 | ************ |
1089 | @@ -9620,8 +9776,10 @@ |
1090 | [-1] in the revision-history. (Andres Salomon) |
1091 | |
1092 | |
1093 | -bzr 0.1.1 2005-10-12 |
1094 | -#################### |
1095 | +bzr 0.1.1 |
1096 | +######### |
1097 | + |
1098 | +:Released: 2005-10-12 |
1099 | |
1100 | Bug Fixes |
1101 | ********* |
1102 | @@ -9638,8 +9796,10 @@ |
1103 | * Avoid some unnecessary http operations in branch and pull. |
1104 | |
1105 | |
1106 | -bzr 0.1 2005-10-11 |
1107 | -################## |
1108 | +bzr 0.1 |
1109 | +####### |
1110 | + |
1111 | +:Released: 2005-10-11 |
1112 | |
1113 | Notes |
1114 | ***** |
1115 | @@ -9768,8 +9928,10 @@ |
1116 | of tests to run, e.g. ``bzr selftest test_weave`` |
1117 | |
1118 | |
1119 | -bzr 0.0.9 2005-09-23 |
1120 | -#################### |
1121 | +bzr 0.0.9 |
1122 | +######### |
1123 | + |
1124 | +:Released: 2005-09-23 |
1125 | |
1126 | Bug Fixes |
1127 | ********* |
1128 | @@ -9810,8 +9972,11 @@ |
1129 | another (used by pull, merged, etc.) |
1130 | |
1131 | |
1132 | -bzr 0.0.8 2005-09-20 |
1133 | -#################### |
1134 | +bzr 0.0.8 |
1135 | +######### |
1136 | + |
1137 | +:Released: 2005-09-20 |
1138 | + |
1139 | |
1140 | Improvements |
1141 | ************ |
1142 | @@ -9861,8 +10026,10 @@ |
1143 | * Quieten warnings about locking; patch from Matt Lavin. |
1144 | |
1145 | |
1146 | -bzr-0.0.7 2005-09-02 |
1147 | -#################### |
1148 | +bzr-0.0.7 |
1149 | +######### |
1150 | + |
1151 | +:Released: 2005-09-02 |
1152 | |
1153 | New Features |
1154 | ************ |
1155 | @@ -9916,8 +10083,10 @@ |
1156 | |
1157 | |
1158 | |
1159 | -bzr-0.0.6 2005-08-18 |
1160 | -#################### |
1161 | +bzr-0.0.6 |
1162 | +######### |
1163 | + |
1164 | +:Released: 2005-08-18 |
1165 | |
1166 | New Features |
1167 | ************ |
1168 | @@ -10002,8 +10171,10 @@ |
1169 | * Fix bugs in committing only selected files or within a subdirectory. |
1170 | |
1171 | |
1172 | -bzr-0.0.5 2005-06-15 |
1173 | -##################### |
1174 | +bzr-0.0.5 |
1175 | +######### |
1176 | + |
1177 | +:Released: 2005-06-15 |
1178 | |
1179 | Changes |
1180 | ******* |
1181 | @@ -10144,8 +10315,10 @@ |
1182 | 2.4 is now only recommended. |
1183 | |
1184 | |
1185 | -bzr-0.0.4 2005-04-22 |
1186 | -##################### |
1187 | +bzr-0.0.4 |
1188 | +######### |
1189 | + |
1190 | +:Released: 2005-04-22 |
1191 | |
1192 | Enhancements |
1193 | ************ |
1194 | @@ -10213,8 +10386,10 @@ |
1195 | from QuantumG. |
1196 | |
1197 | |
1198 | -bzr-0.0.3 2005-04-06 |
1199 | -##################### |
1200 | +bzr-0.0.3 |
1201 | +######### |
1202 | + |
1203 | +:Released: 2005-04-06 |
1204 | |
1205 | Enhancements |
1206 | ************ |
1207 | @@ -10268,8 +10443,11 @@ |
1208 | * Win32 fixes from Steve Brown. |
1209 | |
1210 | |
1211 | -bzr-0.0.2 "black cube" 2005-03-31 |
1212 | -################################### |
1213 | +bzr-0.0.2 |
1214 | +######### |
1215 | + |
1216 | +:Codename: "black cube" |
1217 | +:Released: 2005-03-31 |
1218 | |
1219 | Enhancements |
1220 | ************ |
1221 | @@ -10297,8 +10475,10 @@ |
1222 | the root directory only. |
1223 | |
1224 | |
1225 | -bzr-0.0.1 2005-03-26 |
1226 | -##################### |
1227 | +bzr-0.0.1 |
1228 | +######### |
1229 | + |
1230 | +:Released: 2005-03-26 |
1231 | |
1232 | Enhancements |
1233 | ************ |
1234 | @@ -10327,8 +10507,10 @@ |
1235 | supported). |
1236 | |
1237 | |
1238 | -bzr-0.0.0.69 2005-03-22 |
1239 | -######################## |
1240 | +bzr-0.0.0.69 |
1241 | +############ |
1242 | + |
1243 | +:Released: 2005-03-22 |
1244 | |
1245 | Enhancements |
1246 | ************ |
1247 | |
1248 | === added file 'doc/Bazaar-Logo-For-Manuals.png' |
1249 | Binary 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 |
1250 | === modified file 'doc/_templates/index.html' |
1251 | --- doc/_templates/index.html 2009-08-18 00:10:19 +0000 |
1252 | +++ doc/_templates/index.html 2009-09-03 02:29:16 +0000 |
1253 | @@ -16,9 +16,6 @@ |
1254 | <p class="biglink"><a class="biglink" href="{{ pathto("en/quick-reference/index") }}">Quick Reference</a><br/> |
1255 | <span class="linkdescr">for your wall</span> |
1256 | </p> |
1257 | - <p class="biglink"><a class="biglink" href="{{ pathto("en/user-reference/bzr_man") }}">User Reference</a><br/> |
1258 | - <span class="linkdescr">all the gory details</span> |
1259 | - </p> |
1260 | </td><td width="50%"> |
1261 | <p class="biglink"><a class="biglink" href="{{ pathto("en/release-notes/NEWS") }}">Release Notes</a><br/> |
1262 | <span class="linkdescr">what's new</span> |
1263 | @@ -26,6 +23,23 @@ |
1264 | <p class="biglink"><a class="biglink" href="{{ pathto("en/upgrade-guide/index") }}">Upgrade Guide</a><br/> |
1265 | <span class="linkdescr">moving to Bazaar 2.x</span> |
1266 | </p> |
1267 | + <p class="biglink"><a class="biglink" href="{{ pathto("en/user-reference/bzr_man") }}">User Reference</a><br/> |
1268 | + <span class="linkdescr">all the gory details</span> |
1269 | + </p> |
1270 | + </td></tr> |
1271 | + </table> |
1272 | + |
1273 | + <h2>Related links</h2> |
1274 | + |
1275 | + <table class="contentstable" align="center" style="margin-left: 30px"><tr> |
1276 | + <td width="50%"> |
1277 | + <p class="biglink"><a class="biglink" href="https://answers.launchpad.net/bzr">FAQ</a><br/> |
1278 | + <span class="linkdescr">frequently asked questions</span> |
1279 | + </p> |
1280 | + <p class="biglink"><a class="biglink" href="http://bazaar-vcs.org/BzrGlossary/">Glossary</a><br/> |
1281 | + <span class="linkdescr">help with terminology</span> |
1282 | + </p> |
1283 | + </td><td width="50%"> |
1284 | <p class="biglink"><a class="biglink" href="http://doc.bazaar-vcs.org/migration/en/">Migration Docs</a><br/> |
1285 | <span class="linkdescr">for refugees of other tools</span> |
1286 | </p> |
1287 | @@ -35,31 +49,7 @@ |
1288 | </td></tr> |
1289 | </table> |
1290 | |
1291 | - <p>Keen to help? See the <a href="{{ pathto("developers/index") }}">Developer Docs</a> |
1292 | + <p>Keen to help? See the <a href="http://doc.bazaar-vcs.org/latest/developers/">Developer Docs</a> |
1293 | for policies and tools on contributing code, tests and documentation.</p> |
1294 | |
1295 | - |
1296 | - <h2>Related Links</h2> |
1297 | - |
1298 | - <table class="contentstable" align="center" style="margin-left: 30px"><tr> |
1299 | - <td width="25%"> |
1300 | - <p><a href="https://answers.launchpad.net/bzr">FAQ</a> |
1301 | - </p> |
1302 | - </td><td width="25%"> |
1303 | - <p><a href="http://bazaar-vcs.org/BzrGlossary/">Glossary</a> |
1304 | - </p> |
1305 | - </td><td width="25%"> |
1306 | - <p><a href="{{ pathto("genindex") }}">Index</a> |
1307 | - </p> |
1308 | - </td><td width="25%"> |
1309 | - <p><a href="{{ pathto("search") }}">Search</a> |
1310 | - </p> |
1311 | - </td></tr> |
1312 | - </table> |
1313 | - |
1314 | - <hr> |
1315 | - <p>Other languages: |
1316 | - <a href="{{ pathto("index.es") }}">Spanish</a>, |
1317 | - <a href="{{ pathto("index.ru") }}">Russian</a> |
1318 | - </p> |
1319 | {% endblock %} |
1320 | |
1321 | === modified file 'doc/_templates/layout.html' |
1322 | --- doc/_templates/layout.html 2009-07-22 13:41:01 +0000 |
1323 | +++ doc/_templates/layout.html 2009-09-03 00:21:59 +0000 |
1324 | @@ -3,5 +3,6 @@ |
1325 | {% block rootrellink %} |
1326 | <li><a href="http://bazaar-vcs.org/"> |
1327 | <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Home</a> | </li> |
1328 | +<a href="http://doc.bazaar-vcs.org/en/">Documentation</a> | </li> |
1329 | {{ super() }} |
1330 | {% endblock %} |
1331 | |
1332 | === modified file 'doc/conf.py' |
1333 | --- doc/conf.py 2009-07-22 13:41:01 +0000 |
1334 | +++ doc/conf.py 2009-09-03 02:29:16 +0000 |
1335 | @@ -34,7 +34,7 @@ |
1336 | #source_encoding = 'utf-8' |
1337 | |
1338 | # The master toctree document. |
1339 | -master_doc = 'contents' |
1340 | +master_doc = 'index' |
1341 | |
1342 | # General information about the project. |
1343 | project = u'Bazaar' |
1344 | @@ -45,9 +45,9 @@ |
1345 | # built documents. |
1346 | # |
1347 | # The short X.Y version. |
1348 | -version = '1.18' |
1349 | +version = '2.0' |
1350 | # The full version, including alpha/beta/rc tags. |
1351 | -release = '1.18dev' |
1352 | +release = '2.0rc2' |
1353 | |
1354 | # The language for content autogenerated by Sphinx. Refer to documentation |
1355 | # for a list of supported languages. |
1356 | @@ -123,7 +123,7 @@ |
1357 | #html_title = None |
1358 | |
1359 | # A shorter title for the navigation bar. Default is the same as html_title. |
1360 | -#html_short_title = None |
1361 | +html_short_title = "Table of Contents (%s)" % (release,) |
1362 | |
1363 | # The name of an image file (relative to this directory) to place at the top |
1364 | # of the sidebar. |
1365 | @@ -152,13 +152,13 @@ |
1366 | |
1367 | # Additional templates that should be rendered to pages, maps page names to |
1368 | # template names. |
1369 | -html_additional_pages = {'contents': 'index.html'} |
1370 | +html_additional_pages = {'index': 'index.html'} |
1371 | |
1372 | # If false, no module index is generated. |
1373 | -#html_use_modindex = True |
1374 | +html_use_modindex = False |
1375 | |
1376 | # If false, no index is generated. |
1377 | -#html_use_index = True |
1378 | +html_use_index = False |
1379 | |
1380 | # If true, the index is split into individual pages for each letter. |
1381 | #html_split_index = False |
1382 | @@ -175,7 +175,7 @@ |
1383 | #html_file_suffix = '' |
1384 | |
1385 | # Output file base name for HTML help builder. |
1386 | -htmlhelp_basename = 'Bazaardoc' |
1387 | +htmlhelp_basename = 'bzr-en-user-docs' |
1388 | |
1389 | |
1390 | # -- Options for LaTeX output -------------------------------------------------- |
1391 | @@ -189,13 +189,29 @@ |
1392 | # Grouping the document tree into LaTeX files. List of tuples |
1393 | # (source start file, target name, title, author, documentclass [howto/manual]). |
1394 | latex_documents = [ |
1395 | - ('contents', 'Bazaar.tex', u'Bazaar Documentation', |
1396 | - u'Bazaar Developers', 'manual'), |
1397 | + # Manuals |
1398 | + ('en/user-guide/index', 'bzr-en-user-guide.tex', u'Bazaar User Guide', |
1399 | + u'Bazaar Developers', 'manual'), |
1400 | + ('en/user-reference/bzr_man', 'bzr-en-user-reference.tex', u'Bazaar User Reference', |
1401 | + u'Bazaar Developers', 'manual'), |
1402 | + ('en/release-notes/NEWS', 'bzr-en-release-notes.tex', u'Bazaar Release Notes', |
1403 | + u'Bazaar Developers', 'manual'), |
1404 | + ('en/upgrade-guide/index', 'bzr-en-upgrade-guide.tex', u'Bazaar Upgrade Guide', |
1405 | + u'Bazaar Developers', 'manual'), |
1406 | + # Tutorials |
1407 | + ('en/mini-tutorial/index', 'bzr-en-tutorial-mini.tex', u'Bazaar in five minutes', |
1408 | + u'Bazaar Developers', 'howto'), |
1409 | + ('en/tutorials/tutorial', 'bzr-en-tutorial.tex', u'Bazaar Tutorial', |
1410 | + u'Bazaar Developers', 'howto'), |
1411 | + ('en/tutorials/using_bazaar_with_launchpad', 'bzr-en-tutorial-with-launchpad.tex', |
1412 | + u'Using Bazaar With Launchpad', u'Bazaar Developers', 'howto'), |
1413 | + ('en/tutorials/centralized_workflow', 'bzr-en-tutorial-centralized.tex', |
1414 | + u'Centralized Workflow Tutorial', u'Bazaar Developers', 'howto'), |
1415 | ] |
1416 | |
1417 | # The name of an image file (relative to this directory) to place at the top of |
1418 | # the title page. |
1419 | -#latex_logo = None |
1420 | +latex_logo = 'Bazaar-Logo-For-Manuals.png' |
1421 | |
1422 | # For "manual" documents, if this is true, then toplevel headings are parts, |
1423 | # not chapters. |
1424 | |
1425 | === modified file 'doc/en/mini-tutorial/index.txt' |
1426 | --- doc/en/mini-tutorial/index.txt 2009-04-04 02:50:01 +0000 |
1427 | +++ doc/en/mini-tutorial/index.txt 2009-09-02 16:03:51 +0000 |
1428 | @@ -2,8 +2,6 @@ |
1429 | Bazaar in five minutes |
1430 | ====================== |
1431 | |
1432 | -.. contents:: |
1433 | - |
1434 | Introduction |
1435 | ============ |
1436 | |
1437 | |
1438 | === modified file 'doc/en/tutorials/centralized_workflow.txt' |
1439 | --- doc/en/tutorials/centralized_workflow.txt 2009-07-22 13:41:01 +0000 |
1440 | +++ doc/en/tutorials/centralized_workflow.txt 2009-09-02 16:03:51 +0000 |
1441 | @@ -1,6 +1,6 @@ |
1442 | -==================== |
1443 | -Centralized Workflow |
1444 | -==================== |
1445 | +============================= |
1446 | +Centralized Workflow Tutorial |
1447 | +============================= |
1448 | |
1449 | |
1450 | Overview |
1451 | @@ -23,8 +23,6 @@ |
1452 | |
1453 | .. _Bazaar: http://bazaar-vcs.org |
1454 | |
1455 | -.. contents:: |
1456 | - |
1457 | |
1458 | Initial Setup |
1459 | ============= |
1460 | |
1461 | === modified file 'doc/en/tutorials/tutorial.txt' |
1462 | --- doc/en/tutorials/tutorial.txt 2009-06-27 08:10:13 +0000 |
1463 | +++ doc/en/tutorials/tutorial.txt 2009-09-02 16:03:51 +0000 |
1464 | @@ -11,8 +11,6 @@ |
1465 | Bazaar Tutorial |
1466 | =============== |
1467 | |
1468 | -Current for bzr-0.91, 2007-08 |
1469 | - |
1470 | |
1471 | Introduction |
1472 | ============ |
1473 | @@ -24,8 +22,8 @@ |
1474 | different." Otherwise, get some coffee or tea, get comfortable and get |
1475 | ready to catch up. |
1476 | |
1477 | -The Purposes of Revision Control |
1478 | -================================ |
1479 | +The purpose of revision control |
1480 | +=============================== |
1481 | |
1482 | Odds are that you have worked on some sort of textual data -- the sources |
1483 | to a program, web sites or the config files that Unix system |
1484 | @@ -57,8 +55,8 @@ |
1485 | We keep these logs so that if later there is some sort of problem with |
1486 | sftp, we can figure out when the problem probably happened. |
1487 | |
1488 | -How DRCS is Different |
1489 | ---------------------- |
1490 | +How DRCS is different |
1491 | +===================== |
1492 | |
1493 | Many Revision Control Systems (RCS) are stored on servers. If one wants to |
1494 | work on the code stored within an RCS, then one needs to connect to the |
1495 | @@ -282,6 +280,7 @@ |
1496 | As a shortcut, ``bzr diff -p1`` produces a form that works with the |
1497 | command ``patch -p1``. |
1498 | |
1499 | + |
1500 | Committing changes |
1501 | ================== |
1502 | |
1503 | @@ -308,7 +307,7 @@ |
1504 | can also be useful when you pick up your work after a break.) |
1505 | |
1506 | Message from an editor |
1507 | -====================== |
1508 | +---------------------- |
1509 | |
1510 | If you use neither the ``-m`` nor the ``-F`` option then bzr will open an |
1511 | editor for you to enter a message. The editor to run is controlled by |
1512 | @@ -355,9 +354,13 @@ |
1513 | given then only those ones will be affected. ``bzr revert`` also clears the |
1514 | list of pending merges revisions. |
1515 | |
1516 | + |
1517 | Ignoring files |
1518 | ============== |
1519 | |
1520 | +The .bzrignore file |
1521 | +------------------- |
1522 | + |
1523 | Many source trees contain some files that do not need to be versioned, |
1524 | such as editor backups, object or bytecode files, and built programs. You |
1525 | can simply not add them, but then they'll always crop up as unknown files. |
1526 | @@ -400,7 +403,7 @@ |
1527 | % bzr commit -m "Add ignore patterns" |
1528 | |
1529 | |
1530 | -Global Ignores |
1531 | +Global ignores |
1532 | -------------- |
1533 | |
1534 | There are some ignored files which are not project specific, but more user |
1535 | @@ -574,6 +577,7 @@ |
1536 | rsync, or other related file transfer methods. This is usually less safe |
1537 | than using ``push``, but may be faster or easier in some situations. |
1538 | |
1539 | + |
1540 | Moving changes between trees |
1541 | ============================ |
1542 | |
1543 | |
1544 | === modified file 'doc/en/tutorials/using_bazaar_with_launchpad.txt' |
1545 | --- doc/en/tutorials/using_bazaar_with_launchpad.txt 2009-07-22 13:41:01 +0000 |
1546 | +++ doc/en/tutorials/using_bazaar_with_launchpad.txt 2009-09-02 16:03:51 +0000 |
1547 | @@ -2,8 +2,6 @@ |
1548 | Using Bazaar with Launchpad |
1549 | =========================== |
1550 | |
1551 | -.. contents:: |
1552 | - |
1553 | |
1554 | Motivation |
1555 | ========== |
1556 | |
1557 | === modified file 'doc/en/upgrade-guide/index.txt' |
1558 | --- doc/en/upgrade-guide/index.txt 2009-07-22 13:41:01 +0000 |
1559 | +++ doc/en/upgrade-guide/index.txt 2009-09-02 16:03:51 +0000 |
1560 | @@ -8,8 +8,6 @@ |
1561 | .. level 3 ~~~~~~~~ |
1562 | .. level 4 ^^^^^^^^ (it is better not to use nesting deeper than 3 levels) |
1563 | |
1564 | -.. contents:: |
1565 | - |
1566 | .. include:: overview.txt |
1567 | .. include:: data_migration.txt |
1568 | .. include:: tips_and_tricks.txt |
1569 | |
1570 | === removed file 'doc/en/user-guide/index.txt' |
1571 | --- doc/en/user-guide/index.txt 2009-07-26 15:58:33 +0000 |
1572 | +++ doc/en/user-guide/index.txt 1970-01-01 00:00:00 +0000 |
1573 | @@ -1,118 +0,0 @@ |
1574 | -################# |
1575 | -Bazaar User Guide |
1576 | -################# |
1577 | - |
1578 | -.. Please mark sections in included files as following: |
1579 | -.. level 1 ======== |
1580 | -.. level 2 -------- |
1581 | -.. level 3 ~~~~~~~~ |
1582 | -.. level 4 ^^^^^^^^ (it is better not to use nesting deeper than 3 levels) |
1583 | - |
1584 | -.. contents:: :depth: 3 |
1585 | - |
1586 | - |
1587 | -Introduction |
1588 | -############ |
1589 | - |
1590 | -.. include:: introducing_bazaar.txt |
1591 | -.. include:: core_concepts.txt |
1592 | -.. include:: bazaar_workflows.txt |
1593 | - |
1594 | - |
1595 | -Getting started |
1596 | -############### |
1597 | - |
1598 | -.. include:: installing_bazaar.txt |
1599 | -.. include:: entering_commands.txt |
1600 | -.. include:: getting_help.txt |
1601 | -.. include:: configuring_bazaar.txt |
1602 | -.. include:: using_aliases.txt |
1603 | -.. include:: plugins.txt |
1604 | -.. include:: zen.txt |
1605 | - |
1606 | - |
1607 | -Personal version control |
1608 | -######################## |
1609 | - |
1610 | -.. include:: solo_intro.txt |
1611 | -.. include:: starting_a_project.txt |
1612 | -.. include:: controlling_registration.txt |
1613 | -.. include:: reviewing_changes.txt |
1614 | -.. include:: recording_changes.txt |
1615 | -.. include:: browsing_history.txt |
1616 | -.. include:: releasing_a_project.txt |
1617 | -.. include:: undoing_mistakes.txt |
1618 | - |
1619 | - |
1620 | -Sharing with peers |
1621 | -################## |
1622 | - |
1623 | -.. include:: partner_intro.txt |
1624 | -.. include:: branching_a_project.txt |
1625 | -.. include:: merging_changes.txt |
1626 | -.. include:: resolving_conflicts.txt |
1627 | -.. include:: annotating_changes.txt |
1628 | - |
1629 | - |
1630 | -Team collaboration, central style |
1631 | -################################# |
1632 | - |
1633 | -.. include:: central_intro.txt |
1634 | -.. include:: publishing_a_branch.txt |
1635 | -.. include:: using_checkouts.txt |
1636 | -.. include:: working_offline_central.txt |
1637 | -.. include:: reusing_a_checkout.txt |
1638 | - |
1639 | - |
1640 | -Team collaboration, distributed style |
1641 | -##################################### |
1642 | - |
1643 | -.. include:: distributed_intro.txt |
1644 | -.. include:: organizing_branches.txt |
1645 | -.. include:: using_gatekeepers.txt |
1646 | -.. include:: sending_changes.txt |
1647 | - |
1648 | - |
1649 | -Miscellaneous topics |
1650 | -#################### |
1651 | - |
1652 | -.. include:: part2_intro.txt |
1653 | -.. include:: adv_merging.txt |
1654 | -.. include:: shelving_changes.txt |
1655 | -.. include:: filtered_views.txt |
1656 | -.. include:: stacked.txt |
1657 | -.. include:: server.txt |
1658 | -.. include:: hooks.txt |
1659 | -.. include:: version_info.txt |
1660 | - |
1661 | - |
1662 | -A brief tour of some popular plugins |
1663 | -#################################### |
1664 | - |
1665 | -.. include:: bzrtools_plugin.txt |
1666 | -.. include:: svn_plugin.txt |
1667 | -.. include later looms_plugin.txt |
1668 | - |
1669 | - |
1670 | -Integrating Bazaar into your environment |
1671 | -######################################## |
1672 | - |
1673 | -.. include:: web_browsing.txt |
1674 | -.. include later - file_explorers.txt |
1675 | -.. include later - desktop_integration.txt |
1676 | -.. include later - editors_and_ides.txt |
1677 | -.. include later - email.txt |
1678 | -.. include:: bug_trackers.txt |
1679 | - |
1680 | - |
1681 | -Appendices |
1682 | -########## |
1683 | - |
1684 | -.. include:: specifying_revisions.txt |
1685 | -.. include:: organizing_your_workspace.txt |
1686 | -.. include:: shared_repository_layouts.txt |
1687 | -.. include:: setting_up_email.txt |
1688 | -.. include:: http_smart_server.txt |
1689 | -.. include:: writing_a_plugin.txt |
1690 | - |
1691 | -.. |--| unicode:: U+2014 |
1692 | |
1693 | === renamed file 'doc/en/user-guide/index-for-2x.txt' => 'doc/en/user-guide/index.txt' |
1694 | === renamed file 'doc/contents.txt' => 'doc/index.txt' |
1695 | --- doc/contents.txt 2009-08-18 00:10:19 +0000 |
1696 | +++ doc/index.txt 2009-09-03 02:29:16 +0000 |
1697 | @@ -4,8 +4,8 @@ |
1698 | contain the root `toctree` directive. |
1699 | |
1700 | |
1701 | -Core documentation |
1702 | -================== |
1703 | +Table of Contents |
1704 | +================= |
1705 | |
1706 | .. toctree:: |
1707 | :maxdepth: 1 |
1708 | @@ -13,30 +13,6 @@ |
1709 | en/user-guide/index |
1710 | en/tutorials/index |
1711 | en/quick-reference/index |
1712 | - en/user-reference/index |
1713 | - |
1714 | -.. toctree:: |
1715 | - :maxdepth: 1 |
1716 | - |
1717 | - en/release-notes/index |
1718 | + en/release-notes/NEWS |
1719 | en/upgrade-guide/index |
1720 | - developers/index |
1721 | - |
1722 | - |
1723 | -Other languages: |
1724 | - |
1725 | -.. toctree:: |
1726 | - :maxdepth: 1 |
1727 | - |
1728 | - index.es |
1729 | - index.ru |
1730 | - |
1731 | - |
1732 | -Related links |
1733 | -============= |
1734 | - |
1735 | -* `Frequently Asked Questions <http://bazaar-vcs.org/FAQ>`_ |
1736 | -* `Glossary <http://bazaar-vcs.org/BzrGlossary>`_ |
1737 | -* :ref:`genindex` |
1738 | -* :ref:`search` |
1739 | - |
1740 | + en/user-reference/bzr_man |
1741 | |
1742 | === removed file 'doc/index.txt' |
1743 | --- doc/index.txt 2009-08-10 06:53:44 +0000 |
1744 | +++ doc/index.txt 1970-01-01 00:00:00 +0000 |
1745 | @@ -1,66 +0,0 @@ |
1746 | -============================ |
1747 | -Bazaar Main Document Catalog |
1748 | -============================ |
1749 | - |
1750 | -The latest version of these documents are available from Bazaar's |
1751 | -documentation site, <http://doc.bazaar-vcs.org/>, and more documentation |
1752 | -may be linked from <http://bazaar-vcs.org/Documentation>. |
1753 | - |
1754 | -Core Documentation |
1755 | -================== |
1756 | - |
1757 | -* `User Guide <en/user-guide/index.html>`_ |
1758 | - |
1759 | -* `User Reference <en/user-reference/bzr_man.html>`_ |
1760 | - |
1761 | -* `Quick Start Card <_static/en/quick-reference/bzr-quick-reference.svg>`_ |
1762 | - (`PDF <_static/en/quick-reference/bzr-quick-reference.pdf>`_, |
1763 | - `PNG <_static/en/quick-reference/bzr-quick-reference.png>`_) |
1764 | - |
1765 | -* `Release Notes <en/release-notes/NEWS.html>`_ |
1766 | - |
1767 | -* `2.0 Upgrade Guide <en/upgrade-guide/index.html>`_ |
1768 | - |
1769 | - |
1770 | -Tutorials |
1771 | -========= |
1772 | - |
1773 | -* `Bazaar in five minutes <en/mini-tutorial/index.html>`_ |
1774 | - |
1775 | -* `A longer tutorial <en/tutorials/tutorial.html>`_ |
1776 | - |
1777 | -* `Using Bazaar with Launchpad <en/tutorials/using_bazaar_with_launchpad.html>`_ |
1778 | - |
1779 | -* `Centralized workflow <en/tutorials/centralized_workflow.html>`_ |
1780 | - |
1781 | - |
1782 | -Developer Documentation |
1783 | -======================= |
1784 | - |
1785 | -* `Developer Document Catalog <developers/index.html>`_ |--| for developers |
1786 | - of Bazaar and plugins |
1787 | - |
1788 | -Web links |
1789 | -========= |
1790 | - |
1791 | -* `Switching Guides <http://bazaar-vcs.org/BzrSwitching>`_ |
1792 | - |--| for users moving from another VCS tool |
1793 | - |
1794 | -* `Migration Guide <http://bazaar-vcs.org/BzrMigration>`_ |
1795 | - |--| for teams migrating history from another VCS tool |
1796 | - |
1797 | -* `Glossary <http://bazaar-vcs.org/BzrGlossary>`_ |
1798 | - |
1799 | -* `Frequently Asked Questions <http://bazaar-vcs.org/FAQ>`_ |
1800 | - |
1801 | - |
1802 | -Other Languages |
1803 | -=============== |
1804 | - |
1805 | -* `Spanish Documentation <index.es.html>`_ |
1806 | -* `Russian Documentation <index.ru.html>`_ |--| документация на русском |
1807 | - |
1808 | -.. |--| unicode:: U+2014 |
1809 | - |
1810 | -.. |
1811 | - vim: ft=rst tw=74 ai |
1812 | |
1813 | === added file 'tools/generate_release_notes.py' |
1814 | --- tools/generate_release_notes.py 1970-01-01 00:00:00 +0000 |
1815 | +++ tools/generate_release_notes.py 2009-09-03 05:09:22 +0000 |
1816 | @@ -0,0 +1,86 @@ |
1817 | +#!/usr/bin/python |
1818 | + |
1819 | +# Copyright 2009 Canonical Ltd. |
1820 | +# |
1821 | +# This program is free software; you can redistribute it and/or modify |
1822 | +# it under the terms of the GNU General Public License as published by |
1823 | +# the Free Software Foundation; either version 2 of the License, or |
1824 | +# (at your option) any later version. |
1825 | +# |
1826 | +# This program is distributed in the hope that it will be useful, |
1827 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1828 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1829 | +# GNU General Public License for more details. |
1830 | +# |
1831 | +# You should have received a copy of the GNU General Public License |
1832 | +# along with this program; if not, write to the Free Software |
1833 | +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1834 | + |
1835 | +import os |
1836 | +import sys |
1837 | +from optparse import OptionParser |
1838 | + |
1839 | +sys.path.insert(0, os.path.dirname(os.path.dirname(__file__))) |
1840 | + |
1841 | + |
1842 | +def split_into_topics(lines, out_file, out_dir): |
1843 | + """Split a large NEWS file into topics, one per release. |
1844 | + |
1845 | + Releases are detected by matching headings that look like |
1846 | + release names. Topics are created with matching names |
1847 | + replacing spaces with dashes. |
1848 | + """ |
1849 | + topic_file = None |
1850 | + for index, line in enumerate(lines): |
1851 | + maybe_new_topic = line[:4] in ['bzr ', 'bzr-0',] |
1852 | + if maybe_new_topic and lines[index + 1].startswith('####'): |
1853 | + release = line.strip() |
1854 | + if topic_file is None: |
1855 | + # First topic found |
1856 | + out_file.write(".. toctree::\n :maxdepth: 1\n\n") |
1857 | + else: |
1858 | + # close the current topic |
1859 | + topic_file.close() |
1860 | + topic_file = open_topic_file(out_file, out_dir, release) |
1861 | + elif topic_file: |
1862 | + topic_file.write(line) |
1863 | + else: |
1864 | + # Still in the header - dump content straight to output |
1865 | + out_file.write(line) |
1866 | + |
1867 | + |
1868 | +def open_topic_file(out_file, out_dir, release): |
1869 | + topic_name = release.replace(' ', '-') |
1870 | + out_file.write(" %s\n" % (topic_name,)) |
1871 | + topic_path = os.path.join(out_dir, "%s.txt" % (topic_name,)) |
1872 | + result = open(topic_path, 'w') |
1873 | + result.write("%s\n" % (release,)) |
1874 | + return result |
1875 | + |
1876 | + |
1877 | +def main(argv): |
1878 | + # Check usage |
1879 | + parser = OptionParser(usage="%prog SOURCE DESTINATION") |
1880 | + (options, args) = parser.parse_args(argv) |
1881 | + if len(args) != 2: |
1882 | + parser.print_help() |
1883 | + sys.exit(1) |
1884 | + |
1885 | + # Open the files and do the work |
1886 | + infile_name = args[0] |
1887 | + outfile_name = args[1] |
1888 | + outdir = os.path.dirname(outfile_name) |
1889 | + infile = open(infile_name, 'r') |
1890 | + try: |
1891 | + lines = infile.readlines() |
1892 | + finally: |
1893 | + infile.close() |
1894 | + outfile = open(outfile_name, 'w') |
1895 | + try: |
1896 | + split_into_topics(lines, outfile, outdir) |
1897 | + finally: |
1898 | + outfile.close() |
1899 | + |
1900 | + |
1901 | +if __name__ == '__main__': |
1902 | + main(sys.argv[1:]) |
This patch allows our documentation to be converted to PDF and CHM (Windows Help) format. It also improves the HTML format by using topics instead of mega-documents more frequently.
Here's a summary of the main changes:
* added configuration settings to enable the various guides and tutorials to be converted to pdf
* improved the User Guide in HTML/CHM to use topics instead of one big file
* added a script to break the release notes up into topics
* edited the headings in the release notes to be just the version info, making the PDF and CHM contents read better
* dropped inline table of contents from most documents as otherwise they appear twice
There are still some things to sort out to get the developer docs and foreign languages appearing in different chm files. The version number (2.0rc2) is also hard-coded currently. I'll raise bugs for those and, time permitting, tackle them before 2.0 ships.
The CHM format is required/ highly- desirable for the Windows installer so I'd like this reviewed (and hopefully approved) soon please.