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

[Ian Clatworthy]

[Ian Clatworthy (ian-clatworthy)]

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.

[Robert Collins (lifeless)]

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

[Ian Clatworthy (ian-clatworthy)]

> 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.

[Ian Clatworthy (ian-clatworthy)]

This version cleans up the Makefile and gets PDF generation going for the Developer and Spanish docs.

[Martin Pool (mbp)]

That looks pretty good. Certainly it's a very nice cleanup of an ugly part of the makefile. My only real concern is the copy & paste of the version number.

Does this add a new hard dependency on anything? If so, we should be careful of the impact on distributions and packagers.

Thanks for fixing the style of NEWS.

1547 +
1548 +# We *could* get this from bzrlib but there's no certainly that the bzr on
1549 +# the Python path is indeed the one we're building the documentation for ...
1550 +bzr_version = (2, 0, 0, 'rc', 2)
1551 +
1552 +

urk, you're right that just 'import bzrlib' will be problematic, but this is almost certainly going to become incorrect. If from the Makefile you do "PYTHONPATH=.:$PYTHONPATH" then future loads of bzrlib should see the right thing.

Especially because it occurs not once but three or more times.

+release = version + ''.join(str(p) for p in bzr_version[3:])

Could you import and use _format_version_tuple?

+http://doc.bazaar-vcs.org/developers/.

Put it in angle brackets so the . isn't part of the url? (I guess it's harmless.)

2079 Bazaar Developer Document Catalog
2080 =================================
2081
2082 -
2083 -Overall developer documentation
2084 -===============================
2085 -
2086 -* `Developer Guide <../en/developer-guide/HACKING.html>`_
2087 -
2088 -* `Architectural Overview <overview.html>`_ |--| describes some of the
2089 - most important classes and concepts.
2090 +.. toctree::
2091 + :hidden:
2092 +
2093 + process
2094 + HACKING
2095 + testing
2096 + overview
2097 + integration
2098 + plans
2099 + specifications
2100 + implementation-notes
2101 + miscellaneous-notes
2102 +
2103 +
2104 +Core developer documentation

What does this do?

Could sphinx help us get away from manually maintaining indexes of documentation?

[Ian Clatworthy (ian-clatworthy)]

Martin Pool wrote:
> My only real concern is the copy & paste of the version number.

Yes, that's ugly.

> Does this add a new hard dependency on anything? If so, we should be careful of the impact on distributions and packagers.

Sphinx 0.6.x. I guess packagers could pull the generated html docs from
our download area if that's a problem?

The patch currently builds both html and PDF by default. It's probably
better to tweak that to be just the html as the PDF generation requires
a lot of LaTeX-related dependencies.

> 1547 +
> 1548 +# We *could* get this from bzrlib but there's no certainly that the bzr on
> 1549 +# the Python path is indeed the one we're building the documentation for ...
> 1550 +bzr_version = (2, 0, 0, 'rc', 2)
> 1551 +
> 1552 +
>
> urk, you're right that just 'import bzrlib' will be problematic, but this is almost certainly going to become incorrect. If from the Makefile you do "PYTHONPATH=.:$PYTHONPATH" then future loads of bzrlib should see the right thing.

I'd be happy enough to sort this out post shipping rc2. I'm
expecting/hoping to make some *minor* doc tweaks (e.g. fix some
cross-document links) and streamlining the version lookup could come as
part of that patch if you agree?

We need to tweak multiple Makefiles for all 4+ of them to pick up the
right version number. I guess there's some simple, risk-free way of
doing this, but I wasn't inspired at the time to work it out. (We have
various Makefiles are different levels btw.)

> +release = version + ''.join(str(p) for p in bzr_version[3:])
>
> Could you import and use _format_version_tuple?

Probably.

> +http://doc.bazaar-vcs.org/developers/.
>
> Put it in angle brackets so the . isn't part of the url? (I guess it's harmless.)

I assume that's a ReST-ism?

> 2079 Bazaar Developer Document Catalog
> 2080 =================================
> 2081
> 2082 -
> 2083 -Overall developer documentation
> 2084 -===============================
> 2085 -
> 2086 -* `Developer Guide <../en/developer-guide/HACKING.html>`_
> 2087 -
> 2088 -* `Architectural Overview <overview.html>`_ |--| describes some of the
> 2089 - most important classes and concepts.
> 2090 +.. toctree::
> 2091 + :hidden:
> 2092 +
> 2093 + process
> 2094 + HACKING
> 2095 + testing
> 2096 + overview
> 2097 + integration
> 2098 + plans
> 2099 + specifications
> 2100 + implementation-notes
> 2101 + miscellaneous-notes
> 2102 +
> 2103 +
> 2104 +Core developer documentation
>
> What does this do?

It:

1. ensures next and previous topic links work
2. provides checking that all files are in the topic tree somewhere
3. probably provides some other magic I can't remember (or don't know).

> Could sphinx help us get away from manually maintaining indexes of documentation?

It can build a readable TOC from the toctree directive by taking the
titles out of each doc, yes. It can also do some true index stuff but
I'm yet to look into that.

Ian C.

[Martin Pool (mbp)]

2009/9/8 Ian Clatworthy <email address hidden>:
> Martin Pool wrote:
>> My only real concern is the copy & paste of the version number.
>
> Yes, that's ugly.

I think it's still ok to merge for 2.0rc2 if the results are much
better, if we try to do a followon to remove the duplication and if
the dependency on sphinx is not mandatory. Because we know sphinx is
hard to build on old platforms this could break packaging on ubuntu
<<jaunty, and that would be bad. Is it feasible to fall back to a
non-sphinx method?

>> urk, you're right that just 'import bzrlib' will be problematic, but this is almost certainly going to become incorrect.  If from the Makefile you do "PYTHONPATH=.:$PYTHONPATH" then future loads of bzrlib should see the right thing.
>
> I'd be happy enough to sort this out post shipping rc2. I'm
> expecting/hoping to make some *minor* doc tweaks (e.g. fix some
> cross-document links) and streamlining the version lookup could come as
> part of that patch if you agree?
>
> We need to tweak multiple Makefiles for all 4+ of them to pick up the
> right version number. I guess there's some simple, risk-free way of
> doing this, but I wasn't inspired at the time to work it out. (We have
> various Makefiles are different levels btw.)
>
>> +release = version + ''.join(str(p) for p in bzr_version[3:])
>>
>> Could you import and use _format_version_tuple?
>
> Probably.

It's probably worth doing that only at the moment of switching to
taking the version from bzrlib - in fact you might as well take the
formatted string.

>
>> +http://doc.bazaar-vcs.org/developers/.
>>
>> Put it in angle brackets so the . isn't part of the url?  (I guess it's harmless.)
>
> I assume that's a ReST-ism?

Yes.

>> Could sphinx help us get away from manually maintaining indexes of documentation?
>
> It can build a readable TOC from the toctree directive by taking the
> titles out of each doc, yes. It can also do some true index stuff but
> I'm yet to look into that.

Great - I actually meant 'index' only in the sense of 'index.html' ie
really a ToC.

--
Martin <http://launchpad.net/~mbp/>

[Robert Collins (lifeless)]

On Tue, 2009-09-08 at 02:35 +0000, Ian Clatworthy wrote:
> Ian Clatworthy has proposed merging lp:~ian-clatworthy/bzr/doc-site-per-language into lp:bzr/2.0.

From the prior review:

>> 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.

It will be a /lot/ easier to review, and to change, if this is done as
part of the landing.

If its a hard thing to do, then its likely it will be hard to do post
2.0. So I think it should be at least attempted now, so we're not
diffing 4 or so config files later on as we tweak the docs.

>> 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.

You still have 4 or so repeated makefile.

I think thats a very bad pattern; GNU Make (which is the only make we
need to depend on : we're not part of the bootstrap cycle on any os)
allows includes and can do this without the duplication.

I really really really think this is important to get right before
landing, or we'll have a cleanup problem on our hands where its not
clear what varies, and what doesn't.

 review needsfixing

-Rob

review: Needs Fixing

[Robert Collins (lifeless)]

On Tue, 2009-09-08 at 08:51 +0000, Robert Collins wrote:

> You still have 4 or so repeated makefile.
>
> I think thats a very bad pattern; GNU Make (which is the only make we
> need to depend on : we're not part of the bootstrap cycle on any os)
> allows includes and can do this without the duplication.
>
> I really really really think this is important to get right before
> landing, or we'll have a cleanup problem on our hands where its not
> clear what varies, and what doesn't.

I'll note that Martin says its ok to land; and its his call. OTOH we
still have a long list of things to cleanup around 2.0; cleaning this up
will be less trivial the longer we leave it.

As its 'just' docs, we could ship 2.0rc2 without this patch, generate
docs from it, and once the duplication is fixed land it.

-Rob

[Ian Clatworthy (ian-clatworthy)]

Robert Collins wrote:

> If its a hard thing to do, then its likely it will be hard to do post
> 2.0. So I think it should be at least attempted now, so we're not
> diffing 4 or so config files later on as we tweak the docs.

These are generated files and 90% of them are comments. I therefore
don't think the duplication is a practical problem of high enough
importance to block the patch from landing. The exception to that is the
bzr version #. That's not changing pre 2.0rc2 though. :-)

> You still have 4 or so repeated makefile.

The Makefiles are fully generated and 0% post edited since generation.
Ditto for the 4 make.bat files.

There are plenty of solutions to fixing the duplication. I'm not
disagreeing that it's a problem. I simply think there are bigger
user-impacting issues than ought to be fixed *first* in the docs, e.g.
links that are broken. On the maintenance/internal side of things, there
are bigger issues too, e.g. extending the Makefile with rules to package
the various sites into tar.gz bundles for uploading to doc.bazaar-vcs.org.

I'm planning to do all of the above, hopefully post 2.0rc2 and pre 2.0.
This is still a valuable incremental step forward today and landing it
will make reviewing those follow-on doc patches much easier IMO.

Ian C.

[Ian Clatworthy (ian-clatworthy)]

Martin Pool wrote:

> if
> the dependency on sphinx is not mandatory. Because we know sphinx is
> hard to build on old platforms this could break packaging on ubuntu
> <<jaunty, and that would be bad. Is it feasible to fall back to a
> non-sphinx method?

Once this patch lands, Sphinx is mandatory. There are 2 reasons for that:

1. to get things working correctly w.r.t. topic-centric navigation
   and multiple formats, the docs now include Sphinx-only markup,
   e.g. the toctree directive and :doc: links.

2. The old rules have been removed from the Makefile.

Ian C.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

...
> 1547 +
> 1548 +# We *could* get this from bzrlib but there's no certainly that the bzr on
> 1549 +# the Python path is indeed the one we're building the documentation for ...
> 1550 +bzr_version = (2, 0, 0, 'rc', 2)
> 1551 +
> 1552 +
>
> urk, you're right that just 'import bzrlib' will be problematic, but this is almost certainly going to become incorrect. If from the Makefile you do "PYTHONPATH=.:$PYTHONPATH" then future loads of bzrlib should see the right thing.
>
> Especially because it occurs not once but three or more times.
>

Note that PYTHONPATH=.:$PYTHONPATH
*doesn't* work on Windows. Cygwin has a lot of intelligence about handling
  PATH=/cygdrive/c/foo:$PATH => PATH=C:\foo;$PATH
but it doesn't seem to apply that to all env vars, just ones it knows about.

I know I had to recently remove a lot of lines like:

 PYTHONPATH=.:$PYTHONPATH $(PYTHON) tools/generate_docs.py ...

by modifying 'generate_docs.py' to find its bzrlib.

I don't have a great answer here, but just wanted to make people aware
that "PYTHONPATH=.:$PYTHONPATH" is not a sufficient solution. :(

(Maybe we could just have a bootstrap.py file that figures out where
bzrlib is and puts it in sys.path as the first action or sets PYTHONPATH
based on platform?)

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkqmX/sACgkQJdeBCYSNAAMv0QCgyW8kmWOMMMuj5tcm62Pr69bj
nScAoJoVx8sXohYWpEsAugQoFonvOX9i
=wEcj
-----END PGP SIGNATURE-----

[Ian Clatworthy (ian-clatworthy)]

This version removes most of the duplication Robert was concerned about.

It also:

* includes a first cut at a packaging script for building the desired structure on the doc web site.

* switches the sidebar to the LHS which ought to fix the IE6 (and IE7?) rendering issue.

* makes some more developer docs available as PDF.

[Martin Pool (mbp)]

2009/9/8 Ian Clatworthy <email address hidden>:
> Martin Pool wrote:
>
>> if
>> the dependency on sphinx is not mandatory.  Because we know sphinx is
>> hard to build on old platforms this could break packaging on ubuntu
>> <<jaunty, and that would be bad.  Is it feasible to fall back to a
>> non-sphinx method?
>
> Once this patch lands, Sphinx is mandatory. There are 2 reasons for that:
>
> 1. to get things working correctly w.r.t. topic-centric navigation
>   and multiple formats, the docs now include Sphinx-only markup,
>   e.g. the toctree directive and :doc: links.
>
> 2. The old rules have been removed from the Makefile.

For me, that would be a big disincentive to land this after 2.0 has
branched. We shouldn't be shaking the jello under packagers...

--
Martin <http://launchpad.net/~mbp/>

[Ian Clatworthy (ian-clatworthy)]

This version correctly packages the html while building the doc website image. It also fixes the Contents panels in the CHM files. With the exception of some broken links, I believe this is now done.

The final website image including the English, Spanish, Russian, Developers and Downloads sections can be reviewed here: http://doc.bazaar-vcs.org/preview/. (Note the the cross-version HTML indexes will point directly into the en and downloads directories say, so navigation into the various sections won't be done via a directory listing like above.)

[Martin Pool (mbp)]

It looks like this also gets rid of the duplication of the version numbers, which is great.

If this still adds a hard dependency on sphinx then I'd still be concerned about the impact on packaging; please don't land this til that's addressed or I'm convinced otherwise.

[Ian Clatworthy (ian-clatworthy)]

Martin Pool wrote:
> It looks like this also gets rid of the duplication of the version numbers, which is great.

It does.

> If this still adds a hard dependency on sphinx then I'd still be concerned about the impact on packaging; please don't land this til that's addressed or I'm convinced otherwise.

Sure. Some things to consider:

1. All the distros packaging Bazaar are also packaging python and it's
docs are in Sphinx too. So whatever solution there are using for
packaging the python docs can be reused for Bazaar in theory.

2. The simple solution is for packagers to grab the html.tar.bz2
generated by us from doc.bazaar-vcs.org. There's no compelling reason
they must generate the doc themselves, unless they are applying
downstream patches which impact the doc (extremely unlikely I'd hope).

3. IMO, it would be far more risky to land this post rc2 than pre rc2.
The time between rc2 and 2.0 is the very time when packaging issues
ought to be detected and addressed.

Ian C.

[Martin Pool (mbp)]

2009/9/9 Ian Clatworthy <email address hidden>:
> Martin Pool wrote:
>> It looks like this also gets rid of the duplication of the version numbers, which is great.
>
> It does.
>
>> If this still adds a hard dependency on sphinx then I'd still be concerned about the impact on packaging; please don't land this til that's addressed or I'm convinced otherwise.
>
> Sure. Some things to consider:
>
> 1. All the distros packaging Bazaar are also packaging python and it's
> docs are in Sphinx too. So whatever solution there are using for
> packaging the python docs can be reused for Bazaar in theory.

That's useful data.

The case I'm thinking of is this though:
http://packages.ubuntu.com/search?keywords=python-sphinx shows jaunty
has sphinx 0.5.2, intrepid has 0.4.2 and early versions have nothing.
Presumably the Python they ship does not depend on sphinx and comes
from before Python started using it. I'm concerned that the circular
dependency our sysadmins pointed out may make it hard to get sphinx
running there. I do want to get bzr 2.0 packaged for Jaunty (at
least).

> 2. The simple solution is for packagers to grab the html.tar.bz2
> generated by us from doc.bazaar-vcs.org. There's no compelling reason
> they must generate the doc themselves, unless they are applying
> downstream patches which impact the doc (extremely unlikely I'd hope).

That seems to mean we can just apply this patch and build the docs
ourselves, regardless of whether it lands?

> 3. IMO, it would be far more risky to land this post rc2 than pre rc2.
> The time between rc2 and 2.0 is the very time when packaging issues
> ought to be detected and addressed.

I agree, it's essentially either now or not in 2.0 at all, but which?

--
Martin <http://launchpad.net/~mbp/>

=== modified file '.bzrignore'
--- .bzrignore	2009-07-31 19:56:19 +0000
+++ .bzrignore	2009-09-08 15:44:06 +0000
@@ -8,6 +8,9 @@
 bzr.1
 ./doc/*.html
 ./doc/_build/
+./doc/*/_build/
+./doc/*/Makefile
+./doc/*/make.bat
 ./tutorial.html
 BRANCH-INFO
 # setup.py working directory
@@ -53,6 +56,7 @@
 bzrlib/_rio_pyx.c
 bzrlib/_walkdirs_win32.c
 doc/en/release-notes/NEWS.txt
+doc/en/release-notes/bzr*
 doc/en/developer-guide/HACKING.txt
 doc/en/user-reference/bzr_man.txt
 # built extension modules

=== modified file 'Makefile'
--- Makefile	2009-08-03 20:38:39 +0000
+++ Makefile	2009-09-08 15:40:44 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -77,102 +77,64 @@
 # these are treated as phony so they'll always be rebuilt - it's pretty quick
 .PHONY: TAGS tags
 
+
 ### Documentation ###
 
-# set PRETTY to get docs that look like the Bazaar web site
-ifdef PRETTY
-rst2html := $(PYTHON) tools/rst2prettyhtml.py doc/bazaar-vcs.org.kid 
-else
-rst2html := $(PYTHON) tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning
-endif
-
-# translate txt docs to html
-derived_txt_files := \
-	doc/en/user-reference/bzr_man.txt \
-	doc/en/release-notes/NEWS.txt
-txt_files := \
-	doc/en/tutorials/tutorial.txt \
-	doc/en/tutorials/using_bazaar_with_launchpad.txt \
-	doc/en/tutorials/centralized_workflow.txt \
-        $(wildcard doc/ru/tutorials/*.txt) \
-	$(wildcard doc/*/mini-tutorial/index.txt) \
-	$(wildcard doc/*/user-guide/index.txt) \
-	$(derived_txt_files) \
-	doc/en/developer-guide/HACKING.txt \
-	doc/en/upgrade-guide/index.txt \
-	$(wildcard doc/es/guia-usario/*.txt) \
-	doc/es/mini-tutorial/index.txt \
-	doc/index.txt \
-	$(wildcard doc/index.*.txt)
-non_txt_files := \
-       doc/default.css \
-       $(wildcard doc/*/quick-reference/bzr-quick-reference.svg) \
-       $(wildcard doc/*/quick-reference/bzr-quick-reference.png) \
-       $(wildcard doc/*/quick-reference/bzr-quick-reference.pdf) \
-       $(wildcard doc/*/user-guide/images/*.png)
-htm_files := $(patsubst %.txt, %.html, $(txt_files)) 
-
-# doc/developers/*.txt files that should *not* be individually
-# converted to HTML
-dev_txt_nohtml := \
-	doc/developers/add.txt \
-	doc/developers/annotate.txt \
-	doc/developers/bundle-creation.txt \
-	doc/developers/commit.txt \
-	doc/developers/diff.txt \
-	doc/developers/directory-fingerprints.txt \
-	doc/developers/gc.txt \
-	doc/developers/incremental-push-pull.txt \
-	doc/developers/initial-push-pull.txt \
-	doc/developers/merge-scaling.txt \
-	doc/developers/missing.txt \
-	doc/developers/performance-roadmap-rationale.txt \
-	doc/developers/performance-use-case-analysis.txt \
-	doc/developers/planned-change-integration.txt \
-	doc/developers/planned-performance-changes.txt \
-	doc/developers/revert.txt \
-	doc/developers/status.txt \
-	doc/developers/uncommit.txt
-
-dev_txt_all := $(wildcard $(addsuffix /*.txt, doc/developers))
-dev_txt_files := $(filter-out $(dev_txt_nohtml), $(dev_txt_all))
-dev_htm_files := $(patsubst %.txt, %.html, $(dev_txt_files)) 
-
-doc/%/user-guide/index.html: $(wildcard $(addsuffix /*.txt, doc/%/user-guide)) 
-	$(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@
-
-# Set the paper size for PDF files.
-# Options:  'a4' (ISO A4 size), 'letter' (US Letter size)
-PAPERSIZE = a4
-# TODO: Add generation for Russian PDF
-PDF_DOCS := doc/en/user-guide/user-guide.$(PAPERSIZE).pdf
-
-# Copy and modify the RST sources, and convert SVG images to PDF
-# files for use a images in the LaTeX-generated PDF.
-# Then generate the PDF output from the modified RST sources.
-doc/en/user-guide/user-guide.$(PAPERSIZE).pdf: $(wildcard $(addsuffix /*.txt, doc/en/user-guide))
-	mkdir -p doc/en/user-guide/latex_prepared
-	$(PYTHON) tools/prepare_for_latex.py \
-	    --out-dir=doc/en/user-guide/latex_prepared \
-	    --in-dir=doc/en/user-guide
-	cd doc/en/user-guide/latex_prepared && \
-	    $(PYTHON) ../../../../tools/rst2pdf.py \
-	        --documentoptions=10pt,$(PAPERSIZE)paper \
-	        --input-encoding=UTF-8:strict --output-encoding=UTF-8:strict \
-	        --strict --title="Bazaar User Guide" \
-	        index.txt ../user-guide.$(PAPERSIZE).pdf
-
-doc/developers/%.html: doc/developers/%.txt
-	$(rst2html) --stylesheet=../default.css $< $@
-
-doc/index.html: doc/index.txt
-	$(rst2html) --stylesheet=default.css $< $@
-
-doc/index.%.html: doc/index.%.txt
-	$(rst2html) --stylesheet=default.css $< $@
-
-%.html: %.txt
-	$(rst2html) --stylesheet=../../default.css $< $@
+# Build the documentation. To keep the dependencies down to a minimum
+# for distro packagers, we only build the html documentation by default.
+# Sphinx 0.6 or later is required. See http://sphinx.pocoo.org/index.html
+# for installation instructions.
+docs: html-docs
+
+# Clean out generated documentation
+clean-docs:
+	cd doc/en && make clean
+	cd doc/es && make clean
+	cd doc/ru && make clean
+	cd doc/developers && make clean
+
+DOC_DEPENDENCIES = doc/en/release-notes/NEWS.txt doc/en/user-reference/bzr_man.txt \
+	doc/es/Makefile \
+	doc/es/make.bat \
+	doc/ru/Makefile \
+	doc/ru/make.bat \
+	doc/developers/Makefile \
+	doc/developers/make.bat
+
+doc/%/Makefile: doc/en/Makefile
+	$(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')"
+
+doc/%/make.bat: doc/en/make.bat
+	$(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')"
+
+# Build the html docs. Requires Sphinx 0.6 or later.
+html-docs: $(DOC_DEPENDENCIES)
+	cd doc/en && make html
+	cd doc/es && make html
+	cd doc/ru && make html
+	cd doc/developers && make html
+
+# Build the PDF docs. Requires Sphinx 0.6 or later and numerous LaTeX
+# packages. See http://sphinx.pocoo.org/builders.html for details.
+# Note: We don't currently build PDFs for the Russian docs because
+# they require additional packages to be installed (to handle
+# Russian hyphenation rules, etc.)
+pdf-docs: $(DOC_DEPENDENCIES)
+	cd doc/en && make latex
+	cd doc/es && make latex
+	cd doc/developers && make latex
+	cd doc/en/_build/latex && make all-pdf
+	cd doc/es/_build/latex && make all-pdf
+	cd doc/developers/_build/latex && make all-pdf
+
+# Build the CHM (Windows Help) docs. Requires Sphinx 0.6 or later.
+# Note: HtmlHelp Workshop needs to be used on the generated hhp files
+# to generate the final chm files.
+chm-docs: $(DOC_DEPENDENCIES)
+	cd doc/en && make htmlhelp
+	cd doc/es && make htmlhelp
+	cd doc/ru && make htmlhelp
+	cd doc/developers && make htmlhelp
 
 MAN_DEPENDENCIES = bzrlib/builtins.py \
 	$(wildcard bzrlib/*.py) \
@@ -183,46 +145,31 @@
 doc/en/user-reference/bzr_man.txt: $(MAN_DEPENDENCIES)
 	$(PYTHON) tools/generate_docs.py -o $@ rstx
 
-doc/en/release-notes/NEWS.txt: NEWS
-	$(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')"
+doc/en/release-notes/NEWS.txt: NEWS tools/generate_release_notes.py
+	$(PYTHON) tools/generate_release_notes.py NEWS $@
 
 MAN_PAGES = man1/bzr.1
 man1/bzr.1: $(MAN_DEPENDENCIES)
 	$(PYTHON) tools/generate_docs.py -o $@ man
 
-upgrade_guide_dependencies =  $(wildcard $(addsuffix /*.txt, doc/en/upgrade-guide)) 
-
-doc/en/upgrade-guide/index.html: $(upgrade_guide_dependencies)
-	$(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@
-
 # build a png of our performance task list
-# 
 # this is no longer built by default; you can build it if you want to look at it
 doc/developers/performance.png: doc/developers/performance.dot
 	@echo Generating $@
 	@dot -Tpng $< -o$@ || echo "Dot not installed; skipping generation of $@"
 
-derived_web_docs = $(htm_files) $(dev_htm_files) 
-WEB_DOCS = $(derived_web_docs) $(non_txt_files)
-ALL_DOCS = $(derived_web_docs) $(MAN_PAGES)
-
-# the main target to build all the docs
-docs: $(ALL_DOCS)
-
-# produce a tree containing just the final docs, ready for uploading to the web
-HTMLDIR := html_docs
-html-docs: docs
-	$(PYTHON) tools/win32/ostools.py copytree $(WEB_DOCS) $(HTMLDIR)
-
-# Produce PDF documents.  Requires pdfLaTeX, rubber, and Inkscape.
-pdf-docs: $(PDF_DOCS)
-
-# clean produced docs
-clean-docs:
-	$(PYTHON) tools/win32/ostools.py remove $(ALL_DOCS) \
-	    $(HTMLDIR) $(derived_txt_files)
-	rm -f doc/*/user-guide/*.pdf
-	rm -rf doc/*/user-guide/latex_prepared
+
+### Documentation Website ###
+
+# Where to build the website
+DOC_WEBSITE_BUILD := html_docs
+
+# Build and package docs into a website, complete with downloads.
+doc-website: html-docs pdf-docs
+	$(PYTHON) tools/package_docs.py doc/en $(DOC_WEBSITE_BUILD)
+	$(PYTHON) tools/package_docs.py doc/es $(DOC_WEBSITE_BUILD)
+	$(PYTHON) tools/package_docs.py doc/ru $(DOC_WEBSITE_BUILD)
+	$(PYTHON) tools/package_docs.py doc/developers $(DOC_WEBSITE_BUILD)
 
 
 ### Windows Support ###

=== modified file 'NEWS'
--- NEWS	2009-09-07 23:47:14 +0000
+++ NEWS	2009-09-08 01:46:53 +0000
@@ -3,9 +3,6 @@
 ####################
 
 
-.. contents:: List of Releases
-   :depth: 1
-
 bzr 2.0rc2 (not released yet)
 #############################
 
@@ -86,6 +83,14 @@
 * Help on hooks no longer says 'Not deprecated' for hooks that are
   currently supported. (Ian Clatworthy, #422415)
 
+* PDF and CHM (Windows HtmlHelp) formats are now supported for the
+  user documentation. The HTML documentation is better broken up into
+  topics. (Ian Clatworthy)
+
+* The developer and foreign language documents are now separated
+  out so that searching in the HTML and CHM files produces more
+  useful results. (Ian Clatworthy)
+
 * The main table of contents now provides links to the new Migration Docs
   and Plugins Guide. (Ian Clatworthy)
 
@@ -93,7 +98,6 @@
 bzr 2.0rc1
 ##########
 
-
 :Codename: no worries
 :2.0rc1: 2009-08-26
 
@@ -558,8 +562,8 @@
   ``countTestsCases``. (Robert Collins)
 
 
-bzr 1.17 "So late it's brunch" 2009-07-20
-#########################################
+bzr 1.17
+########
 :Codename: so-late-its-brunch
 :1.17rc1: 2009-07-13
 :1.17: 2009-07-20
@@ -808,8 +812,10 @@
   this class and the UI.  (Martin Pool)
 
 
-bzr 1.16.1 2009-06-26
-#####################
+bzr 1.16.1
+##########
+
+:Released: 2009-06-26
 
 End user testing of the 2a format revealed two serious bugs. The first,
 #365615, caused bzr to raise AbsentContentFactory errors when autopacking.
@@ -864,8 +870,8 @@
   (Robert Collins, #376748)
 
 
-bzr 1.16 "It's yesterday in California" 2009-06-18
-##################################################
+bzr 1.16
+########
 :Codename: yesterday-in-california
 :1.16rc1: 2009-06-11
 :1.16: 2009-06-18
@@ -2339,8 +2345,11 @@
   (Vincent Ladeuil)
 
 
-bzr 1.11 "Eyes up!" 2009-01-19
-##############################
+bzr 1.11
+########
+
+:Codename: "Eyes up!"
+:Released: 2009-01-19
 
 This first monthly release of Bazaar for 2009 improves Bazaar's operation
 in Windows, Mac OS X, and other situations where file names are matched
@@ -2366,8 +2375,11 @@
 
 
 
-bzr 1.11rc1 "Eyes up!" 2009-01-09
-#################################
+bzr 1.11rc1
+###########
+
+:Codename: "Eyes up!"
+:Released: 2009-01-09
 
 Changes
 *******
@@ -2603,8 +2615,10 @@
 
 
 
-bzr 1.10 2008-12-05
-###################
+bzr 1.10
+########
+
+:Released: 2008-12-05
 
 Bazaar 1.10 has several performance improvements for copying revisions
 (especially for small updates to large projects).  There has also been a
@@ -2629,8 +2643,10 @@
   topologically. (John Arbash Meinel, #304841)
 
 
-bzr 1.10rc1 2008-11-28
-######################
+bzr 1.10rc1
+###########
+
+:Released: 2008-11-28
 
 This release of Bazaar focuses on performance improvements when pushing
 and pulling revisions, both locally and to remote networks.  The popular
@@ -2750,8 +2766,10 @@
 * Doctests now only report the first failure.  (Martin Pool)
 
 
-bzr 1.9 2008-11-07
-##################
+bzr 1.9
+#######
+
+:Released: 2008-11-07
 
 This release of Bazaar adds a new repository format, ``1.9``, with smaller
 and more efficient index files.  This format can be specified when
@@ -2773,8 +2791,10 @@
   (John Arbash Meinel, #293746)
 
 
-bzr 1.9rc1 2008-10-31
-#####################
+bzr 1.9rc1
+##########
+
+:Released: 2008-10-31
 
 New Features
 ************
@@ -2891,8 +2911,10 @@
   configuration of authetication credentials.
 
 
-bzr 1.8 2008-10-16
-##################
+bzr 1.8
+#######
+
+:Released: 2008-10-16
 
 Bazaar 1.8 includes several fixes that improve working tree performance,
 display of revision logs, and merges.  The bzr testsuite now passes on OS
@@ -2913,8 +2935,10 @@
   that platform.  (Alexander Belchenko, Martin Pool, #277481)
 
 
-bzr 1.8rc1 2008-10-07
-#####################
+bzr 1.8rc1
+##########
+
+:Released: 2008-10-07
 
 Changes
 *******
@@ -3112,14 +3136,18 @@
   (Vincent Ladeuil)
 
 
-bzr 1.7.1 2008-10-01
-####################
+bzr 1.7.1
+#########
+
+:Released:  2008-10-01
 
 No changes from 1.7.1rc1.
 
 
-bzr 1.7.1rc1 2008-09-24
-#######################
+bzr 1.7.1rc1
+############
+
+:Released: 2008-09-24
 
 This release just includes an update to how the merge algorithm handles
 file paths when we encounter complex history.
@@ -3134,8 +3162,10 @@
   (John Arbash Meinel)
 
 
-bzr 1.7 2008-09-23
-##################
+bzr 1.7
+#######
+
+:Released: 2008-09-23
 
 This release includes many bug fixes and a few performance and feature
 improvements.  ``bzr rm`` will now scan for missing files and remove them,
@@ -3152,8 +3182,10 @@
   packaging qbzr. (Mark Hammond)
 
 
-bzr 1.7rc2 2008-09-17
-#####################
+bzr 1.7rc2
+##########
+
+:Released: 2008-09-17
 
 A few bug fixes from 1.7rc1. The biggest change is a new
 ``RemoteBranch.get_stacked_on_url`` rpc. This allows clients that are
@@ -3177,8 +3209,10 @@
   (Andrew Bennetts)
 
 
-bzr 1.7rc1 2008-09-09
-#####################
+bzr 1.7rc1
+##########
+
+:Released: 2008-09-09
 
 This release candidate for bzr 1.7 has several bug fixes and a few
 performance and feature improvements.  ``bzr rm`` will now scan for
@@ -3375,16 +3409,20 @@
   clients now use this mechanism.  (Neil Martinsen-Burrell)
 
 
-bzr 1.6.1 2008-09-05
-####################
+bzr 1.6.1
+#########
+
+:Released: 2008-09-05
 
 A couple regressions were found in the 1.6 release. There was a
 performance issue when using ``bzr+ssh`` to branch large repositories,
 and some problems with stacking and ``rich-root`` capable repositories.
 
 
-bzr 1.6.1rc2 2008-09-03
-#######################
+bzr 1.6.1rc2
+############
+
+:Released: 2008-09-03
 
 Bug Fixes
 *********
@@ -3395,8 +3433,10 @@
   (John Arbash Meinel, #264321)
 
 
-bzr 1.6.1rc1 2008-08-29
-#######################
+bzr 1.6.1rc1
+############
+
+:Released: 2008-08-29
 
 This release fixes a few regressions found in the 1.6 client. Fetching
 changes was using an O(N^2) buffering algorithm, so for large projects it
@@ -3436,8 +3476,10 @@
   (John Arbash Meinel, #262333)
 
 
-bzr 1.6 2008-08-25
-##################
+bzr 1.6
+#######
+
+:Released: 2008-08-25
 
 Finally, the long awaited bzr 1.6 has been released. This release includes
 new features like Stacked Branches, improved weave merge, and an updated
@@ -3450,8 +3492,10 @@
 TortoiseBzr in the standalone Windows installer.
 
 
-bzr 1.6rc5 2008-08-19
-#####################
+bzr 1.6rc5
+##########
+
+:Released: 2008-08-19
 
 Bug Fixes
 *********
@@ -3463,8 +3507,10 @@
   (This change was reverted when merged to bzr.dev)
 
 
-bzr 1.6rc4 2008-08-18
-#####################
+bzr 1.6rc4
+##########
+
+:Released: 2008-08-18
 
 Bug Fixes
 *********
@@ -3474,8 +3520,10 @@
   rather than preserving deltas.  (John Arbash Meinel, #256757)
 
 
-bzr 1.6rc3 2008-08-14
-#####################
+bzr 1.6rc3
+##########
+
+:Released: 2008-08-14
 
 Changes
 *******
@@ -3508,8 +3556,10 @@
   development which is substantially faster. (Robert Collins)
 
 
-bzr 1.6rc2 2008-08-13
-#####################
+bzr 1.6rc2
+##########
+
+:Released: 2008-08-13
 
 This release candidate has a few minor bug fixes, and some regression
 fixes for Windows.
@@ -3547,8 +3597,10 @@
   will get the same results.  (John Arbash Meinel, #232188)
 
 
-bzr 1.6rc1 2008-08-06
-#####################
+bzr 1.6rc1
+##########
+
+:Released: 2008-08-06
 
 This release candidate for bzr 1.6 solidifies the new branch stacking
 feature.  Bazaar now recommends that users upgrade all knit repositories,
@@ -3684,8 +3736,10 @@
   (Ian Clatworthy)
 
 
-bzr 1.6beta3 2008-07-17
-#######################
+bzr 1.6beta3
+############
+
+:Released: 2008-07-17
 
 This release adds a new 'stacked branches' feature allowing branches to
 share storage without being in the same repository or on the same machine.
@@ -3857,8 +3911,10 @@
   (Robert Collins)
 
 
-bzr 1.6beta2 2008-06-10
-#######################
+bzr 1.6beta2
+############
+
+:Released: 2008-06-10
 
 This release contains further progress towards our 1.6 goals of shallow
 repositories, and contains a fix for some user-affecting bugs in the
@@ -3941,9 +3997,10 @@
 * Knit record serialisation is now stricter on what it will accept, to
   guard against potential internal bugs, or broken input. (Robert Collins)
 
-bzr 1.6beta1 2008-06-02
-#######################
+bzr 1.6beta1
+############
 
+:Released: 2008-06-02
 
 Commands that work on the revision history such as push, pull, missing,
 uncommit and log are now substantially faster.  This release adds a
@@ -4161,8 +4218,10 @@
   (Martin Pool)
 
 
-bzr 1.5 2008-05-16
-##################
+bzr 1.5
+#######
+
+:Released: 2008-05-16
 
 This release of Bazaar includes several updates to the documentation, and fixes
 to prepare for making rich root support the default format. Many bugs have been
@@ -4183,8 +4242,10 @@
   (Ian Clatworthy)
 
 
-bzr 1.5rc1 2008-05-09
-#####################
+bzr 1.5rc1
+##########
+
+:Released: 2008-05-09
 
 Changes
 *******
@@ -4354,8 +4415,10 @@
   (Martin Pool)
 
 
-bzr 1.4 2008-04-28
-##################
+bzr 1.4 
+#######
+
+:Released: 2008-04-28
 
 This release of Bazaar includes handy improvements to the speed of log and
 status, new options for several commands, improved documentation, and better
@@ -4374,8 +4437,10 @@
   (John Arbash Meinel, Andrew Bennetts, #214894)
 
 
-bzr 1.4rc2 2008-04-21
-#####################
+bzr 1.4rc2
+##########
+
+:Released: 2008-04-21
 
 Bug Fixes
 *********
@@ -4398,8 +4463,10 @@
   (Robert Collins, John Arbash Meinel)
 
 
-bzr 1.4rc1 2008-04-11
-#####################
+bzr 1.4rc1
+##########
+
+:Released: 2008-04-11
 
 Changes
 *******
@@ -4686,14 +4753,18 @@
   ``Graph.get_parent_map`` returns a dict of key:parents. (Robert Collins)
 
 
-bzr 1.3.1 2008-04-09
-####################
+bzr 1.3.1
+#########
+
+:Released: 2008-04-09
 
 No changes from 1.3.1rc1.
 
 
-bzr 1.3.1rc1 2008-04-04
-#######################
+bzr 1.3.1rc1
+############
+
+:Released: 2008-04-04
 
 Bug Fixes
 *********
@@ -4704,8 +4775,10 @@
   (#208418, Andrew Bennetts, Martin Pool, Robert Collins)
 
 
-bzr 1.3 2008-03-20
-##################
+bzr 1.3
+#######
+
+:Released: 2008-03-20
 
 Bazaar has become part of the GNU project <http://www.gnu.org>
 
@@ -4721,8 +4794,10 @@
   (#202778, Martin Pool)
 
 
-bzr 1.3rc1 2008-03-16
-#####################
+bzr 1.3rc1
+##########
+
+:Released: 2008-03-16
 
 Notes When Upgrading
 ********************
@@ -4908,8 +4983,10 @@
   format. (Robert Collins)
 
 
-bzr 1.2 2008-02-15
-##################
+bzr 1.2
+#######
+
+:Released: 2008-02-15
 
 Bug Fixes
 *********
@@ -4917,8 +4994,10 @@
 * Fix failing test in Launchpad plugin. (Martin Pool)
 
 
-bzr 1.2rc1 2008-02-13
-#####################
+bzr 1.2rc1
+##########
+
+:Released: 2008-02-13
 
 Notes When Upgrading
 ********************
@@ -5119,13 +5198,17 @@
   revision names etc. (Robert Collins)
 
 
-bzr 1.1 2008-01-15
-##################
+bzr 1.1
+#######
+
+:Released: 2008-01-15
 
 (no changes from 1.1rc1)
 
-bzr 1.1rc1 2008-01-05
-#####################
+bzr 1.1rc1
+##########
+
+:Released: 2008-01-05
 
 Changes
 *******
@@ -5335,8 +5418,10 @@
   replaced by the new helper methods added in this release. (Robert Collins)
 
 
-bzr 1.0 2007-12-14
-##################
+bzr 1.0
+#######
+
+:Released: 2007-12-14
 
 Documentation
 *************
@@ -5353,8 +5438,10 @@
   (Ian Clatworthy)
 
 
-bzr 1.0rc3 2007-12-11
-#####################
+bzr 1.0rc3
+##########
+
+:Released: 2007-12-11
 
 Changes
 *******
@@ -5395,8 +5482,10 @@
   (Vincent Ladeuil)
 
 
-bzr 1.0rc2 2007-12-07
-#####################
+bzr 1.0rc2
+##########
+
+:Released: 2007-12-07
 
 Improvements
 ************
@@ -5470,8 +5559,10 @@
   ``started`` methods. (Matt Nordhoff)
 
 
-bzr 1.0rc1 2007-11-30
-#####################
+bzr 1.0rc1
+##########
+
+:Released: 2007-11-30
 
 Notes When Upgrading
 ********************
@@ -5747,8 +5838,10 @@
 * InventoryEntry.diff is now deprecated.  Please use diff.DiffTree instead.
 
 
-bzr 0.92 2007-11-05
-###################
+bzr 0.92
+########
+
+:Released: 2007-11-05
 
 Changes
 *******
@@ -5756,8 +5849,10 @@
   * New uninstaller on Win32.  (Alexander Belchenko)
 
 
-bzr 0.92rc1 2007-10-29
-######################
+bzr 0.92rc1
+###########
+
+:Released: 2007-10-29
 
 Changes
 *******
@@ -6076,8 +6171,10 @@
   raises a Python warning.  (Martin Pool)
 
 
-bzr 0.91 2007-09-26
-###################
+bzr 0.91
+########
+
+:Released: 2007-09-26
 
 Bug Fixes
 *********
@@ -6098,15 +6195,19 @@
   (Andrew Bennetts)
 
 
-bzr 0.91rc2 2007-09-11
-######################
+bzr 0.91rc2
+###########
+
+:Released: 2007-09-11
 
 * Replaced incorrect tarball for previous release; a debug statement was left
   in bzrlib/remote.py.
 
 
-bzr 0.91rc1 2007-09-11
-######################
+bzr 0.91rc1
+###########
+
+:Released: 2007-09-11
 
 Changes
 *******
@@ -6433,8 +6534,10 @@
   [] to revert all files is deprecated.  (Aaron Bentley)
 
 
-bzr 0.90 2007-08-28
-###################
+bzr 0.90
+########
+
+:Released: 2007-08-28
 
 Improvements
 ************
@@ -6457,8 +6560,10 @@
   and call ``create_repository`` on that.  (Martin Pool)
 
 
-bzr 0.90rc1 2007-08-14
-######################
+bzr 0.90rc1
+###########
+
+:Released: 2007-08-14
 
 Bugfixes
 ********
@@ -6730,8 +6835,10 @@
   parameter.  Varargs-style parameters are deprecated. (Aaron Bentley)
 
 
-bzr 0.18  2007-07-17
-####################
+bzr 0.18
+########
+
+:Released:  2007-07-17
 
 Bugfixes
 ********
@@ -6739,8 +6846,10 @@
 * Fix 'bzr add' crash under Win32 (Kuno Meyer)
 
 
-bzr 0.18rc1  2007-07-10
-#######################
+bzr 0.18rc1
+###########
+
+:Released:  2007-07-10
 
 Bugfixes
 ********
@@ -6991,8 +7100,10 @@
   (Vincent Ladeuil, #110448)
 
 
-bzr 0.17  2007-06-18
-####################
+bzr 0.17
+########
+
+:Released:  2007-06-18
 
 Bugfixes
 ********
@@ -7004,8 +7115,10 @@
   (Aaron Bentley, Ian Clatworthy, #120930)
 
 
-bzr 0.17rc1  2007-06-12
-#######################
+bzr 0.17rc1
+###########
+
+:Released:  2007-06-12
 
 Notes When Upgrading
 ********************
@@ -7106,8 +7219,10 @@
   your repository. (Previously Branch6 only supported revisions in your
   mainline). (John Arbash Meinel, #115343)
 
-bzr 0.16  2007-05-07
-####################
+bzr 0.16
+########
+
+:Released:  2007-05-07
 
 Bugfixes
 ********
@@ -7137,8 +7252,10 @@
   diff`` and ``bzr status`` significantly improving the speed of
   both. (John Arbash Meinel)
 
-bzr 0.16rc2  2007-04-30
-#######################
+bzr 0.16rc2
+###########
+
+:Released:  2007-04-30
 
 Bugfixes
 ********
@@ -7161,8 +7278,10 @@
 * ``WorkingTree4._iter_changes`` should not descend into unversioned
   directories. (John Arbash Meinel, #110399)
 
-bzr 0.16rc1  2007-04-26
-#######################
+bzr 0.16rc1
+###########
+
+:Released:  2007-04-26
 
 Notes When Upgrading
 ********************
@@ -7469,8 +7588,10 @@
   implementation of new auth schemes for both http and proxy.
   (Vincent Ladeuil)
 
-bzr 0.15 2007-04-01
-###################
+bzr 0.15
+########
+
+:Released: 2007-04-01
 
 Bugfixes
 ********
@@ -7482,8 +7603,10 @@
   checking out a branch that contains an old-format working tree.
   (Martin Pool)
 
-bzr 0.15rc3  2007-03-26
-#######################
+bzr 0.15rc3
+###########
+
+:Released:  2007-03-26
 
 Changes
 *******
@@ -7558,8 +7681,10 @@
 * Correctly handles mutiple permanent http redirections.
   (vila, #88780)
 
-bzr 0.15rc2  2007-03-14
-#######################
+bzr 0.15rc2
+###########
+
+:Released:  2007-03-14
 
 Notes When Upgrading
 ********************
@@ -7612,8 +7737,10 @@
   (Wouter van Heyst, #53483)
 
 
-bzr 0.15rc1  2007-03-07
-#######################
+bzr 0.15rc1
+###########
+
+:Released:  2007-03-07
 
 Surprises
 *********
@@ -7843,8 +7970,10 @@
   before the rest of the suite.  (Martin Pool)
 
 
-bzr 0.14  2007-01-23
-####################
+bzr 0.14
+########
+
+:Released:  2007-01-23
 
 Improvements
 ************
@@ -7863,8 +7992,10 @@
   it is in is below a repository. (James Westby, #77306)
 
 
-bzr 0.14rc1  2007-01-16
-#######################
+bzr 0.14rc1
+###########
+
+:Released:  2007-01-16
 
 Improvements
 ************
@@ -7998,14 +8129,18 @@
   (Alexander Belchenko, #68124)
 
 
-bzr 0.13  2006-12-05
-####################
+bzr 0.13
+########
+
+:Released:  2006-12-05
 
 No changes from 0.13rc
 
 
-bzr 0.13rc1  2006-11-27
-#######################
+bzr 0.13rc1
+###########
+
+:Released:  2006-11-27
 
 Improvements
 ************
@@ -8130,8 +8265,10 @@
 * TestingHTTPRequestHandler really handles the Range header
   (previously it was ignoring it and returning the whole file,).
 
-bzr 0.12  2006-10-30
-####################
+bzr 0.12
+########
+
+:Released:  2006-10-30
 
 Internals
 *********
@@ -8140,8 +8277,10 @@
   and remove benchmarks that take longer than 10min to run.
   (John Arbash Meinel)
 
-bzr 0.12rc1  2006-10-23
-#######################
+bzr 0.12rc1
+###########
+
+:Released:  2006-10-23
 
 Improvements
 ************
@@ -8262,13 +8401,17 @@
   option to set the BzrDir, Repository and Branch formats of the
   created objects. (Robert Collins, John Arbash Meinel)
 
-bzr 0.11  2006-10-02
-####################
+bzr 0.11
+########
+
+:Released:  2006-10-02
 
 * Smart server transport test failures on windows fixed. (Lukáš Lalinský).
 
-bzr 0.11rc2  2006-09-27
-#######################
+bzr 0.11rc2
+###########
+
+:Released:  2006-09-27
 
 Bug Fixes
 *********
@@ -8278,8 +8421,10 @@
 * Commit performance regression fixed. (Aaron Bentley, Robert Collins, John
   Arbash Meinel).
 
-bzr 0.11rc1  2006-09-25
-#######################
+bzr 0.11rc1
+###########
+
+:Released:  2006-09-25
 
 Improvements
 ************
@@ -8472,8 +8617,10 @@
   allow upgrades to a richer interface than the VFS one provided by
   Transport. (Andrew Bennetts, Martin Pool)
 
-bzr 0.10  2006-08-29
-####################
+bzr 0.10
+########
+
+:Released:  2006-08-29
 
 Improvements
 ************
@@ -8550,8 +8697,10 @@
   need to be installed. This should help make the life of packagers
   easier. (John Arbash Meinel)
 
-bzr 0.9.0  2006-08-11
-#####################
+bzr 0.9.0
+#########
+
+:Released:  2006-08-11
 
 Surprises
 *********
@@ -8818,16 +8967,20 @@
 
 * "RevisionTree" is now in bzrlib/revisiontree.py. (Robert Collins)
 
-bzr 0.8.2  2006-05-17
-#####################
+bzr 0.8.2
+#########
+
+:Released:  2006-05-17
 
 Bug Fixes
 *********
 
 * setup.py failed to install launchpad plugin.  (Martin Pool)
 
-bzr 0.8.1  2006-05-16
-#####################
+bzr 0.8.1
+#########
+
+:Released:  2006-05-16
 
 Bug Fixes
 *********
@@ -8880,8 +9033,10 @@
 * Fix test case for bzr info in upgrading a standalone branch to metadir,
   uses bzrlib api now. (Olaf Conradi)
 
-bzr 0.8  2006-05-08
-###################
+bzr 0.8
+#######
+
+:Released:  2006-05-08
 
 Notes When Upgrading
 ********************
@@ -9142,8 +9297,10 @@
 * ``run_bzr`` and ``run_bzr_captured`` now accept a 'stdin="foo"'
   parameter which will provide String("foo") to the command as its stdin.
 
-bzr 0.7 2006-01-09
-##################
+bzr 0.7
+#######
+
+:Released: 2006-01-09
 
 Changes
 *******
@@ -9438,8 +9595,10 @@
 * ``bzrlib.osutils.safe_unicode`` now exists to provide parameter coercion
   for functions that need unicode strings. (Robert Collins)
 
-bzr 0.6 2005-10-28
-##################
+bzr 0.6
+#######
+
+:Released: 2005-10-28
 
 Improvements
 ************
@@ -9654,8 +9813,10 @@
   [-1] in the revision-history. (Andres Salomon)
 
 
-bzr 0.1.1 2005-10-12
-####################
+bzr 0.1.1
+#########
+
+:Released: 2005-10-12
 
 Bug Fixes
 *********
@@ -9672,8 +9833,10 @@
 * Avoid some unnecessary http operations in branch and pull.
 
 
-bzr 0.1 2005-10-11
-##################
+bzr 0.1
+#######
+
+:Released: 2005-10-11
 
 Notes
 *****
@@ -9802,8 +9965,10 @@
   of tests to run, e.g. ``bzr selftest test_weave``
 
 
-bzr 0.0.9 2005-09-23
-####################
+bzr 0.0.9
+#########
+
+:Released: 2005-09-23
 
 Bug Fixes
 *********
@@ -9844,8 +10009,11 @@
   another (used by pull, merged, etc.)
 
 
-bzr 0.0.8 2005-09-20
-####################
+bzr 0.0.8
+#########
+
+:Released: 2005-09-20
+
 
 Improvements
 ************
@@ -9895,8 +10063,10 @@
 * Quieten warnings about locking; patch from Matt Lavin.
 
 
-bzr-0.0.7 2005-09-02
-####################
+bzr-0.0.7
+#########
+
+:Released: 2005-09-02
 
 New Features
 ************
@@ -9950,8 +10120,10 @@
 
 
 
-bzr-0.0.6 2005-08-18
-####################
+bzr-0.0.6
+#########
+
+:Released: 2005-08-18
 
 New Features
 ************
@@ -10036,8 +10208,10 @@
 * Fix bugs in committing only selected files or within a subdirectory.
 
 
-bzr-0.0.5  2005-06-15
-#####################
+bzr-0.0.5
+#########
+
+:Released:  2005-06-15
 
 Changes
 *******
@@ -10178,8 +10352,10 @@
   2.4 is now only recommended.
 
 
-bzr-0.0.4  2005-04-22
-#####################
+bzr-0.0.4
+#########
+
+:Released:  2005-04-22
 
 Enhancements
 ************
@@ -10247,8 +10423,10 @@
   from QuantumG.
 
 
-bzr-0.0.3  2005-04-06
-#####################
+bzr-0.0.3
+#########
+
+:Released:  2005-04-06
 
 Enhancements
 ************
@@ -10302,8 +10480,11 @@
 * Win32 fixes from Steve Brown.
 
 
-bzr-0.0.2  "black cube"  2005-03-31
-###################################
+bzr-0.0.2
+#########
+
+:Codename: "black cube"
+:Released: 2005-03-31
 
 Enhancements
 ************
@@ -10331,8 +10512,10 @@
   the root directory only.
 
 
-bzr-0.0.1  2005-03-26
-#####################
+bzr-0.0.1
+#########
+
+:Released:  2005-03-26
 
 Enhancements
 ************
@@ -10361,8 +10544,10 @@
   supported).
 
 
-bzr-0.0.0.69  2005-03-22
-########################
+bzr-0.0.0.69
+############
+
+:Released:  2005-03-22
 
 Enhancements
 ************

=== added file 'bzrlib/doc_generate/sphinx_conf.py'
--- bzrlib/doc_generate/sphinx_conf.py	1970-01-01 00:00:00 +0000
+++ bzrlib/doc_generate/sphinx_conf.py	2009-09-08 16:37:05 +0000
@@ -0,0 +1,214 @@
+# -*- coding: utf-8 -*-
+#
+# Bazaar documentation build configuration file, created by
+# sphinx-quickstart on Tue Jul 21 17:04:52 2009.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.append(os.path.abspath('.'))
+
+
+# -- General configuration -----------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx.ext.ifconfig']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.txt'
+
+# The encoding of source files.
+#source_encoding = 'utf-8'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'Bazaar'
+copyright = u'2009, Canonical Ltd'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+import bzrlib
+version = '.'.join(str(p) for p in bzrlib.version_info[:2])
+# The full version, including alpha/beta/rc tags.
+release = bzrlib.version_string
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of documents that shouldn't be included in the build.
+#unused_docs = []
+
+# List of directories, relative to source directory, that shouldn't be searched
+# for source files.
+exclude_trees = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  Major themes that come with
+# Sphinx are currently 'default' and 'sphinxdoc'.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+html_theme_options = {
+    # Unfortunately, the right sidebar breaks under IE6 and maybe IE7.
+    # So we stick with the default left placement to cater for users stuck
+    # on those browsers.
+    #'rightsidebar': True,
+
+    # Non-document areas: header (relbar), footer, sidebar, etc.
+    # Some useful colours here:
+    # * blue: darkblue, mediumblue, darkslateblue, cornflowerblue, royalblue,
+    #   midnightblue
+    # * gray: dimgray, slategray, lightslategray
+    'sidebarbgcolor':   "cornflowerblue",
+    'sidebarlinkcolor': "midnightblue",
+    'relbarbgcolor':    "darkblue",
+    'footerbgcolor':    "lightslategray",
+
+    # Text, heading and code colouring
+    'codebgcolor':      "lightyellow",
+    'codetextcolor':    "firebrick",
+    'linkcolor':        "mediumblue",
+    }
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+html_favicon = "bzr.ico"
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+html_use_modindex = False
+
+# If false, no index is generated.
+html_use_index = False
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+html_show_sourcelink = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = ''
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'bzr-docs'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+# The paper size ('letter' or 'a4').
+#latex_paper_size = 'letter'
+
+# The font size ('10pt', '11pt' or '12pt').
+#latex_font_size = '10pt'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = []
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+latex_logo = '../Bazaar-Logo-For-Manuals.png'
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# Additional stuff for the LaTeX preamble.
+#latex_preamble = ''
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_use_modindex = True
+
+
+# -- Bazaar-specific configuration ---------------------------------------------
+
+# Authors of the documents
+bzr_team = u'Bazaar Developers'

=== removed file 'doc/BUILD-NOTES'
--- doc/BUILD-NOTES	2009-07-26 15:58:33 +0000
+++ doc/BUILD-NOTES	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-To build Bazaar's documentation using Sphinx, follow the
-steps below.
-
-0. Install Sphinx. You'll need Sphinx 0.6 or later. If that
-   version isn't available in your package manager repositories
-   yet, install python-easyinstall and use it to install Sphinx.
-   See http://sphinx.pocoo.org/ for details.
-
-1. Build the Bazaar docs normally, i.e. in the project root, run:
-
-   make docs
-
-2. Tweak the User Guide index page used:
-
-   cd doc/en/user-guide
-   bzr mv index.txt index-for-1x.txt
-   bzr mv index-for-2x.txt index.txt
-
-3. Tweak the Release Notes TOC depth:
-
-   cd ../release-notes
-   vi NEWS.txt  (change depth to 2)
-
-4. Change to the docs directory and build the site:
-
-   cd ../..
-   make html
-
-The generated output site can be found in _build/html.
-
-Note: All of the above will Just Work soon. For now, we don't
-want to break the existing doc generation until a few issues
-with the Sphinx-generated site are ironed out, e.g. links from
-the User Reference to ../user-guide/index.html#foo no longer
-work when the User Guide is nicely split into topic pages.

=== added file 'doc/Bazaar-Logo-For-Manuals.png'
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
=== removed directory 'doc/_static/en/quick-reference'
=== removed file 'doc/bazaar-vcs.org.kid'
--- doc/bazaar-vcs.org.kid	2007-08-14 03:59:22 +0000
+++ doc/bazaar-vcs.org.kid	1970-01-01 00:00:00 +0000
@@ -1,482 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<?python
-   def update_attrib(attrib, **kwargs):
-      attrib = dict(attrib)
-      attrib.update(kwargs)
-      return attrib
-?>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#">
-<head>
-<script type="text/javascript" src=
-"/htdocs/bazaarNew/js/opacity.js">
-</script>
-<link rel="shortcut icon" href=
-"http://bazaar-vcs.org/Welcome?action=AttachFile&amp;do=get&amp;target=favicon.ico"
-type="image/x-icon" />
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii" />
-<meta name="robots" content="index,follow" />
-<title>Welcome - Bazaar Version Control</title>
-
-<script type="text/javascript" src="http://bazaar-vcs.org/htdocs/common/js/common.js">
-</script>
-<script type="text/javascript">
-//<![CDATA[
-<!--// common functions
-
-// We keep here the state of the search box
-searchIsDisabled = false;
-
-function searchChange(e) {
-    // Update search buttons status according to search box content.
-    // Ignore empty or whitespace search term.
-    var value = e.value.replace(/\s+/, '');
-    if (value == '' || searchIsDisabled) { 
-        searchSetDisabled(true);
-    } else {
-        searchSetDisabled(false);
-    }
-}
-
-function searchSetDisabled(flag) {
-    // Enable or disable search
-    document.getElementById('fullsearch').disabled = flag;
-    document.getElementById('titlesearch').disabled = flag;
-}
-
-function searchFocus(e) {
-    // Update search input content on focus
-    if (e.value == 'Search') {
-        e.value = '';
-        e.className = '';
-        searchIsDisabled = false;
-    }
-}
-
-function searchBlur(e) {
-    // Update search input content on blur
-    if (e.value == '') {
-        e.value = 'Search';
-        e.className = 'disabled';
-        searchIsDisabled = true;
-    }
-}
-
-function actionsMenuInit(title) {
-    // Initialize action menu
-    for (i = 0; i < document.forms.length; i++) {
-        var form = document.forms[i];
-        if (form.className == 'actionsmenu') {
-            // Check if this form needs update
-            var div = form.getElementsByTagName('div')[0];
-            var label = div.getElementsByTagName('label')[0];
-            if (label) {
-                // This is the first time: remove label and do buton.
-                div.removeChild(label);
-                var dobutton = div.getElementsByTagName('input')[0];
-                div.removeChild(dobutton);
-                // and add menu title
-                var select = div.getElementsByTagName('select')[0];
-                var item = document.createElement('option');
-                item.appendChild(document.createTextNode(title));
-                item.value = 'show';
-                select.insertBefore(item, select.options[0]);
-                select.selectedIndex = 0;
-            }
-        }
-    }
-}
-//-->
-//]]>
-</script>
-<link rel="stylesheet" type="text/css" charset="utf-8" media="all"
-href="http://bazaar-vcs.org/htdocs/bazaarNew/css/common.css" />
-<link rel="stylesheet" type="text/css" charset="utf-8" media=
-"screen" href="http://bazaar-vcs.org/htdocs/bazaarNew/css/screen.css" />
-<link rel="stylesheet" type="text/css" charset="utf-8" media=
-"print" href="http://bazaar-vcs.org/htdocs/bazaarNew/css/print.css" />
-<link rel="stylesheet" type="text/css" charset="utf-8" media=
-"projection" href="http://bazaar-vcs.org/htdocs/bazaarNew/css/projection.css" />
-<link rel="stylesheet" type="text/css" charset="utf-8" media=
-"screen" href="http://bazaar-vcs.org/htdocs/bazaarNew/css/v4.css" />
-<link rel="stylesheet" type="text/css" charset="utf-8" media=
-"screen" href="http://bazaar-vcs.org/htdocs/bazaarNew/css/screen2.css" />
-<link rel="stylesheet" type="text/css" charset="utf-8" media=
-"screen" href="http://bazaar-vcs.org/htdocs/bazaarNew/css/twoColumnsRight.css" />
-<style type="text/css">
-a.toc-backref
-{
-    color: black;
-    text-decoration: none;
-}
-</style>
-<link rel="alternate" title="Bazaar Version Control Recent Changes"
-href="http://bazaar-vcs.org/RecentChanges?action=rss_rc&amp;ddiffs=1&amp;unique=1" type=
-"application/rss+xml" />
-<link rel="Start" href="http://bazaar-vcs.org/Welcome" />
-<link rel="Alternate" title="Wiki Markup" href=
-"http://bazaar-vcs.org/Welcome?action=raw" />
-<link rel="Alternate" media="print" title="Print View" href=
-"http://bazaar-vcs.org/Welcome?action=print" />
-<link rel="Appendix" title="favicon.ico" href=
-"http://bazaar-vcs.org/Welcome?action=AttachFile&amp;do=view&amp;target=favicon.ico" />
-<link rel="Search" href="http://bazaar-vcs.org/FindPage" />
-<link rel="Index" href="http://bazaar-vcs.org/TitleIndex" />
-<link rel="Glossary" href="http://bazaar-vcs.org/WordIndex" />
-<link rel="Help" href="http://bazaar-vcs.org/HelpOnFormatting" />
-</head>
-<body lang="en" dir="ltr" xml:lang="en">
-<div id="page_header1_div"><script type="text/javascript">
-//<![CDATA[
-gui_editor_link_text = gui_editor_link_href = null;
-//]]>
-</script></div>
-<div id="pageWrapper">
-<hr class="hide" />
-<div id="masthead" class="inside">
-<div id="logoimage"><a href="http://bazaar-vcs.org/"><img src=
-"http://bazaar-vcs.org/htdocs/bazaarNew/css/logo.png" width="144" height="149" alt=
-"Bazaar" /></a></div>
-<h1><a href="http://bazaar-vcs.org/">Bazaar</a></h1>
-<p>GPL Distributed Version Control Software</p>
-</div>
-<hr class="hide" />
-<div class="hnav">
-<ul>
-<li class="hide"><a class="hide" href="#skipToContent"><em>Skip
-Navigation</em></a> <span class="divider">:</span></li>
-<li><a href="http://bazaar-vcs.org/Documentation" id="hnav_learn" name=
-"hnav_learn">Learn</a> <span class="divider">:</span></li>
-<li><a href="http://bazaar-vcs.org/Download" id="hnav_get" name="hnav_get">Get</a>
-<span class="divider">:</span></li>
-<li><a href="http://bazaar-vcs.org/BzrSupport" id="hnav_community" name=
-"hnav_community">Community</a> <span class="divider">:</span></li>
-<li><a href="http://bazaar-vcs.org/BzrPlugins" id="hnav_plugins" name=
-"hnav_plugins">Plugins</a></li>
-</ul>
-</div>
-<div id="outerColumnContainer">
-<div id="innerColumnContainer">
-<hr class="hide" />
-<div id="leftColumn">
-<div class="inside"></div>
-</div>
-<hr class="hide" />
-<div id="rightColumn">
-<div class="inside">
-<div id="searchbox">
-<form name="search" method="get" action="http://bazaar-vcs.org/" id="search">
-<div><input type="hidden" name="action" value="fullsearch" id=
-"fullsearch" /> <input type="hidden" name="context" value="180" />
-<input type="hidden" name="fullsearch" value="Text" /> <label for=
-"search_q" py:content="'Search Wiki'">Search Bazaar</label> <input type="text" name="value"
-id="search_q" value="" onfocus="searchFocus(this)" onblur=
-"searchBlur(this)" onkeyup="searchChange(this)" onchange=
-"searchChange(this)" alt="Search" /> <input type="submit" value=
-"go" name="go" id="search_go" /></div>
-</form>
-</div>
-<div id="searchform"></div>
-<div id="username" class="vnav">
-<h4>Website Links</h4>
-<ul>
-<li><a href="http://doc.bazaar-vcs.org">Documentation</a></li>
-<li><a href="http://bazaar-vcs.org">Wiki</a></li>
-</ul>
-</div>
-</div>
-</div>
-<div id="contentColumn" class="page_Welcome">
-<hr class="hide" />
-<div id="msg" class="vnav"></div>
-<a name="skipToContent" id="skipToContent"></a>
-<div class="inside" >
-<!--<img id="navProtection" width="1" height="1" border="0" src="/htdocs/bazaarNew/css/spacer.gif" alt="" style="height: 1px"/>-->
-<a py:match="item.tag == 'a' and 'href' not in item.attrib" py:content="item.text" py:attrs="update_attrib(item.attrib, style='color: black')"/>
-<div dir="ltr" id="content" lang="en" xml:lang="en" py:content="body[:]"><span
-class="anchor" id="top"></span> <span class="anchor" id="line-8"></span>
-<h1 id="head-31592baed255c2a5cdfdaafb9521b837ea61021f">Performance
-Drive Under Way</h1>
-<span class="anchor" id="line-9"></span>
-<p class="line879">There was substantial progress on performance
-since 0.8. See <a href="/Performance/0.9">Performance/0.9</a>,
-<a href="/Performance/0.10">Performance/0.10</a> and <a href=
-"/Performance/0.11">Performance/0.11</a>. Thanks to everyone who
-has contributed patches and ideas! The focus from here to 1.0 will
-continue to be performance and documentation. Already there is work
-in progress to: <span class="anchor" id="line-10"></span></p>
-<span class="anchor" id="line-11"></span>
-<ul>
-<li>
-<p class="line879">write a <a href="/SmartServer">SmartServer</a>
-for high speed network operations (first look in 0.11).
-<span class="anchor" id="line-12"></span></p>
-</li>
-<li>
-<p class="line886">optimise file system access (tune our code and
-data structures to minimise probable disk io and disk seeking)
-<span class="anchor" id="line-13"></span></p>
-</li>
-<li>
-<p class="line886">optimise file formats for performance without
-sacrificing proven correctness and completeness <span class=
-"anchor" id="line-14"></span></p>
-</li>
-<li>
-<p class="line886">tune the codepaths that are most heavily used
-<span class="anchor" id="line-15"></span></p>
-</li>
-<li>
-<p class="line886">ensure that large imports are only done when
-needed, and use lightweight imports where possible <span class=
-"anchor" id="line-16"></span></p>
-<span class="anchor" id="line-17"></span></li>
-</ul>
-<h1 id="head-ceb9b8e0146b0ce087048f495b2ff2964c5d57ec">News</h1>
-<span class="anchor" id="line-18"></span>
-<h2 id="head-39a1524e97c9a6ba89ecee7856cb1a2e68134373">27th
-September 2006 - 0.11rc2 released</h2>
-<span class="anchor" id="line-19"></span>
-<p class="line879">bzr 0.11rc2 has been released. This release
-candidate corrects two regressions that occured from 0.10. Windows
-developers and users with very large source trees should upgrade
-immediately. Release <a class="https" href=
-"https://lists.canonical.com/archives/bazaar-ng/2006q3/017581.html">
-announcement</a> or <a class="http" href=
-"http://bazaar-vcs.org/releases/src/bzr-0.11rc2.tar.gz">download
-now</a>. For details of the original 0.11 release candidate, see
-the <a class="https" href=
-"https://lists.canonical.com/archives/bazaar-ng/2006q3/017502.html">
-announcement</a>. <span class="anchor" id="line-20"></span></p>
-<span class="anchor" id="line-21"></span>
-<h2 id="head-9940b3014f81c7b8ca65aa3235341588859d09dd">4th
-September 2006 - 0.10 released</h2>
-<span class="anchor" id="line-22"></span>
-<p class="line879">bzr 0.10 has been released after a smooth beta
-period. <a class="http" href=
-"http://bazaar-vcs.org/releases/src/bzr-0.10.tar.gz">download it
-now</a>! <span class="anchor" id="line-23"></span></p>
-<span class="anchor" id="line-24"></span>
-<h1 id="head-c2a87bc7d0bc411d33e18585154e534201115501">What is
-Bazaar?</h1>
-<span class="anchor" id="line-25"></span>
-<p class="line879">Bazaar is a decentralized revision control
-system designed to be easy for developers and end users alike.
-Decentralized revision control systems give people the ability to
-work over the internet using the <a class="http" href=
-"http://en.wikipedia.org/wiki/The_Cathedral_and_the_Bazaar">bazaar
-development model</a>. When you use Bazaar, you can commit to your
-own branches of your favorite free software projects without
-needing special permission. For more information, see: <span class=
-"anchor" id="line-26"></span></p>
-<span class="anchor" id="line-27"></span>
-<ul>
-<li>
-<p class="line903"><a href="/Bzr">What Is Bazaar?</a> <span class=
-"anchor" id="line-28"></span></p>
-</li>
-<li>
-<p class="line903"><a href="/WhoUsesBzr">Who Uses Bazaar?</a>
-<span class="anchor" id="line-29"></span></p>
-</li>
-<li>
-<p class="line903"><a href="/BzrFeatures">Bazaar Features</a>
-<span class="anchor" id="line-30"></span></p>
-</li>
-<li>
-<p class="line903"><a href="/FAQ">FAQ</a> (Frequently Asked
-Questions) <span class="anchor" id="line-31"></span></p>
-</li>
-<li>
-<p class="line903"><a href="/BzrGlossary">Bazaar Glossary</a>
-<span class="anchor" id="line-32"></span></p>
-</li>
-<li>
-<p class="line903"><a href="/ReleaseRoadmap">What's Coming</a> (the
-release roadmap) <span class="anchor" id="line-33"></span></p>
-<span class="anchor" id="line-34"></span></li>
-</ul>
-<h1 id="head-54a84f21f8314a452aecfb4e2da59fcb246fee7b">Where do I
-get it?</h1>
-<span class="anchor" id="line-35"></span>
-<p class="line886">The easiest place to get Bazaar is with your
-distribution. Do not despair if your distribution does not have
-Bazaar, as plain installation is still easy. <span class="anchor"
-id="line-36"></span></p>
-<span class="anchor" id="line-37"></span>
-<ul>
-<li>
-<p class="line903"><a href="/DistroDownloads">Packages</a> -
-Downloads for various distributions <span class="anchor" id=
-"line-38"></span></p>
-</li>
-<li>
-<p class="line903"><a href="/OfficialDownloads">Source</a> - Source
-downloads <span class="anchor" id="line-39"></span></p>
-</li>
-<li>
-<p class="line903"><a href="/WindowsDownloads">Windows</a> -
-Downloads for windows <span class="anchor" id="line-40"></span></p>
-<span class="anchor" id="line-41"></span></li>
-</ul>
-<h1 id="head-400b61668c5f3ab729ffbfeed0f9fc93e853044e">How do I
-install it?</h1>
-<span class="anchor" id="line-42"></span>
-<p class="line879">Installation for Bazaar is a snap. Supported
-operating systems include Linux, FreeBSD, Windows (Native &amp;
-Cygwin) and Solaris. If you can run Python 2.4, then you can run
-Bazaar. <span class="anchor" id="line-43"></span></p>
-<span class="anchor" id="line-44"></span>
-<ul>
-<li>
-<p class="line903"><a href="/DistroDownloads">Packages</a> -
-Downloads for various distributions <span class="anchor" id=
-"line-45"></span></p>
-</li>
-<li>
-<p class="line903"><a href="/Installation">Generic</a> - Generic
-Installation Instructions. <span class="anchor" id=
-"line-46"></span></p>
-</li>
-<li>
-<p class="line903"><a href="/BzrOnPureWindows">Native Windows</a> -
-Installation of Bazaar on Native windows. <span class="anchor" id=
-"line-47"></span></p>
-<span class="anchor" id="line-48"></span></li>
-</ul>
-<h1 id="head-6350ee8bfd03b56b430e775595af1eb29ac7bdb4">How do I use
-it?</h1>
-<span class="anchor" id="line-49"></span>
-<p class="line886">Included are the pearls of wisdom from people
-that have already branched off into a new world of development.
-<span class="anchor" id="line-50"></span></p>
-<span class="anchor" id="line-51"></span>
-<ul>
-<li>
-<p class="line903"><a href="/Documentation">Documents</a> - The
-main documentation page for Bazaar. <span class="anchor" id=
-"line-52"></span></p>
-</li>
-<li>
-<p class="line903"><a href="/IntroductionToBzr">Introduction</a> -
-Introduction to Bazaar gives a walkthough of the simpler commands.
-<span class="anchor" id="line-53"></span></p>
-</li>
-<li>
-<p class="line903"><a href="/QuickHackingWithBzr">Mini Tutorial</a>
-- The five minutes Bazaar Tutorial. <span class="anchor" id=
-"line-54"></span></p>
-</li>
-<li>
-<p class="line903"><a href="/BzrRevisionSpec">Revision Specs</a> -
-Arguments for -r that can be given with "bzr log", "bzr merge" and
-such. <span class="anchor" id="line-55"></span></p>
-<span class="anchor" id="line-56"></span></li>
-</ul>
-<h1 id="head-148c5debbd034308b67411c490e69555ee5a03a3">How does it
-compare?</h1>
-<span class="anchor" id="line-57"></span>
-<p class="line886">If you're familiar with other version control
-systems, you might like to see a quick comparison to them, or read
-guidelines to help you understand how to use bzr most effectively
-given your current experience. <span class="anchor" id=
-"line-58"></span></p>
-<span class="anchor" id="line-59"></span>
-<ul>
-<li>
-<p class="line903"><a href="/BzrForCVSUsers">BzrForCVSUsers</a> -
-Learning Bazaar for CVS users. <span class="anchor" id=
-"line-60"></span></p>
-</li>
-<li>
-<p class="line903"><a href="/BzrForGITUsers">BzrForGITUsers</a> -
-(In progress) Learning Bazaar for GIT users <span class="anchor"
-id="line-61"></span></p>
-</li>
-<li>
-<p class="line903"><a href="/RcsComparisons">RcsComparisons</a> -
-Comparison table of functionality and performance with Bazaar, GIT,
-Mercurial, SVN and other VCS systems. <span class="anchor" id=
-"line-62"></span></p>
-<span class="anchor" id="line-63"></span></li>
-</ul>
-<h1 id="head-e966f9f6520262482dc713218b2a916600636f14">How can I
-get Help?</h1>
-<span class="anchor" id="line-64"></span>
-<p class="line879">Our primary page for getting help is the
-<a href="/BzrSupport">BzrSupport</a> page. <span class="anchor" id=
-"line-65"></span></p>
-<span class="anchor" id="line-66"></span>
-<ul>
-<li>
-<p class="line903"><a class="https" href=
-"https://launchpad.net/products/bzr/+bugs">Bug Tracker</a> - You
-can check here to see if someone else is experiencing the same
-problem that you are. <span class="anchor" id="line-67"></span></p>
-</li>
-<li>
-<p class="line903"><a class="http" href=
-"http://lists.canonical.com/mailman/listinfo/bazaar-ng">Mailing
-List</a> - A high volume list focused upon Bazaar development and
-support. <span class="anchor" id="line-68"></span></p>
-</li>
-<li>
-<p class="line886">IRC - #bzr on irc.freenode.net <span class=
-"anchor" id="line-69"></span></p>
-<span class="anchor" id="line-70"></span></li>
-</ul>
-<h1 id="head-45d36005ff61e184525081c9c40ed26ded3c8f02">How can I
-contribute?</h1>
-<span class="anchor" id="line-71"></span>
-<p class="line879">Our primary development doc page is <a href=
-"/BzrDevelopment">BzrDevelopment</a>. <span class="anchor" id=
-"line-72"></span></p>
-<span class="anchor" id="line-73"></span>
-<ul>
-<li>
-<p class="line903"><a href="/BzrDevelopment">Development
-Instructions</a> - We keep our main development instructions here.
-<span class="anchor" id="line-74"></span></p>
-</li>
-<li>
-<p class="line903"><a href="/OfficialDownloads">Source Code</a> -
-Source code to get hacking with. <span class="anchor" id=
-"line-75"></span></p>
-</li>
-<li>
-<p class="line903"><a class="https" href=
-"https://launchpad.net/products/bzr/+specs">Specifications</a> -
-Specifications list which things are being worked on today and are
-likely to be worked on next. <span class="anchor" id=
-"line-76"></span></p>
-</li>
-<li>
-<p class="line903"><a class="https" href=
-"https://launchpad.net/products/bzr/+bugs">BugTracker</a> - Open
-bugs that you can work on. <span class="anchor" id=
-"line-77"></span></p>
-<span class="anchor" id="line-78"></span></li>
-</ul>
-<p class="line879">You are also welcome to improve this wiki site.
-To edit pages, please <a href="/UserPreferences">register</a>.
-Anonymous editing is disabled to prevent spammer attacks.
-<span class="anchor" id="line-79"></span></p>
-<span class="anchor" id="bottom"></span></div>
-</div>
-<div class="clear mozclear"></div>
-</div>
-</div>
-<div class="hide" id="nsFooterClear"><!-- for NS4's sake --></div>
-<hr class="hide" />
-<div id="footer" class="inside">
-<p style="margin:0;">&copy; 2006 - <a href=
-"http://canonical.com/">Canonical Ltd.</a></p>
-<div id="endofpage"></div>
-<div id="footer_custom_html"></div>
-<div id="footer_links"></div>
-</div>
-<hr class="hide" /></div>
-</div>
-</body>
-</html>

=== removed file 'doc/default.css'
--- doc/default.css	2008-02-07 07:05:13 +0000
+++ doc/default.css	1970-01-01 00:00:00 +0000
@@ -1,164 +0,0 @@
-/* from John Arbash Meinel's `Short tutorial' */
-
-body {
-  background-color: #ffffff;
-  color: #303030;
-  margin-top: 50px;
-  margin-left: 50px;
-  margin-right: 50px;
-  margin-bottom: 70px;
-  font-family: Verdana, Geneva, Arial, sans-serif;
-  font-size: small;
-  line-height: 140%
-  }
-
-/* p {
-  text-indent: 3em
-} */
-
-h1, h2, h3 {
-  font-family: Georgia, "Times New Roman", Times, serif;
-}
-
-h1.title {
-  text-align: center;
-  color: #000000;
-  font-size: 1.8em;
-  }
-
-
-div.contents p {
-  font-weight: bold;
-  }
-
-div.contents p a:hover {
-  color: inherit;
-  }
-
-/* Format ".. note:" sections nicely */
-div.note {
-  margin-left: 5em;
-  margin-right: 5em;
-  color: #000000;
-  background-color: #c1d1ff;
-  border: 1px solid #888888;
-  padding-left: 1em;
-  padding-right: 1em;
-  }
-
-div.note .first {
-  font-weight: bold;
-  }
-
-h1 {
-  color: #b52b2b; 
-  /* DKREDcolor: #966b72; */
-  /* GREY color: #444444; */
-  font-size: 1.5em;
-  }
-
-h1 a:link {
-  color: inherit;
-  }
-  
-h1 a:hover {
-  color: inherit;
-  }
-
-h1 a:visited {
-  color: inherit;
-  }
-
-h2 {
-  color: #222;
-  /* RED color: #966b72; */
-  text-decoration: underline;
-  font-size: 1.4em;
-  }
-
-h2 a:link {
-  color: inherit;
-  }
-
-h2 a:hover {
-  color: inherit;
-  }
-
-h2 a:visited {
-  color: inherit;
-  }
-
-h3 {
-  color: #966b72; 
-  /* color: #966b72; */
-  }
-
-h3 a:link {
-  color: inherit;
-  }
-
-h3 a:hover {
-  color: inherit;
-  }
-
-h3 a:visited {
-  color: inherit;
-  }
-
-dt {
-  color: #000000;
-  font-weight: bold;
-  }
-/*
-  border: 4px solid blue;
-  padding: 1ex;
-  background: #7777FF;
-        }
-dt:hover 
-  {
-  background-color: black;
-  }
-dt:active
-  {
-  background-color: red;
-  }
-*/
-
-tt, .literal-block {
-  font-family: monospace;
-  line-height: 100%
-  }
-
-tt {
-  color: #000000;
-  font-weight: normal;
-  }
-
-.literal-block {
-  margin-left: 5em;
-  margin-right: 5em;
-  color: #000000;
-  font-weight: normal;
-  background-color: #e5ecf9;
-  border: 1px solid #888888;
-  padding: 1em;
-  }
-
-a:link {
-  color: #4c52ff;
-  text-decoration: none;
-  }
-
-a:visited {
-  color: #4c53ff;
-  text-decoration: none;
-  }
-
-a:hover {
-  color: #b52727;
-  text-decoration: none;
-  }
-
-span, th.field-name {
-  white-space: nowrap;
-}

=== renamed file 'doc/en/developer-guide/HACKING.txt' => 'doc/developers/HACKING.txt'
--- doc/en/developer-guide/HACKING.txt	2009-08-13 17:16:31 +0000
+++ doc/developers/HACKING.txt	2009-09-08 01:11:40 +0000
@@ -11,14 +11,8 @@
 the Bazaar mailing list.  To propose a correction or addition to this
 document, send a merge request or new text to the mailing list.
 
-The current version of this document is available in the file 
-``doc/en/developer-guide/HACKING.txt`` in the source tree, or at
-http://doc.bazaar-vcs.org/bzr.dev/en/developer-guide/HACKING.html
-
-See also:
-`Bazaar Developer Documentation Catalog <../../developers/index.html>`_.
-
-.. contents::
+The latest developer documentation can be found online at
+http://doc.bazaar-vcs.org/developers/.
 
 
 Getting Started
@@ -266,7 +260,7 @@
 Automatically-generated API reference information is available at 
 <http://starship.python.net/crew/mwh/bzrlibapi/>.  
 
-See also the `Bazaar Architectural Overview  <../../developers/overview.html>`_.
+See also the :doc:`Bazaar Architectural Overview  <overview>`.
 
 
 The Code Review Process
@@ -841,8 +835,8 @@
 Test coverage
 =============
 
-All code should be exercised by the test suite.  See `Guide to Testing
-Bazaar <../../developers/testing.html>`_ for detailed information about writing tests.
+All code should be exercised by the test suite.  See :doc:`Guide to Testing
+Bazaar <testing>` for detailed information about writing tests.
 
 
 Core Topics
@@ -1403,7 +1397,7 @@
 * reviewing changes
 * reviewing blueprints
 * planning releases
-* managing releases (see the `Releasing Bazaar <../../developers/releasing.html>`_)
+* managing releases (see :doc:`Releasing Bazaar <releasing>`)
 
 .. note::
   Removing barriers to community participation is a key reason for adopting

=== added directory 'doc/developers/_static'
=== added file 'doc/developers/_static/bzr icon 16.png'
Binary 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'
Binary 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 @@
+{% extends "!layout.html" %}
+
+{% block rootrellink %}
+<li><a href="http://bazaar-vcs.org/">
+    <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Home</a>&nbsp;|&nbsp;</li>
+<a href="http://doc.bazaar-vcs.org/en/">Documentation</a>&nbsp;|&nbsp;</li>
+{{ super() }}
+{% endblock %}

=== added file 'doc/developers/conf.py'
--- doc/developers/conf.py	1970-01-01 00:00:00 +0000
+++ doc/developers/conf.py	2009-09-09 00:34:29 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+#
+# Bazaar documentation build configuration file, created by
+# sphinx-quickstart on Tue Jul 21 17:04:52 2009.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path = [os.path.abspath('../..')] + sys.path
+
+# Most of the configuration for Bazaar docs is defined here ...
+from bzrlib.doc_generate.sphinx_conf import *
+
+
+## Configuration specific to this site ##
+
+# The locale code for this documentation set
+bzr_locale = 'en'
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+html_short_title = u"Developer Document Catalog (%s)" % (release,)
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {'index': 'index.html'}
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'bzr-developers'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('HACKING', 'bzr-en-developer-guide.tex', u'Bazaar Developer Guide',
+   u'Bazaar Developers', 'manual'),
+  ('testing', 'bzr-en-testing-guide.tex', u'Bazaar Testing Guide',
+   u'Bazaar Developers', 'manual'),
+  ('overview', 'bzr-en-architecture-overview.tex', u'Bazaar Architecture Overview',
+   u'Bazaar Developers', 'howto'),
+  ('integration', 'bzr-en-integration-guide.tex', u'Bazaar Integration Guide',
+   u'Bazaar Developers', 'howto'),
+]

=== 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 @@
+Implementation notes
+====================
+
+.. toctree::
+   :hidden:
+
+   btree_index_prefetch
+   last-modified
+   content-filtering
+   lca_tree_merging
+
+
+* `BTree Index Prefetch <btree_index_prefetch.html>`_ |--| How bzr decides
+  to pre-read extra nodes in the btree index.
+
+* `Computing last_modified values <last-modified.html>`_ for inventory
+  entries
+
+* `Content filtering <content-filtering.html>`_
+
+* `LCA Tree Merging <lca_tree_merging.html>`_ |--| Merging tree-shape when
+  there is not a single unique ancestor (criss-cross merge).
+
+
+.. |--| unicode:: U+2014
+
+..
+   vim: ft=rst tw=74 ai

=== modified file 'doc/developers/index.txt'
--- doc/developers/index.txt	2009-08-26 03:20:32 +0000
+++ doc/developers/index.txt	2009-09-09 02:21:47 +0000
@@ -2,142 +2,44 @@
 Bazaar Developer Document Catalog
 =================================
 
-
-Overall developer documentation
-===============================
-
-* `Developer Guide <../en/developer-guide/HACKING.html>`_
-
-* `Architectural Overview <overview.html>`_ |--| describes some of the
-  most important classes and concepts.
+Enhancing Bazaar
+================
+
+.. toctree::
+   :maxdepth: 1
+
+   process
+   HACKING
+   testing
+
+* `Bazaar Writer Guide <http://bazaar-vcs.org/ContributingToTheDocs>`_ (web link)
+
+
+Developing using bzrlib
+=======================
+
+.. toctree::
+   :maxdepth: 1
+
+   overview
+   integration
+
+* `Writing plugins for Bazaar <http://bazaar-vcs.org/WritingPlugins>`_ (web link) 
 
 * `bzrlib API reference <http://starship.python.net/crew/mwh/bzrlibapi/>`_ 
-  (external link)
-  |--| automatically generated API reference information
-
-* `Integrating with Bazaar <http://bazaar-vcs.org/Integrating_with_Bazaar>`_
-  (wiki) |--| a guide for writing Python programs that work with Bazaar.
-
-* `Revision Properties <revision-properties.html>`_ |--| An application
-  can set arbitrary per-revision key/value pairs to store app-specific
-  data.
-
-* `Testing <testing.html>`_ |--| Guide to writing tests for Bazaar.
-
-* `Writing plugins <http://bazaar-vcs.org/WritingPlugins>`_ (wiki) 
-  |--| specific advice on writing Bazaar plugins.
-
-Process
-=======
-
-* `The Bazaar Development Cycle <cycle.html>`_ |--| The monthly
-  development cycle and how to run it.
-  
-* `Releasing Bazaar <releasing.html>`_ |--| 
-  Checklist to make a release of Bazaar.
-
-* `Managing the Bazaar PPA <ppa.html>`_ |--| Packaging Bazaar for Ubuntu.
-
-* `Giving back <http://bazaar-vcs.org/BzrGivingBack>`_ (wiki) |--| How to get
-  your changes to Bazaar integrated into a release.
-
-* `Profiling notes <profiling.html>`_ |--| Instructions on how to profile 
-  bzr code and visualize the results.
-
-* `EC2 resources <ec2.html>`_ |--| A team resource for 
-  Windows packaging and testing, and Ubuntu testing.
-
-* `Tracking Bugs in Bazaar <bug-handling.html>`_ |--| How we use the bug 
-  tracker.
-
-Plans
-=====
-
-* `Performance roadmap <performance-roadmap.html>`_ |--| The roadmap 
-  for fixing performance in bzr over the next few releases.
-
-* `Co-located branches <colocated-branches.html>`_ |--| Planned(?) support
-  for storing multiple branches in one file-system directory.
-
-* `Bazaar Windows Shell Extension Options <tortoise-strategy.html>`_ |--|
-  Implmentation strategy for Bazaar Windows Shell Extensions, aka
-  TortoiseBzr.
-
-* `CHK Optimized index <improved_chk_index.html>`_
-
-Specifications
-==============
-
-* `API versioning <api-versioning.html>`_ |--| bzrlib API versioning.
-
-* `Apport error reporting <apport.html>`_ |--| Capture data to report
-  bugs.
-
-* `Authentication ring <authentication-ring.html>`_ |--| Configuring
-  authentication.
-
-* `Bundles <bundles.html>`_ |--| All about bzr bundles.
-
-* `Container format <container-format.html>`_ |--| Notes on a container format
-  for streaming and storing Bazaar data.
-
-* `Groupcompress <groupcompress-design.html>`_ |--| Notes on the compression
-  technology used in CHK repositories.
-
-* `Indices <indices.html>`_ |--| The index facilities available within bzrlib.
-
-* `Inventories <inventory.html>`_ |--| Tree shape abstraction.
-
-* `LCA merge <lca-merge.html>`_ |--| A nice new merge algorithm.
-
-* `Network protocol <network-protocol.html>`_ |--| Custom network protocol.
-
-* `Plugin APIs <plugin-api.html>`_ |--| APIs plugins should use.
-
-* `Repositories <repository.html>`_ |--| What repositories do and are used for.
-
-* `Repository stream <repository-stream.html>`_ |--| Notes on streaming data
-  for repositories (a layer above the container format).
-
-* `Integration Guide <integration.html>`_ |--| A guide to integrate bzrlib into
-  any python application.
-
-* `Bazaar and case-insensitive file systems <case-insensitive-file-systems.html>`_
-  |--| How Bazaar operates on case-insensitive file systems such as commonly
-  found on Windows, USB sticks, etc.
-
-* `Development repository formats <development-repo.html>`_ |--| How to
-  work with repository formats that are still under development.
-  Contains instructions for those implementing new formats, of course,
-  but also for (bleeding-edge) end users of those formats.
-
-Data formats
-============
-
-* `Knit pack repositories <packrepo.html>`_ |--| KnitPack repositories 
-  (new in Bazaar 0.92).
-
-Implementation notes
-====================
-
-* `BTree Index Prefetch <btree_index_prefetch.html>`_ |--| How bzr decides
-  to pre-read extra nodes in the btree index.
-
-* `Computing last_modified values <last-modified.html>`_ for inventory
-  entries
-
-* `Content filtering <content-filtering.html>`_
-
-* `LCA Tree Merging <lca_tree_merging.html>`_ |--| Merging tree-shape when
-  there is not a single unique ancestor (criss-cross merge).
-
-Miscellaneous
-=============
-
-* `dirstate <dirstate.html>`_ |--| An observation re. the dirstate file
-
-* `"bzr update" performance analysis <update.html>`_ |--| "bzr update"
-  performance analysis
+  (web link)
+
+
+Other documents
+===============
+
+.. toctree::
+   :maxdepth: 1
+
+   plans
+   specifications
+   implementation-notes
+   miscellaneous-notes
 
 
 .. |--| unicode:: U+2014

=== modified file 'doc/developers/integration.txt'
--- doc/developers/integration.txt	2008-04-08 10:55:41 +0000
+++ doc/developers/integration.txt	2009-09-09 02:21:47 +0000
@@ -244,12 +244,12 @@
 
   source.create_checkout('/tmp/newBzrCheckout', None, False, accelerator_tree
 
-==================
+
 History Operations
 ==================
 
 Finding the last revision number or id
-======================================
+--------------------------------------
 
 To get the last revision number and id of a branch use::
 
@@ -263,7 +263,7 @@
 
 
 Getting the list of revision ids that make up a branch
-======================================================
+------------------------------------------------------
 
 IMPORTANT: This should be avoided wherever possible, as it scales with the
 length of history::
@@ -277,7 +277,7 @@
 
 
 Getting a Revision object from a revision id
-============================================
+--------------------------------------------
 
 The Revision object has attributes like "message" to get the information
 about the revision::
@@ -287,7 +287,7 @@
 
 
 Accessing the files from a revision
-===================================
+-----------------------------------
 
 To get the file contents and tree shape for a specific revision you need
 a RevisionTree. These are supplied by the repository for a specific

=== 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 @@
+Miscellaneous notes
+===================
+
+.. toctree::
+   :hidden:
+
+   dirstate
+   update
+
+
+* `dirstate <dirstate.html>`_ |--| An observation re. the dirstate file
+
+* `"bzr update" performance analysis <update.html>`_ |--| "bzr update"
+  performance analysis
+
+
+.. |--| unicode:: U+2014
+
+..
+   vim: ft=rst tw=74 ai

=== modified file 'doc/developers/overview.txt'
--- doc/developers/overview.txt	2009-03-20 02:08:23 +0000
+++ doc/developers/overview.txt	2009-09-08 01:11:40 +0000
@@ -12,16 +12,9 @@
 document, send a merge request or new text to the mailing list.
 
 The current version of this document is available in the file
-``doc/developers/overview.txt`` in the source tree, and from 
-<http://doc.bazaar-vcs.org/bzr.dev/>.
-
-See also:
-
- * `Bazaar Developer Documentation Catalog <index.html>`_.
- * `Bazaar Developer Guide <../en/developer-guide/HACKING.html>`_
-   (particularly the *Coding Style Guidelines* section.)
-
-.. contents::
+``doc/developers/overview.txt`` in the source tree, and available online 
+within the developer documentation, <http://doc.bazaar-vcs.org/developers/>.
+
 
 Essential Domain Classes
 ########################

=== 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 @@
+Plans
+=====
+
+.. toctree::
+   :hidden:
+
+   performance-roadmap
+   colocated-branches
+   tortoise-strategy
+   improved_chk_index
+
+
+* `Performance roadmap <performance-roadmap.html>`_ |--| The roadmap 
+  for fixing performance in bzr over the next few releases.
+
+* `Co-located branches <colocated-branches.html>`_ |--| Planned(?) support
+  for storing multiple branches in one file-system directory.
+
+* `Bazaar Windows Shell Extension Options <tortoise-strategy.html>`_ |--|
+  Implmentation strategy for Bazaar Windows Shell Extensions, aka
+  TortoiseBzr.
+
+* `CHK Optimized index <improved_chk_index.html>`_
+
+
+.. |--| unicode:: U+2014
+
+..
+   vim: ft=rst tw=74 ai

=== added file 'doc/developers/process.txt'
--- doc/developers/process.txt	1970-01-01 00:00:00 +0000
+++ doc/developers/process.txt	2009-09-09 02:21:47 +0000
@@ -0,0 +1,39 @@
+Bazaar Development Processes
+============================
+
+.. toctree::
+   :hidden:
+
+   cycle
+   releasing
+   ppa
+   profiling
+   ec2
+   bug-handling
+
+
+* `The Bazaar Development Cycle <cycle.html>`_ |--| The monthly
+  development cycle and how to run it.
+  
+* `Releasing Bazaar <releasing.html>`_ |--| 
+  Checklist to make a release of Bazaar.
+
+* `Managing the Bazaar PPA <ppa.html>`_ |--| Packaging Bazaar for Ubuntu.
+
+* `Giving back <http://bazaar-vcs.org/BzrGivingBack>`_ (wiki) |--| How to get
+  your changes to Bazaar integrated into a release.
+
+* `Profiling notes <profiling.html>`_ |--| Instructions on how to profile 
+  bzr code and visualize the results.
+
+* `EC2 resources <ec2.html>`_ |--| A team resource for 
+  Windows packaging and testing, and Ubuntu testing.
+
+* `Tracking Bugs in Bazaar <bug-handling.html>`_ |--| How we use the bug 
+  tracker.
+
+
+.. |--| unicode:: U+2014
+
+..
+   vim: ft=rst tw=74 ai

=== modified file 'doc/developers/releasing.txt'
--- doc/developers/releasing.txt	2009-08-28 14:35:26 +0000
+++ doc/developers/releasing.txt	2009-09-08 01:11:40 +0000
@@ -3,7 +3,7 @@
 
 This document describes the processes for making and announcing a Bazaar
 release, and managing the release process.  This is just one phase of the 
-`overall development cycle <cycle.html>`_, but it's the most complex part.
+:doc:`overall development cycle <cycle>`, but it's the most complex part.
 This document gives a checklist you can follow from start to end in one
 go.
 
@@ -81,7 +81,7 @@
 	submit_to = [e-mail]
 	smtp_server = mail.example.com:25
 
-    Please see <http://doc.bazaar-vcs.org/latest/developers/HACKING.html#an-overview-of-pqm>
+    Please see <http://doc.bazaar-vcs.org/developers/HACKING.html#an-overview-of-pqm>
     for more details on PQM
 
 #. In the release branch, update  ``version_info`` in ``./bzrlib/__init__.py``.

=== 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 @@
+Specifications
+==============
+
+.. toctree::
+   :hidden:
+
+   revision-properties
+   api-versioning
+   apport
+   authentication-ring
+   bundles
+   container-format
+   groupcompress-design
+   indices
+   inventory
+   lca-merge
+   network-protocol
+   plugin-api
+   repository
+   repository-stream
+   case-insensitive-file-systems
+   development-repo
+   packrepo
+
+
+* `Revision Properties <revision-properties.html>`_ |--| An application
+  can set arbitrary per-revision key/value pairs to store app-specific
+  data.
+
+* `API versioning <api-versioning.html>`_ |--| bzrlib API versioning.
+
+* `Apport error reporting <apport.html>`_ |--| Capture data to report
+  bugs.
+
+* `Authentication ring <authentication-ring.html>`_ |--| Configuring
+  authentication.
+
+* `Bundles <bundles.html>`_ |--| All about bzr bundles.
+
+* `Container format <container-format.html>`_ |--| Notes on a container format
+  for streaming and storing Bazaar data.
+
+* `Groupcompress <groupcompress-design.html>`_ |--| Notes on the compression
+  technology used in CHK repositories.
+
+* `Indices <indices.html>`_ |--| The index facilities available within bzrlib.
+
+* `Inventories <inventory.html>`_ |--| Tree shape abstraction.
+
+* `LCA merge <lca-merge.html>`_ |--| A nice new merge algorithm.
+
+* `Network protocol <network-protocol.html>`_ |--| Custom network protocol.
+
+* `Plugin APIs <plugin-api.html>`_ |--| APIs plugins should use.
+
+* `Repositories <repository.html>`_ |--| What repositories do and are used for.
+
+* `Repository stream <repository-stream.html>`_ |--| Notes on streaming data
+  for repositories (a layer above the container format).
+
+* `Bazaar and case-insensitive file systems <case-insensitive-file-systems.html>`_
+  |--| How Bazaar operates on case-insensitive file systems such as commonly
+  found on Windows, USB sticks, etc.
+
+* `Development repository formats <development-repo.html>`_ |--| How to
+  work with repository formats that are still under development.
+  Contains instructions for those implementing new formats, of course,
+  but also for (bleeding-edge) end users of those formats.
+
+* `Knit pack repositories <packrepo.html>`_ |--| KnitPack repositories 
+  (new in Bazaar 0.92).
+
+
+.. |--| unicode:: U+2014
+
+..
+   vim: ft=rst tw=74 ai

=== modified file 'doc/developers/testing.txt'
--- doc/developers/testing.txt	2009-03-03 01:45:32 +0000
+++ doc/developers/testing.txt	2009-09-09 02:21:47 +0000
@@ -1,11 +1,7 @@
-=======================
-Guide to Testing Bazaar
-=======================
-
-.. contents::
-
-Testing Bazaar
-##############
+====================
+Bazaar Testing Guide
+====================
+
 
 The Importance of Testing
 =========================

=== renamed file 'doc/Makefile' => 'doc/en/Makefile'
=== renamed directory 'doc/_static' => 'doc/en/_static'
=== renamed file 'doc/_static/en/quick-reference/Makefile' => 'doc/en/_static/en/Makefile'
--- doc/_static/en/quick-reference/Makefile	2009-07-22 14:07:56 +0000
+++ doc/en/_static/en/Makefile	2009-09-09 00:49:50 +0000
@@ -2,8 +2,8 @@
 # doc/*/quick-reference/Makefile and update TARGETS and OBJECTS usages in
 # doc/Makefile
 
-TARGETS=bzr-quick-reference.png bzr-quick-reference.pdf
-OBJECTS=bzr-quick-reference.svg Makefile
+TARGETS=bzr-en-quick-reference.png bzr-en-quick-reference.pdf
+OBJECTS=bzr-en-quick-reference.svg Makefile
 
 all: $(TARGETS)
 
@@ -15,9 +15,9 @@
 .svg.png:
 	rsvg-convert -d 300 -p 300 -z 3.3346 -f png -o $@ $<
 
-bzr-quickref.png: $(OBJECTS)
+bzr-en-quick-reference.png: $(OBJECTS)
 
-bzr-quickref.pdf: $(OBJECTS)
+bzr-en-quick-reference.pdf: $(OBJECTS)
 
 clean:
 	rm -f $(TARGETS)

=== renamed file 'doc/_static/en/quick-reference/bzr-quick-reference.pdf' => 'doc/en/_static/en/bzr-en-quick-reference.pdf'
=== renamed file 'doc/_static/en/quick-reference/bzr-quick-reference.png' => 'doc/en/_static/en/bzr-en-quick-reference.png'
=== renamed file 'doc/_static/en/quick-reference/bzr-quick-reference.svg' => 'doc/en/_static/en/bzr-en-quick-reference.svg'
=== renamed directory 'doc/_templates' => 'doc/en/_templates'
=== modified file 'doc/en/_templates/index.html'
--- doc/_templates/index.html	2009-08-18 00:10:19 +0000
+++ doc/en/_templates/index.html	2009-09-08 12:33:30 +0000
@@ -7,25 +7,39 @@
 
   <table class="contentstable" align="center" style="margin-left: 30px"><tr>
     <td width="50%">
-        <p class="biglink"><a class="biglink" href="{{ pathto("en/user-guide/index") }}">User Guide</a><br/>
+        <p class="biglink"><a class="biglink" href="{{ pathto("user-guide/index") }}">User Guide</a><br/>
         <span class="linkdescr">how to use Bazaar effectively</span>
       </p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("en/tutorials/index") }}">Tutorials</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("tutorials/index") }}">Tutorials</a><br/>
       <span class="linkdescr">brief introductions</span>
       </p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("en/quick-reference/index") }}">Quick Reference</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("quick-reference/index") }}">Quick Reference</a><br/>
       <span class="linkdescr">for your wall</span>
       </p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("en/user-reference/bzr_man") }}">User Reference</a><br/>
-      <span class="linkdescr">all the gory details</span>
-      </p>
     </td><td width="50%">
-    <p class="biglink"><a class="biglink" href="{{ pathto("en/release-notes/NEWS") }}">Release Notes</a><br/>
+    <p class="biglink"><a class="biglink" href="{{ pathto("release-notes/NEWS") }}">Release Notes</a><br/>
       <span class="linkdescr">what's new</span>
       </p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("en/upgrade-guide/index") }}">Upgrade Guide</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("upgrade-guide/index") }}">Upgrade Guide</a><br/>
       <span class="linkdescr">moving to Bazaar 2.x</span>
       </p>
+      <p class="biglink"><a class="biglink" href="{{ pathto("user-reference/bzr_man") }}">User Reference</a><br/>
+      <span class="linkdescr">all the gory details</span>
+      </p>
+    </td></tr>
+  </table>
+
+  <h2>Related links</h2>
+
+  <table class="contentstable" align="center" style="margin-left: 30px"><tr>
+    <td width="50%">
+        <p class="biglink"><a class="biglink" href="https://answers.launchpad.net/bzr">FAQ</a><br/>
+      <span class="linkdescr">frequently asked questions</span>
+      </p>
+      <p class="biglink"><a class="biglink" href="http://bazaar-vcs.org/BzrGlossary/">Glossary</a><br/>
+      <span class="linkdescr">help with terminology</span>
+      </p>
+    </td><td width="50%">
       <p class="biglink"><a class="biglink" href="http://doc.bazaar-vcs.org/migration/en/">Migration Docs</a><br/>
       <span class="linkdescr">for refugees of other tools</span>
       </p>
@@ -35,31 +49,7 @@
     </td></tr>
   </table>
 
-  <p>Keen to help? See the <a href="{{ pathto("developers/index") }}">Developer Docs</a>
+  <p>Keen to help? See the <a href="http://doc.bazaar-vcs.org/developers/">Developer Docs</a>
       for policies and tools on contributing code, tests and documentation.</p>
 
-
-  <h2>Related Links</h2>
-
-  <table class="contentstable" align="center" style="margin-left: 30px"><tr>
-    <td width="25%">
-        <p><a href="https://answers.launchpad.net/bzr">FAQ</a>
-        </p>
-    </td><td width="25%">
-        <p><a href="http://bazaar-vcs.org/BzrGlossary/">Glossary</a>
-        </p>
-    </td><td width="25%">
-        <p><a href="{{ pathto("genindex") }}">Index</a>
-        </p>
-    </td><td width="25%">
-        <p><a href="{{ pathto("search") }}">Search</a>
-        </p>
-    </td></tr>
-  </table>
-
-  <hr>
-  <p>Other languages:
-      <a href="{{ pathto("index.es") }}">Spanish</a>,
-      <a href="{{ pathto("index.ru") }}">Russian</a>
-  </p>
 {% endblock %}

=== modified file 'doc/en/_templates/layout.html'
--- doc/_templates/layout.html	2009-07-22 13:41:01 +0000
+++ doc/en/_templates/layout.html	2009-09-03 00:21:59 +0000
@@ -3,5 +3,6 @@
 {% block rootrellink %}
 <li><a href="http://bazaar-vcs.org/">
     <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Home</a>&nbsp;|&nbsp;</li>
+<a href="http://doc.bazaar-vcs.org/en/">Documentation</a>&nbsp;|&nbsp;</li>
 {{ super() }}
 {% endblock %}

=== renamed file 'doc/conf.py' => 'doc/en/conf.py'
--- doc/conf.py	2009-07-22 13:41:01 +0000
+++ doc/en/conf.py	2009-09-09 00:34:29 +0000
@@ -4,208 +4,69 @@
 # sphinx-quickstart on Tue Jul 21 17:04:52 2009.
 #
 # This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
 
 import sys, os
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.append(os.path.abspath('.'))
-
-# -- General configuration -----------------------------------------------------
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.ifconfig']
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.txt'
-
-# The encoding of source files.
-#source_encoding = 'utf-8'
-
-# The master toctree document.
-master_doc = 'contents'
-
-# General information about the project.
-project = u'Bazaar'
-copyright = u'2009, Canonical Ltd'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '1.18'
-# The full version, including alpha/beta/rc tags.
-release = '1.18dev'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of documents that shouldn't be included in the build.
-#unused_docs = []
-
-# List of directories, relative to source directory, that shouldn't be searched
-# for source files.
-exclude_trees = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  Major themes that come with
-# Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-html_theme_options = {
-    'rightsidebar': True,
-
-    # Non-document areas: header (relbar), footer, sidebar, etc.
-    # Some useful colours here:
-    # * blue: darkblue, mediumblue, darkslateblue, cornflowerblue, royalblue,
-    #   midnightblue
-    # * gray: dimgray, slategray, lightslategray
-    'sidebarbgcolor':   "cornflowerblue",
-    'sidebarlinkcolor': "midnightblue",
-    'relbarbgcolor':    "darkblue",
-    'footerbgcolor':    "lightslategray",
-
-    # Text, heading and code colouring
-    'codebgcolor':      "lightyellow",
-    'codetextcolor':    "firebrick",
-    'linkcolor':        "mediumblue",
+sys.path = [os.path.abspath('../..')] + sys.path
+
+# Most of the configuration for Bazaar docs is defined here ...
+from bzrlib.doc_generate.sphinx_conf import *
+
+
+## Configuration specific to this site ##
+
+# The locale code for this documentation set
+bzr_locale = 'en'
+
+# Translations & supporting helper function
+bzr_titles = {
+        u'Table of Contents (%s)': None,
+        u'Bazaar User Guide': None,
+        u'Bazaar User Reference': None,
+        u'Bazaar Release Notes': None,
+        u'Bazaar Upgrade Guide': None,
+        u'Bazaar in five minutes': None,
+        u'Bazaar Tutorial': None,
+        u'Using Bazaar With Launchpad': None,
+        u'Centralized Workflow Tutorial': None,
     }
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
+def bzr_title(s):
+    return bzr_titles.get(s) or s
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-html_favicon = "bzr.ico"
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+html_short_title = bzr_title(u"Table of Contents (%s)") % (release,)
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-html_additional_pages = {'contents': 'index.html'}
-
-# If false, no module index is generated.
-#html_use_modindex = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-html_show_sourcelink = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = ''
+html_additional_pages = {'index': 'index.html'}
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'Bazaardoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
+htmlhelp_basename = 'bzr-%s' % (bzr_locale,)
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('contents', 'Bazaar.tex', u'Bazaar Documentation',
-   u'Bazaar Developers', 'manual'),
+  # Manuals
+  ('user-guide/index', 'bzr-%s-user-guide.tex' % (bzr_locale,),
+    bzr_title(u'Bazaar User Guide'), bzr_team, 'manual'),
+  ('user-reference/bzr_man', 'bzr-%s-user-reference.tex' % (bzr_locale,),
+    bzr_title(u'Bazaar User Reference'), bzr_team, 'manual'),
+  ('release-notes/NEWS', 'bzr-%s-release-notes.tex' % (bzr_locale,),
+    bzr_title(u'Bazaar Release Notes'), bzr_team, 'manual'),
+  ('upgrade-guide/index', 'bzr-%s-upgrade-guide.tex' % (bzr_locale,),
+    bzr_title(u'Bazaar Upgrade Guide'), bzr_team, 'manual'),
+  # Tutorials
+  ('mini-tutorial/index', 'bzr-%s-tutorial-mini.tex' % (bzr_locale,),
+    bzr_title(u'Bazaar in five minutes'), bzr_team, 'howto'),
+  ('tutorials/tutorial', 'bzr-%s-tutorial.tex' % (bzr_locale,),
+    bzr_title(u'Bazaar Tutorial'), bzr_team, 'howto'),
+  ('tutorials/using_bazaar_with_launchpad',
+    'bzr-%s-tutorial-with-launchpad.tex' % (bzr_locale,),
+    bzr_title(u'Using Bazaar With Launchpad'), bzr_team, 'howto'),
+  ('tutorials/centralized_workflow',
+    'bzr-%s-tutorial-centralized.tex' % (bzr_locale,),
+    bzr_title(u'Centralized Workflow Tutorial'), bzr_team, 'howto'),
 ]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_use_modindex = True

=== removed directory 'doc/en/developer-guide'
=== renamed file 'doc/contents.txt' => 'doc/en/index.txt'
--- doc/contents.txt	2009-08-18 00:10:19 +0000
+++ doc/en/index.txt	2009-09-08 12:33:30 +0000
@@ -4,39 +4,15 @@
    contain the root `toctree` directive.
 
 
-Core documentation
-==================
-
-.. toctree::
-   :maxdepth: 1
-
-   en/user-guide/index
-   en/tutorials/index
-   en/quick-reference/index
-   en/user-reference/index
-
-.. toctree::
-   :maxdepth: 1
-
-   en/release-notes/index
-   en/upgrade-guide/index
-   developers/index
-
-
-Other languages:
-
-.. toctree::
-   :maxdepth: 1
-
-   index.es
-   index.ru
-
-
-Related links
-=============
-
-* `Frequently Asked Questions <http://bazaar-vcs.org/FAQ>`_
-* `Glossary <http://bazaar-vcs.org/BzrGlossary>`_
-* :ref:`genindex`
-* :ref:`search`
-
+Table of Contents
+=================
+
+.. toctree::
+   :maxdepth: 1
+
+   user-guide/index
+   tutorials/index
+   quick-reference/index
+   release-notes/NEWS
+   upgrade-guide/index
+   user-reference/bzr_man

=== renamed file 'doc/make.bat' => 'doc/en/make.bat'
=== 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 @@
 Bazaar in five minutes
 ======================
 
-.. contents::
-
 Introduction
 ============
 

=== modified file 'doc/en/quick-reference/index.txt'
--- doc/en/quick-reference/index.txt	2009-07-22 14:07:56 +0000
+++ doc/en/quick-reference/index.txt	2009-09-09 02:32:10 +0000
@@ -1,6 +1,6 @@
 Quick Reference
 ===============
 
-* `SVG format <../../_static/en/quick-reference/bzr-quick-reference.svg>`_
-* `PDF format <../../_static/en/quick-reference/bzr-quick-reference.pdf>`_
-* `PNG format <../../_static/en/quick-reference/bzr-quick-reference.png>`_
+* `PDF format <../_static/en/bzr-en-quick-reference.pdf>`_
+* `PNG format <../_static/en/bzr-en-quick-reference.png>`_
+* `SVG format <../_static/en/bzr-en-quick-reference.svg>`_

=== 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 @@
-====================
-Centralized Workflow
-====================
+=============================
+Centralized Workflow Tutorial
+=============================
 
 
 Overview
@@ -23,8 +23,6 @@
 
 .. _Bazaar: http://bazaar-vcs.org
 
-.. contents::
-
 
 Initial Setup
 =============

=== 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 @@
 Bazaar Tutorial
 ===============
 
-Current for bzr-0.91, 2007-08
-
 
 Introduction
 ============
@@ -24,8 +22,8 @@
 different." Otherwise, get some coffee or tea, get comfortable and get
 ready to catch up. 
 
-The Purposes of Revision Control
-================================
+The purpose of revision control
+===============================
 
 Odds are that you have worked on some sort of textual data -- the sources
 to a program, web sites or the config files that Unix system
@@ -57,8 +55,8 @@
 We keep these logs so that if later there is some sort of problem with
 sftp, we can figure out when the problem probably happened. 
 
-How DRCS is Different
----------------------
+How DRCS is different
+=====================
 
 Many Revision Control Systems (RCS) are stored on servers. If one wants to
 work on the code stored within an RCS, then one needs to connect to the
@@ -282,6 +280,7 @@
 As a shortcut, ``bzr diff -p1`` produces a form that works with the 
 command ``patch -p1``.
 
+
 Committing changes
 ==================
 
@@ -308,7 +307,7 @@
 can also be useful when you pick up your work after a break.)
 
 Message from an editor
-======================
+----------------------
 
 If you use neither the ``-m`` nor the ``-F`` option then bzr will open an
 editor for you to enter a message.  The editor to run is controlled by
@@ -355,9 +354,13 @@
 given then only those ones will be affected. ``bzr revert`` also clears the
 list of pending merges revisions.
 
+
 Ignoring files
 ==============
 
+The .bzrignore file
+-------------------
+
 Many source trees contain some files that do not need to be versioned,
 such as editor backups, object or bytecode files, and built programs.  You
 can simply not add them, but then they'll always crop up as unknown files.
@@ -400,7 +403,7 @@
     % bzr commit -m "Add ignore patterns"
 
 
-Global Ignores
+Global ignores
 --------------
 
 There are some ignored files which are not project specific, but more user
@@ -574,6 +577,7 @@
   rsync, or other related file transfer methods.  This is usually less safe
   than using ``push``, but may be faster or easier in some situations.
 
+
 Moving changes between trees 
 ============================
 

=== 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 @@
 Using Bazaar with Launchpad
 ===========================
 
-.. contents::
-
 
 Motivation
 ==========

=== 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 @@
 ..   level 3 ~~~~~~~~
 ..   level 4 ^^^^^^^^ (it is better not to use nesting deeper than 3 levels)
 
-.. contents::
-
 .. include:: overview.txt
 .. include:: data_migration.txt
 .. include:: tips_and_tricks.txt

=== 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 @@
-#################
-Bazaar User Guide
-#################
-
-.. Please mark sections in included files as following:
-..   level 1 ========
-..   level 2 --------
-..   level 3 ~~~~~~~~
-..   level 4 ^^^^^^^^ (it is better not to use nesting deeper than 3 levels)
-
-.. contents:: :depth: 3
-
-
-Introduction
-############
-
-.. include:: introducing_bazaar.txt
-.. include:: core_concepts.txt
-.. include:: bazaar_workflows.txt
-
-
-Getting started
-###############
-
-.. include:: installing_bazaar.txt
-.. include:: entering_commands.txt
-.. include:: getting_help.txt
-.. include:: configuring_bazaar.txt
-.. include:: using_aliases.txt
-.. include:: plugins.txt
-.. include:: zen.txt
-
-
-Personal version control
-########################
-
-.. include:: solo_intro.txt
-.. include:: starting_a_project.txt
-.. include:: controlling_registration.txt
-.. include:: reviewing_changes.txt
-.. include:: recording_changes.txt
-.. include:: browsing_history.txt
-.. include:: releasing_a_project.txt
-.. include:: undoing_mistakes.txt
-
-
-Sharing with peers
-##################
-
-.. include:: partner_intro.txt
-.. include:: branching_a_project.txt
-.. include:: merging_changes.txt
-.. include:: resolving_conflicts.txt
-.. include:: annotating_changes.txt
-
-
-Team collaboration, central style
-#################################
-
-.. include:: central_intro.txt
-.. include:: publishing_a_branch.txt
-.. include:: using_checkouts.txt
-.. include:: working_offline_central.txt
-.. include:: reusing_a_checkout.txt
-
-
-Team collaboration, distributed style
-#####################################
-
-.. include:: distributed_intro.txt
-.. include:: organizing_branches.txt
-.. include:: using_gatekeepers.txt
-.. include:: sending_changes.txt
-
-
-Miscellaneous topics
-####################
-
-.. include:: part2_intro.txt
-.. include:: adv_merging.txt
-.. include:: shelving_changes.txt
-.. include:: filtered_views.txt
-.. include:: stacked.txt
-.. include:: server.txt
-.. include:: hooks.txt
-.. include:: version_info.txt
- 
-
-A brief tour of some popular plugins
-####################################
-
-.. include:: bzrtools_plugin.txt
-.. include:: svn_plugin.txt
-.. include later looms_plugin.txt
-
-
-Integrating Bazaar into your environment
-########################################
-
-.. include:: web_browsing.txt
-.. include later - file_explorers.txt
-.. include later - desktop_integration.txt
-.. include later - editors_and_ides.txt
-.. include later - email.txt
-.. include:: bug_trackers.txt
-
-
-Appendices
-##########
-
-.. include:: specifying_revisions.txt
-.. include:: organizing_your_workspace.txt
-.. include:: shared_repository_layouts.txt
-.. include:: setting_up_email.txt
-.. include:: http_smart_server.txt
-.. include:: writing_a_plugin.txt
-
-.. |--| unicode:: U+2014

=== renamed file 'doc/en/user-guide/index-for-2x.txt' => 'doc/en/user-guide/index.txt'
=== added directory 'doc/es/_static'
=== added file 'doc/es/_static/bzr icon 16.png'
Binary 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'
Binary 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'
=== renamed file 'doc/es/quick-reference/Makefile' => 'doc/es/_static/es/Makefile'
--- doc/es/quick-reference/Makefile	2009-06-29 11:02:31 +0000
+++ doc/es/_static/es/Makefile	2009-09-09 00:49:50 +0000
@@ -1,5 +1,5 @@
-TARGETS=quick-start-summary.png quick-start-summary.pdf
-OBJECTS=quick-start-summary.svg Makefile
+TARGETS=bzr-es-quick-reference.png bzr-es-quick-reference.pdf
+OBJECTS=bzr-es-quick-reference.svg Makefile
 
 all: $(TARGETS)
 
@@ -11,9 +11,9 @@
 .svg.png:
 	rsvg-convert -d 300 -p 300 -z 3.3346 -f png -o $@ $<
 
-bzr-quickref.png: $(OBJECTS)
+bzr-es-quick-reference.png: $(OBJECTS)
 
-bzr-quickref.pdf: $(OBJECTS)
+bzr-es-quick-reference.pdf: $(OBJECTS)
 
 clean:
 	rm -f $(TARGETS)

=== renamed file 'doc/es/quick-reference/quick-start-summary.pdf' => 'doc/es/_static/es/bzr-es-quick-reference.pdf'
=== renamed file 'doc/es/quick-reference/quick-start-summary.png' => 'doc/es/_static/es/bzr-es-quick-reference.png'
=== renamed file 'doc/es/quick-reference/quick-start-summary.svg' => 'doc/es/_static/es/bzr-es-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 @@
+{% extends "!layout.html" %}
+
+{% block rootrellink %}
+<li><a href="http://bazaar-vcs.org/">
+    <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Inicio</a>&nbsp;|&nbsp;</li>
+<a href="http://doc.bazaar-vcs.org/en/">Documentación</a>&nbsp;|&nbsp;</li>
+{{ super() }}
+{% endblock %}

=== added file 'doc/es/conf.py'
--- doc/es/conf.py	1970-01-01 00:00:00 +0000
+++ doc/es/conf.py	2009-09-09 00:34:29 +0000
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+#
+# Bazaar documentation build configuration file, created by
+# sphinx-quickstart on Tue Jul 21 17:04:52 2009.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path = [os.path.abspath('../..')] + sys.path
+
+# Most of the configuration for Bazaar docs is defined here ...
+from bzrlib.doc_generate.sphinx_conf import *
+
+
+## Configuration specific to this site ##
+
+# The locale code for this documentation set
+bzr_locale = 'es'
+
+# Translations & supporting helper function
+bzr_titles = {
+        u'Table of Contents (%s)': u'Contenidos (%s)',
+        u'Bazaar User Guide': u'Guia de Usuario',
+        u'Bazaar User Reference': None,
+        u'Bazaar Release Notes': None,
+        u'Bazaar Upgrade Guide': None,
+        u'Bazaar in five minutes': u'Bazaar en cinco minutos',
+        u'Bazaar Tutorial': None,
+        u'Using Bazaar With Launchpad': None,
+        u'Centralized Workflow Tutorial': None,
+    }
+def bzr_title(s):
+    return bzr_titles.get(s) or s
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+language = bzr_locale
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+html_short_title = bzr_title(u"Table of Contents (%s)") % (release,)
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {'index': 'index.html'}
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'bzr-%s' % (bzr_locale,)
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  # Manuals
+  ('user-guide/index', 'bzr-%s-user-guide.tex' % (bzr_locale,),
+    bzr_title(u'Bazaar User Guide'), bzr_team, 'manual'),
+  #('user-reference/bzr_man', 'bzr-%s-user-reference.tex' % (bzr_locale,),
+  #  bzr_title(u'Bazaar User Reference'), bzr_team, 'manual'),
+  #('release-notes/NEWS', 'bzr-%s-release-notes.tex' % (bzr_locale,),
+  #  bzr_title(u'Bazaar Release Notes'), bzr_team, 'manual'),
+  #('upgrade-guide/index', 'bzr-%s-upgrade-guide.tex' % (bzr_locale,),
+  #  bzr_title(u'Bazaar Upgrade Guide'), bzr_team, 'manual'),
+  # Tutorials
+  ('mini-tutorial/index', 'bzr-%s-tutorial-mini.tex' % (bzr_locale,),
+    bzr_title(u'Bazaar in five minutes'), bzr_team, 'howto'),
+  #('tutorials/tutorial', 'bzr-%s-tutorial.tex' % (bzr_locale,),
+  #  bzr_title(u'Bazaar Tutorial'), bzr_team, 'howto'),
+  #('tutorials/using_bazaar_with_launchpad',
+  #  'bzr-%s-tutorial-with-launchpad.tex' % (bzr_locale,),
+  #  bzr_title(u'Using Bazaar With Launchpad'), bzr_team, 'howto'),
+  #('tutorials/centralized_workflow',
+  #  'bzr-%s-tutorial-centralized.tex' % (bzr_locale,),
+  #  bzr_title(u'Centralized Workflow Tutorial'), bzr_team, 'howto'),
+]

=== 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-09 02:30:32 +0000
@@ -1,46 +1,40 @@
-==================================
+=================================
 Indice de Documentacion de Bazaar
-==================================
+=================================
 
 Las ultimas versiones de estos documentos se encuentran disponibles
-en la pagina de  Bazaar, http://doc.bazaar-vcs.org.
+en la pagina de  Bazaar, http://doc.bazaar-vcs.org/en/.
 
 Documentacion Principal
 =======================
 
-* `Mini Tutorial <es/mini-tutorial/index.html>`_ 
-
-* `Referencia Rapida <es/quick-reference/quick-start-summary.svg>`_
-
-* `Guia de Usuario <es/user-guide/index.html>`_ 
-
-* `Referencia <es/user-reference/bzr_man.html>`_ 
-
-* `Notas sobre la Version <es/release-notes/NEWS.html>`_
-
-* `Guia del Desarrollador <es/developer-guide/HACKING.html>`_
+.. toctree::
+   :maxdepth: 1
+
+   mini-tutorial/index
+   quick-reference/index
+   user-guide/index
 
 
 Otra Documentacion
-===================
+==================
 
 Mudandose a Bazaar (enlances web):
 
-* `Guias de Mudanzas <http://bazaar-vcs.org/BzrSwitching>`_ 
-  - para los usuarios que se mudan de otros SCV
-
-* `Guias de Migracion <http://bazaar-vcs.org/BzrMigration>`_
+* `Guias de Migracion <http://doc.bazaar-vcs.org/migration/en/>`_
   - para equipos que mudan el historial de otros SCV
 
+* `Guias de Plugins <http://doc.bazaar-vcs.org/plugins/en/>`_ 
+
 Otros Documentos (enlances web):
 
 * `Glosario <http://bazaar-vcs.org/BzrGlossary>`_
 
-* `Preguntas Frecuentes <http://bazaar-vcs.org/FAQ>`_
+* `Preguntas Frecuentes <https://answers.launchpad.net/bzr>`_
 
 * `Referencia del API bzrlib <http://bazaar-vcs.org/BzrLib>`_
 
 Especificaciones tecnicas, planes a futuro y varias
 notas tecnicas varias en Ingles:
 
-* `Catalogo de Documentos para Desarrolladores <developers/index.html>`_
+* `Catalogo de Documentos para Desarrolladores <http://doc.bazaar-vcs.org/latest/developers/>`_

=== modified file 'doc/es/mini-tutorial/index.txt'
--- doc/es/mini-tutorial/index.txt	2009-06-29 11:02:31 +0000
+++ doc/es/mini-tutorial/index.txt	2009-09-08 01:19:48 +0000
@@ -2,8 +2,6 @@
 Bazaar en cinco minutos
 =======================
 
-.. contents:: Contenidos
-
 Introducción
 ============
 

=== 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-09 02:32:10 +0000
@@ -0,0 +1,6 @@
+Referencia Rapida
+=================
+
+* `PDF format <../_static/es/bzr-es-quick-reference.pdf>`_
+* `PNG format <../_static/es/bzr-es-quick-reference.png>`_
+* `SVG format <../_static/es/bzr-es-quick-reference.svg>`_

=== removed directory 'doc/es/release-notes'
=== modified file 'doc/es/user-guide/index.txt'
--- doc/es/user-guide/index.txt	2008-05-12 00:59:13 +0000
+++ doc/es/user-guide/index.txt	2009-09-08 01:19:48 +0000
@@ -10,9 +10,6 @@
 ..   level 3 ~~~~~~~~
 ..   level 4 ^^^^^^^^ (it is better not to use nesting deeper than 3 levels)
 
-.. contents:: :depth: 2
-.. sectnum::
-
 
 Introducción
 ############

=== removed directory 'doc/es/user-reference'
=== 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 @@
-============================
-Bazaar Main Document Catalog
-============================
-
-The latest version of these documents are available from Bazaar's
-documentation site, <http://doc.bazaar-vcs.org/>, and more documentation
-may be linked from <http://bazaar-vcs.org/Documentation>.
-
-Core Documentation
-==================
-
-* `User Guide <en/user-guide/index.html>`_ 
-
-* `User Reference <en/user-reference/bzr_man.html>`_ 
-
-* `Quick Start Card <_static/en/quick-reference/bzr-quick-reference.svg>`_
-  (`PDF <_static/en/quick-reference/bzr-quick-reference.pdf>`_,
-  `PNG <_static/en/quick-reference/bzr-quick-reference.png>`_)
-
-* `Release Notes <en/release-notes/NEWS.html>`_
-
-* `2.0 Upgrade Guide <en/upgrade-guide/index.html>`_ 
-
-
-Tutorials
-=========
-
-* `Bazaar in five minutes <en/mini-tutorial/index.html>`_ 
-
-* `A longer tutorial <en/tutorials/tutorial.html>`_ 
-
-* `Using Bazaar with Launchpad <en/tutorials/using_bazaar_with_launchpad.html>`_ 
-
-* `Centralized workflow <en/tutorials/centralized_workflow.html>`_ 
-
-
-Developer Documentation
-=======================
-
-* `Developer Document Catalog <developers/index.html>`_ |--| for developers
-  of Bazaar and plugins
-
-Web links
-=========
-
-* `Switching Guides <http://bazaar-vcs.org/BzrSwitching>`_ 
-  |--| for users moving from another VCS tool
-
-* `Migration Guide <http://bazaar-vcs.org/BzrMigration>`_
-  |--| for teams migrating history from another VCS tool
-
-* `Glossary <http://bazaar-vcs.org/BzrGlossary>`_
-
-* `Frequently Asked Questions <http://bazaar-vcs.org/FAQ>`_
-
-
-Other Languages
-===============
-
-* `Spanish Documentation <index.es.html>`_
-* `Russian Documentation <index.ru.html>`_ |--| документация на русском
-
-.. |--| unicode:: U+2014
-
-..
-   vim: ft=rst tw=74 ai

=== added directory 'doc/ru/_static'
=== added file 'doc/ru/_static/bzr icon 16.png'
Binary 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'
Binary 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 @@
-TARGETS=quick-start-summary.png quick-start-summary.pdf
-OBJECTS=quick-start-summary.svg Makefile
+TARGETS=bzr-quick-reference.png bzr-quick-reference.pdf
+OBJECTS=bzr-quick-reference.svg Makefile
 
 all: $(TARGETS)
 
@@ -11,9 +11,9 @@
 .svg.png:
 	rsvg-convert -d 300 -p 300 -z 3.3346 -f png -o $@ $<
 
-bzr-quickref.png: $(OBJECTS)
+bzr-quick-reference.png: $(OBJECTS)
 
-bzr-quickref.pdf: $(OBJECTS)
+bzr-quick-reference.pdf: $(OBJECTS)
 
 clean:
 	rm -f $(TARGETS)

=== renamed file 'doc/ru/quick-reference/quick-start-summary.pdf' => 'doc/ru/_static/ru/bzr-ru-quick-reference.pdf'
=== renamed file 'doc/ru/quick-reference/quick-start-summary.png' => 'doc/ru/_static/ru/bzr-ru-quick-reference.png'
=== renamed file 'doc/ru/quick-reference/quick-start-summary.svg' => 'doc/ru/_static/ru/bzr-ru-quick-reference.svg'
=== added directory 'doc/ru/_templates'
=== added file 'doc/ru/_templates/layout.html'
--- doc/ru/_templates/layout.html	1970-01-01 00:00:00 +0000
+++ doc/ru/_templates/layout.html	2009-09-08 15:06:56 +0000
@@ -0,0 +1,8 @@
+{% extends "!layout.html" %}
+
+{% block rootrellink %}
+<li><a href="http://bazaar-vcs.org/">
+    <img src="{{ pathto("_static/bzr icon 16.png", 1) }}" /> Главная</a>&nbsp;|&nbsp;</li>
+<a href="http://doc.bazaar-vcs.org/ru/">Документация</a>&nbsp;|&nbsp;</li>
+{{ super() }}
+{% endblock %}

=== added file 'doc/ru/conf.py'
--- doc/ru/conf.py	1970-01-01 00:00:00 +0000
+++ doc/ru/conf.py	2009-09-09 02:30:32 +0000
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+#
+# Bazaar documentation build configuration file, created by
+# sphinx-quickstart on Tue Jul 21 17:04:52 2009.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path = [os.path.abspath('../..')] + sys.path
+
+# Most of the configuration for Bazaar docs is defined here ...
+from bzrlib.doc_generate.sphinx_conf import *
+
+
+## Configuration specific to this site ##
+
+# The locale code for this documentation set
+bzr_locale = 'ru'
+
+# Translations & supporting helper function
+bzr_titles = {
+        u'Table of Contents (%s)': u'Содержание (%s)',
+        u'Bazaar User Guide': None,
+        u'Bazaar User Reference': None,
+        u'Bazaar Release Notes': None,
+        u'Bazaar Upgrade Guide': None,
+        u'Bazaar in five minutes': u'Базар за пять минут',
+        u'Bazaar Tutorial': u'Большой учебник',
+        u'Using Bazaar With Launchpad': u'Использование Bazaar с Launchpad',
+        u'Centralized Workflow Tutorial': u'Работа в централизованном стиле',
+    }
+def bzr_title(s):
+    return bzr_titles.get(s) or s
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+language = bzr_locale
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+html_short_title = bzr_title(u"Table of Contents (%s)") % (release,)
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {'index': 'index.html'}
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'bzr-%s' % (bzr_locale,)
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  # Manuals
+  #('user-guide/index', 'bzr-%s-user-guide.tex' % (bzr_locale,),
+  #  bzr_title(u'Bazaar User Guide'), bzr_team, 'manual'),
+  #('user-reference/bzr_man', 'bzr-%s-user-reference.tex' % (bzr_locale,),
+  #  bzr_title(u'Bazaar User Reference'), bzr_team, 'manual'),
+  #('release-notes/NEWS', 'bzr-%s-release-notes.tex' % (bzr_locale,),
+  #  bzr_title(u'Bazaar Release Notes'), bzr_team, 'manual'),
+  #('upgrade-guide/index', 'bzr-%s-upgrade-guide.tex' % (bzr_locale,),
+  #  bzr_title(u'Bazaar Upgrade Guide'), bzr_team, 'manual'),
+  # Tutorials
+  ('mini-tutorial/index', 'bzr-%s-tutorial-mini.tex' % (bzr_locale,),
+    bzr_title(u'Bazaar in five minutes'), bzr_team, 'howto'),
+  ('tutorials/tutorial', 'bzr-%s-tutorial.tex' % (bzr_locale,),
+    bzr_title(u'Bazaar Tutorial'), bzr_team, 'howto'),
+  #('tutorials/using_bazaar_with_launchpad',
+  #  'bzr-%s-tutorial-with-launchpad.tex' % (bzr_locale,),
+  #  bzr_title(u'Using Bazaar With Launchpad'), bzr_team, 'howto'),
+  #('tutorials/centralized_workflow',
+  #  'bzr-%s-tutorial-centralized.tex' % (bzr_locale,),
+  #  bzr_title(u'Centralized Workflow Tutorial'), bzr_team, 'howto'),
+]

=== 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-09 02:30:32 +0000
@@ -3,45 +3,26 @@
 =================================
 
 Последняя версия этих документов доступа со страницы документации 
-на сайте Bazaar, <http://doc.bazaar-vcs.org/>. Еще больше информации 
-можно получить по адресу <http://bazaar-vcs.org/Documentation>.
+на сайте Bazaar, <http://doc.bazaar-vcs.org/ru/>.
 
 Основная документация
 =====================
 
-* `Руководство пользователя <ru/user-guide/index.html>`_
-
-* `Справочник пользователя <en/user-reference/bzr_man.html>`_ (англ.)
-
-* `Карточка быстрого старта <ru/quick-reference/quick-start-summary.svg>`_
-  (`PDF <ru/quick-reference/quick-start-summary.pdf>`_,
-  `PNG <ru/quick-reference/quick-start-summary.png>`_)
-
-* `Список изменений <en/release-notes/NEWS.html>`_ (англ.)
-
-* `Каталог информации для разработчиков <developers/index.html>`_ (англ.) |--| 
-  для разработчиков Bazaar и плагинов
-
-Учебники
-========
-
-* `Базар за пять минут <ru/mini-tutorial/index.html>`_
-
-* `Большой учебник <ru/tutorials/tutorial.html>`_
-
-* `Использование Bazaar с Launchpad 
-  <ru/tutorials/using_bazaar_with_launchpad.html>`_
-
-* `Работа в централизованном стиле
-  <ru/tutorials/centralized_workflow.html>`_
+.. toctree::
+   :maxdepth: 1
+
+   user-guide/index
+   quick-reference/index
+   mini-tutorial/index
+   tutorials/tutorial
+   tutorials/using_bazaar_with_launchpad
+   tutorials/centralized_workflow
+
 
 Ссылки в сети
 =============
 
-* `Руководства по переходу <http://bazaar-vcs.org/BzrSwitching>`_
-  |--| для пользователей переходящих с других систем контроля версий
-
-* `Руководство по миграции <http://bazaar-vcs.org/BzrMigration>`_
+* `Руководство по миграции <http://doc.bazaar-vcs.org/migration/en/>`_
   |--| для команд переносящих историю с других систем контроля версий
 
 * `Словарь терминов <http://bazaar-vcs.org/BzrGlossary>`_ (англ.), 
@@ -49,13 +30,8 @@
   
 __  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
 
-* `Часто задаваемые вопросы <http://bazaar-vcs.org/FAQ>`_ (англ.)
-
-Другие языки
-============
-
-* `Документация на английском <index.html>`_ |--| English Documentation
-* `Документация на испанском <index.es.html>`_
+* `Часто задаваемые вопросы <https://answers.launchpad.net/bzr>`_ (англ.)
+
 
 .. |--| unicode:: U+2014
 

=== 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-09 02:32:10 +0000
@@ -0,0 +1,6 @@
+Карточка быстрого старта
+========================
+
+* `PDF <../_static/ru/bzr-ru-quick-reference.pdf>`_
+* `PNG <../_static/ru/bzr-ru-quick-reference.png>`_
+* `SVG <../_static/ru/bzr-ru-quick-reference.svg>`_

=== 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 @@
+#!/usr/bin/python
+
+# Copyright 2009 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import os
+import sys
+from optparse import OptionParser
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+
+
+def split_into_topics(lines, out_file, out_dir):
+    """Split a large NEWS file into topics, one per release.
+
+    Releases are detected by matching headings that look like
+    release names. Topics are created with matching names
+    replacing spaces with dashes.
+    """
+    topic_file = None
+    for index, line in enumerate(lines):
+        maybe_new_topic = line[:4] in ['bzr ', 'bzr-0',]
+        if maybe_new_topic and lines[index + 1].startswith('####'):
+            release = line.strip()
+            if topic_file is None:
+                # First topic found
+                out_file.write(".. toctree::\n   :maxdepth: 1\n\n")
+            else:
+                # close the current topic
+                topic_file.close()
+            topic_file = open_topic_file(out_file, out_dir, release)
+        elif topic_file:
+            topic_file.write(line)
+        else:
+            # Still in the header - dump content straight to output
+            out_file.write(line)
+
+
+def open_topic_file(out_file, out_dir, release):
+    topic_name = release.replace(' ', '-')
+    out_file.write("   %s\n" % (topic_name,))
+    topic_path = os.path.join(out_dir, "%s.txt" % (topic_name,))
+    result = open(topic_path, 'w')
+    result.write("%s\n" % (release,))
+    return result
+
+
+def main(argv):
+    # Check usage
+    parser = OptionParser(usage="%prog SOURCE DESTINATION")
+    (options, args) = parser.parse_args(argv)
+    if len(args) != 2:
+        parser.print_help()
+        sys.exit(1)
+
+    # Open the files and do the work
+    infile_name = args[0]
+    outfile_name = args[1]
+    outdir = os.path.dirname(outfile_name)
+    infile = open(infile_name, 'r')
+    try:
+        lines = infile.readlines()
+    finally:
+        infile.close()
+    outfile = open(outfile_name, 'w')
+    try:
+        split_into_topics(lines, outfile, outdir)
+    finally:
+        outfile.close()
+
+
+if __name__ == '__main__':
+    main(sys.argv[1:])

=== added file 'tools/package_docs.py'
--- tools/package_docs.py	1970-01-01 00:00:00 +0000
+++ tools/package_docs.py	2009-09-09 00:49:50 +0000
@@ -0,0 +1,109 @@
+#!/usr/bin/python
+
+# Copyright 2009 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import os
+import sys
+import tarfile
+from optparse import OptionParser
+from shutil import copy2, copytree, rmtree
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+
+
+def package_docs(section, src_build, dest_html, dest_downloads):
+    """Package docs from a Sphinx _build directory into target directories.
+
+    :param section: section in the website being built
+    :param src_build: the _build directory
+    :param dest_html: the directory where html should go
+    :param downloads: the directory where downloads should go
+    """
+    # Copy across the HTML. Explicitly delete the html destination
+    # directory first though because copytree insists on it not existing.
+    src_html = os.path.join(src_build, 'html')
+    if os.path.exists(dest_html):
+        rmtree(dest_html)
+    copytree(src_html, dest_html)
+
+    # Package the html as a downloadable archive
+    archive_root = "bzr-%s-html" % (section,)
+    archive_basename = "%s.tar.bz2" % (archive_root,)
+    archive_name = os.path.join(dest_downloads, archive_basename)
+    build_archive(src_html, archive_name, archive_root, 'bz2')
+
+    # Copy across the PDF docs, if any, including the quick ref card
+    pdf_files = []
+    quick_ref = os.path.join(src_html,
+        '_static/%s/bzr-%s-quick-reference.pdf' % (section, section))
+    if os.path.exists(quick_ref):
+        pdf_files.append(quick_ref)
+    src_pdf = os.path.join(src_build, 'latex')
+    if os.path.exists(src_pdf):
+        for name in os.listdir(src_pdf):
+            if name.endswith('.pdf'):
+                pdf_files.append(os.path.join(src_pdf, name))
+    if pdf_files:
+        dest_pdf = os.path.join(dest_downloads, 'pdf-%s' % (section,))
+        if not os.path.exists(dest_pdf):
+            os.mkdir(dest_pdf)
+        for pdf in pdf_files:
+            copy2(pdf, dest_pdf)
+
+    # TODO: copy across the CHM files, if any
+
+
+def build_archive(src_dir, archive_name, archive_root, format):
+    print "creating %s ..." % (archive_name,)
+    tar = tarfile.open(archive_name, "w:%s" % (format,))
+    for relpath in os.listdir(src_dir):
+        src_path = os.path.join(src_dir, relpath)
+        archive_path = os.path.join(archive_root, relpath)
+        tar.add(src_path, arcname=archive_path)
+    tar.close()
+
+
+def main(argv):
+    # Check usage. The first argument is the parent directory of
+    # the Sphinx _build directory. It will typically be 'doc/xx'.
+    # The second argument is the website build directory.
+    parser = OptionParser(usage="%prog SOURCE-DIR WEBSITE-BUILD-DIR")
+    (options, args) = parser.parse_args(argv)
+    if len(args) != 2:
+        parser.print_help()
+        sys.exit(1)
+
+    # Get the section - locale code or 'developers'
+    src_dir = args[0]
+    section = os.path.basename(src_dir)
+    src_build = os.path.join(src_dir, '_build')
+
+    # Create the destination directories if they doesn't exist.
+    dest_dir = args[1]
+    dest_html = os.path.join(dest_dir, section)
+    dest_downloads = os.path.join(dest_dir, 'downloads')
+    for d in [dest_dir, dest_downloads]:
+        if not os.path.exists(d):
+            print "creating directory %s ..." % (d,)
+            os.mkdir(d)
+
+    # Package and copy the files across
+    package_docs(section, src_build, dest_html, dest_downloads)
+
+
+if __name__ == '__main__':
+    main(sys.argv[1:])