~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/index.txt

  • Committer: Martin Pool
  • Date: 2005-06-06 11:53:29 UTC
  • Revision ID: mbp@sourcefrog.net-20050606115329-1596352add25bffd
- merge aaron's updated merge/pull code

Show diffs side-by-side

added added

removed removed

Lines of Context:
32
32
  documentation, and gives the best overview at the moment of what the
33
33
  system will feel like to use.  Fairly complete.
34
34
 
35
 
* `Quick reference <quickref.html>`__ -- single page description of
36
 
  how to use, intended to check it's adequately simple.  Incomplete.
37
 
 
38
 
* `FAQ <faq.html>`__ -- mostly user-oriented FAQ.
39
 
 
40
35
 
41
36
Requirements and general design
42
37
-------------------------------
73
68
 
74
69
* `Config specs <config-specs.html>`__ assemble a tree from several places.
75
70
 
76
 
* `Conflicts <conflicts.html>`_ that can occur during merge-like operations.
 
71
* `Conflicts <conflicts.html>`_ that can occur during merge-like
 
72
  operations.
 
73
 
 
74
* `Ignored files <ignore.html>`__
77
75
 
78
76
* `Recovering from interrupted operations <interrupted.html>`__
79
77
 
104
102
 
105
103
* `Patch pools <pool.html>`__ to efficiently store related branches.
106
104
 
 
105
* `Revfiles <revfile.html>`__ store the text history of files.
 
106
 
 
107
* `Revfiles storing annotations <revfile-annotation.html>`__
 
108
 
107
109
* `Revision syntax <revision-syntax.html>`__ -- ``hello.c@12``, etc.
108
110
 
109
111
* `Roll-up commits <rollup.html>`__ -- a single revision incorporates
177
179
Project management and organization
178
180
-----------------------------------
179
181
 
180
 
* `Development news <news.html>`__
181
 
 
182
182
* `Notes on how to get a VCS adopted <adoption.html>`__
183
183
 
184
 
* `Testing plan <testing.html>`__ -- very sketchy.
185
 
 
186
184
* `Thanks <thanks.html>`__ to various people
187
185
 
188
 
* `Roadmap <roadmap.html>`__: High-level order for implementing features.
189
 
 
190
 
* `<work-order.html>`__: current tasks.
191
 
 
192
186
* `Extra commands <extra-commands.html>`__ for
193
187
  internal/developer/debugger use.
194
188