← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2007-06-21 23:43:17 UTC
  • mto: (2520.5.2 bzr.mpbundle)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070621234317-5w3h8h36oe90sups
Implement new merge directive format

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/index-plain.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
 
.. contents:: :depth: 3
12
 
 
13
 
 
14
 
Introduction
15
 
############
16
 
 
17
 
.. include:: introducing_bazaar.txt
18
 
.. include:: core_concepts.txt
19
 
.. include:: bazaar_workflows.txt
20
 
 
21
 
 
22
 
Getting started
23
 
###############
24
 
 
25
 
.. include:: installing_bazaar.txt
26
 
.. include:: entering_commands.txt
27
 
.. include:: getting_help.txt
28
 
.. include:: configuring_bazaar.txt
29
 
.. include:: using_aliases.txt
30
 
.. include:: plugins.txt
31
 
.. include:: zen.txt
32
 
 
33
 
 
34
 
Personal version control
35
 
########################
36
 
 
37
 
.. include:: solo_intro.txt
38
 
.. include:: starting_a_project.txt
39
 
.. include:: controlling_registration.txt
40
 
.. include:: reviewing_changes.txt
41
 
.. include:: recording_changes.txt
42
 
.. include:: browsing_history.txt
43
 
.. include:: releasing_a_project.txt
44
 
.. include:: undoing_mistakes.txt
45
 
 
46
 
 
47
 
Sharing with peers
48
 
##################
49
 
 
50
 
.. include:: partner_intro.txt
51
 
.. include:: branching_a_project.txt
52
 
.. include:: merging_changes.txt
53
 
.. include:: resolving_conflicts.txt
54
 
.. include:: annotating_changes.txt
55
 
 
56
 
 
57
 
Team collaboration, central style
58
 
#################################
59
 
 
60
 
.. include:: central_intro.txt
61
 
.. include:: publishing_a_branch.txt
62
 
.. include:: using_checkouts.txt
63
 
.. include:: working_offline_central.txt
64
 
.. include:: reusing_a_checkout.txt
65
 
 
66
 
 
67
 
Team collaboration, distributed style
68
 
#####################################
69
 
 
70
 
.. include:: distributed_intro.txt
71
 
.. include:: organizing_branches.txt
72
 
.. include:: using_gatekeepers.txt
73
 
.. include:: sending_changes.txt
74
 
 
75
 
 
76
 
Miscellaneous topics
77
 
####################
78
 
 
79
 
.. include:: part2_intro.txt
80
 
.. include:: adv_merging.txt
81
 
.. include:: shelving_changes.txt
82
 
.. include:: filtered_views.txt
83
 
.. include:: stacked.txt
84
 
.. include:: server.txt
85
 
.. include:: hooks.txt
86
 
.. include:: version_info.txt
87
 
 
88
 
 
89
 
A brief tour of some popular plugins
90
 
####################################
91
 
 
92
 
.. include:: bzrtools_plugin.txt
93
 
.. include:: svn_plugin.txt
94
 
.. include later looms_plugin.txt
95
 
 
96
 
 
97
 
Integrating Bazaar into your environment
98
 
########################################
99
 
 
100
 
.. include:: web_browsing.txt
101
 
.. include later - file_explorers.txt
102
 
.. include later - desktop_integration.txt
103
 
.. include later - editors_and_ides.txt
104
 
.. include later - email.txt
105
 
.. include:: bug_trackers.txt
106
 
 
107
 
 
108
 
Appendices
109
 
##########
110
 
 
111
 
.. include:: specifying_revisions.txt
112
 
.. include:: organizing_your_workspace.txt
113
 
.. include:: shared_repository_layouts.txt
114
 
.. include:: setting_up_email.txt
115
 
.. include:: http_smart_server.txt
116
 
.. include:: writing_a_plugin.txt
117
 
 
118
 
.. |--| unicode:: U+2014
119