10
10
.. level 3 ~~~~~~~~
11
11
.. level 4 ^^^^^^^^ (it is better not to use nesting deeper than 3 levels)
20
.. later include:: introducing_bazaar.txt
21
.. later include:: workflows.txt
27
.. later include:: download.txt
29
* `Introducing yourself <setting_up_email.html>`_ |--| The various ways that exist
30
to tell Bazaar your email address for commits.
32
* `Using configuration files <configuration.html>`_ |--| Information on how to configure
13
.. contents:: :depth: 2
39
* `Tutorial <tutorial.html>`_ |--| Explains how to use bzr.
42
* `Specifying revision identifiers <specifying_revisions.html>`_ |--| Description
43
of the subarguments for ``-r`` as used by commands such as
44
**bzr log** and **bzr merge**.
46
* `Running a Bazaar server <server.html>`_ |--| How to run a server
47
to allow remote access to Bazaar branches.
20
.. include:: introducing_bazaar.txt
21
.. include:: core_concepts.txt
22
.. include:: bazaar_workflows.txt
53
* `Conflict handling <conflicts.html>`_ |--| The various kind of conflicts
54
you may encounter, and how to handle them.
56
* `Centralized workflow <centralized_workflow.html>`_ |--| How to use Bazaar in
57
a centralized way like CVS or Subversion.
28
.. include:: installing_bazaar.txt
29
.. include:: using_bazaar.txt
30
.. later include:: configuring_bazaar.txt
31
.. include:: using_aliases.txt
32
.. include:: plugins.txt
35
Personal version control
36
########################
38
.. later include:: solo_workflow.txt
39
.. later include:: starting_a_project.txt
40
.. later include:: recording_changes.txt
41
.. later include:: browsing_history.txt
42
.. later include:: specifying_revisions.txt
43
.. later include:: releasing_a_project.txt
49
.. later include:: partner_workflow.txt
50
.. later include:: branching_a_project.txt
51
.. later include:: merging.txt
52
.. later include:: managing_conflicts.txt
53
.. later include:: annotating_history.txt
56
Team collaboration, central style
57
#################################
59
.. later include:: centralized_workflow.txt
60
.. later include:: pushing_a_branch.txt
59
61
.. later include:: using_bound_branches.txt
64
Team collaboration, distributed style
65
#####################################
67
.. later include:: distributed_workflow.txt
60
68
.. later include:: shared_repositories.txt
71
Integrating bazaar with other systems
72
#####################################
74
.. include:: bug_trackers.txt
75
.. include:: version_info.txt
66
* `Running a Bazaar smart server <http_smart_server.html>`_ |--| How to run
67
a smart HTTP server to allow remote access to Bazaar branches.
69
* `Shared repositories layouts <shared_repository_layouts.html>`_ |--| The
70
pros and cons of various repository layouts.
72
.. later include:: tracking_upstream.txt
73
.. later include:: useful_tips.txt
81
.. include:: shared_repository_layouts.txt
82
.. include:: server.txt
83
.. include:: hooks.txt
79
* `Plugins <plugins.html>`_ |--| Information on how to use plugins in Bazaar.
81
* `Hooks <hooks.html>`_ |--| How to set up hooks that are executed on certain
84
* `Using aliases <using_aliases.html>`_ |--| How to set up
85
and use command aliases.
88
Integrating Bazaar With Other Systems
89
#####################################
91
* `Bug trackers <bug_trackers.html>`_ |--| Information on how to integrate with bug trackers.
93
* `Exporting version information <version_info.html>`_ |--| How to export version numbers to a build system.
85
.. Perhaps this ought to go in the User Reference?
86
.. include:: configuration.txt
92
.. include:: specifying_revisions.txt
93
.. include:: setting_up_email.txt
94
.. include:: authentication_conf.txt
95
.. include:: http_smart_server.txt
96
.. include:: writing_a_plugin.txt
95
98
.. |--| unicode:: U+2014
added
removed
doc/en/user-guide/index.txt
