← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/admin-guide/index-plain.txt

  • Committer: John Arbash Meinel
  • Date: 2008-07-09 21:42:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.

To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/admin-guide/index-plain.txt
1
 
###################################
2
 
Bazaar System Administrator's Guide
3
 
###################################
4
 
 
5
 
.. Please mark sections in included files as following:
6
 
..   level 1 ========
7
 
..   level 2 --------
8
 
..   level 3 ~~~~~~~~
9
 
..   level 4 ^^^^^^^^ (it is better not to use nesting deeper than 3 levels)
10
 
 
11
 
.. contents:: :depth: 3
12
 
 
13
 
.. include:: introduction.txt
14
 
.. include:: simple-setups.txt
15
 
.. include:: other-setups.txt
16
 
.. include:: migration.txt
17
 
.. include:: hooks-plugins.txt
18
 
.. include:: code-browsing.txt
19
 
.. include:: integration.txt
20
 
.. include:: security.txt
21
 
.. include:: backup.txt
22
 
.. include:: upgrade.txt
23
 
.. include:: advanced.txt
24
 
.. include:: licence.txt