← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/user-guide/index.txt

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-21 10:00:42 UTC
  • mfrom: (4978.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100121100042-77858a88k2zpec7b
(nmb) Add documentation for multi-parent merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/index.txt
 
1
#################
 
2
Bazaar User Guide
 
3
#################
 
4
 
 
5
.. Please mark sections in included files as following:
 
6
..   level 1 ========
 
7
..   level 2 --------
 
8
..   level 3 ~~~~~~~~
 
9
..   level 4 ^^^^^^^^ (it is better not to use nesting deeper than 3 levels)
 
10
 
 
11
 
 
12
Introduction
 
13
############
 
14
 
 
15
.. toctree::
 
16
   :maxdepth: 1
 
17
 
 
18
   introducing_bazaar
 
19
   core_concepts
 
20
   bazaar_workflows
 
21
 
 
22
 
 
23
Getting started
 
24
###############
 
25
 
 
26
.. toctree::
 
27
   :maxdepth: 1
 
28
 
 
29
   installing_bazaar
 
30
   entering_commands
 
31
   getting_help
 
32
   configuring_bazaar
 
33
   using_aliases
 
34
   plugins
 
35
   zen
 
36
 
 
37
 
 
38
Personal version control
 
39
########################
 
40
 
 
41
.. toctree::
 
42
   :maxdepth: 1
 
43
 
 
44
   solo_intro
 
45
   starting_a_project
 
46
   controlling_registration
 
47
   reviewing_changes
 
48
   recording_changes
 
49
   browsing_history
 
50
   releasing_a_project
 
51
   undoing_mistakes
 
52
 
 
53
 
 
54
Sharing with peers
 
55
##################
 
56
 
 
57
.. toctree::
 
58
   :maxdepth: 1
 
59
 
 
60
   partner_intro
 
61
   branching_a_project
 
62
   merging_changes
 
63
   resolving_conflicts
 
64
   annotating_changes
 
65
 
 
66
 
 
67
Team collaboration, central style
 
68
#################################
 
69
 
 
70
.. toctree::
 
71
   :maxdepth: 1
 
72
 
 
73
   central_intro
 
74
   publishing_a_branch
 
75
   using_checkouts
 
76
   working_offline_central
 
77
   reusing_a_checkout
 
78
 
 
79
 
 
80
Team collaboration, distributed style
 
81
#####################################
 
82
 
 
83
.. toctree::
 
84
   :maxdepth: 1
 
85
 
 
86
   distributed_intro
 
87
   organizing_branches
 
88
   using_gatekeepers
 
89
   sending_changes
 
90
 
 
91
 
 
92
Miscellaneous topics
 
93
####################
 
94
 
 
95
.. toctree::
 
96
   :maxdepth: 1
 
97
 
 
98
   part2_intro
 
99
   adv_merging
 
100
   shelving_changes
 
101
   filtered_views
 
102
   stacked
 
103
   server
 
104
   hooks
 
105
   version_info
 
106
 
 
107
 
 
108
A brief tour of some popular plugins
 
109
####################################
 
110
 
 
111
.. toctree::
 
112
   :maxdepth: 1
 
113
 
 
114
   bzrtools_plugin
 
115
   svn_plugin
 
116
 
 
117
 
 
118
Integrating Bazaar into your environment
 
119
########################################
 
120
 
 
121
.. toctree::
 
122
   :maxdepth: 1
 
123
 
 
124
   web_browsing
 
125
   bug_trackers
 
126
 
 
127
 
 
128
Appendices
 
129
##########
 
130
 
 
131
.. toctree::
 
132
   :maxdepth: 1
 
133
 
 
134
   specifying_revisions
 
135
   organizing_your_workspace
 
136
   shared_repository_layouts
 
137
   setting_up_email
 
138
   http_smart_server
 
139
   writing_a_plugin
 
140
 
 
141
.. |--| unicode:: U+2014