~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#################
2
 
Bazaar User Guide
3
 
#################
4
 
 
5
 
.. Files are currently links but will become includes once the
6
 
.. content makes more sense as a whole.
7
 
.. Please mark sections in linked/included files as following:
8
 
..   level 1 ========
9
 
..   level 2 --------
10
 
..   level 3 ~~~~~~~~
11
 
..   level 4 ^^^^^^^^ (it is better not to use nesting deeper than 3 levels)
12
 
 
13
 
.. contents:: :depth: 2
14
 
.. sectnum::
15
 
 
16
 
 
17
 
Introduction
18
 
############
19
 
 
20
 
.. include:: introducing_bazaar.txt
21
 
.. include:: core_concepts.txt
22
 
.. include:: bazaar_workflows.txt
23
 
 
24
 
 
25
 
Getting started
26
 
###############
27
 
 
28
 
.. include:: installing_bazaar.txt
29
 
.. include:: entering_commands.txt
30
 
.. include:: getting_help.txt
31
 
.. include:: configuring_bazaar.txt
32
 
.. include:: using_aliases.txt
33
 
.. include:: plugins.txt
34
 
 
35
 
 
36
 
Personal version control
37
 
########################
38
 
 
39
 
.. include:: solo_intro.txt
40
 
.. include:: starting_a_project.txt
41
 
.. include:: controlling_registration.txt
42
 
.. include:: reviewing_changes.txt
43
 
.. include:: recording_changes.txt
44
 
.. include:: browsing_history.txt
45
 
.. include:: releasing_a_project.txt
46
 
.. include:: undoing_mistakes.txt
47
 
 
48
 
 
49
 
Sharing with peers
50
 
##################
51
 
 
52
 
.. include:: partner_intro.txt
53
 
.. include:: branching_a_project.txt
54
 
.. include:: merging_changes.txt
55
 
.. include:: resolving_conflicts.txt
56
 
.. include:: annotating_changes.txt
57
 
 
58
 
 
59
 
Team collaboration, central style
60
 
#################################
61
 
 
62
 
.. include:: central_intro.txt
63
 
.. include:: publishing_a_branch.txt
64
 
.. include:: using_checkouts.txt
65
 
.. include:: working_offline_central.txt
66
 
.. include:: reusing_a_checkout.txt
67
 
 
68
 
 
69
 
Team collaboration, distributed style
70
 
#####################################
71
 
 
72
 
.. include:: distributed_intro.txt
73
 
.. include:: organizing_branches.txt
74
 
.. include:: using_gatekeepers.txt
75
 
.. include:: sending_changes.txt
76
 
 
77
 
 
78
 
Best practices
79
 
##############
80
 
 
81
 
.. include:: best_practice_intro.txt
82
 
.. include:: adv_merging.txt
83
 
.. include:: server.txt
84
 
.. include:: hooks.txt
85
 
.. include:: version_info.txt
86
 
.. include:: bug_trackers.txt
87
 
 
88
 
 
89
 
Appendices
90
 
##########
91
 
 
92
 
.. include:: specifying_revisions.txt
93
 
.. include:: shared_repository_layouts.txt
94
 
.. include:: setting_up_email.txt
95
 
.. include:: http_smart_server.txt
96
 
.. include:: writing_a_plugin.txt
97
 
 
98
 
.. |--| unicode:: U+2014