← Back to branch summary

~toddy/bzr/bzr.i18n

« back to all changes in this revision

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

  • Committer: Tobias Toedter
  • Date: 2007-12-30 18:52:13 UTC
  • mfrom: (2438.1.708 +trunk)
  • Revision ID: t.toedter@gmx.net-20071230185213-7xiqpbtshmnsf073
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/index.txt
79
79
##############
80
80
 
81
81
.. include:: best_practice_intro.txt
 
82
.. include:: adv_merging.txt
82
83
.. include:: server.txt
83
84
.. include:: hooks.txt
84
85
.. include:: version_info.txt
85
86
.. include:: bug_trackers.txt
86
 
.. include:: shared_repository_layouts.txt
87
87
 
88
88
 
89
89
Appendices
90
90
##########
91
91
 
92
92
.. include:: specifying_revisions.txt
93
 
.. include:: conflicts.txt
94
 
.. include:: configuration.txt
 
93
.. include:: shared_repository_layouts.txt
95
94
.. include:: setting_up_email.txt
96
 
.. include:: authentication_conf.txt
97
95
.. include:: http_smart_server.txt
98
96
.. include:: writing_a_plugin.txt
99
97