← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/index.txt

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/index.txt
9
9
Core Documentation
10
10
==================
11
11
 
12
 
* `User Guide <en/user-guide/index.html>`_ 
13
 
 
14
 
* `User Reference <en/user-reference/bzr_man.html>`_ 
15
 
 
16
 
* `Quick Start Card <en/quick-reference/quick-start-summary.svg>`_
17
 
  (`PDF <en/quick-reference/quick-start-summary.pdf>`_,
18
 
  `PNG <en/quick-reference/quick-start-summary.png>`_)
 
12
* `User Guide <en/user-guide/index-plain.html>`_
 
13
 
 
14
* `User Reference <en/user-reference/bzr_man.html>`_
 
15
 
 
16
* `Quick Start Card <en/_static/en/bzr-en-quick-reference.svg>`_
 
17
  (`PDF <en/_static/en/bzr-en-quick-reference.pdf>`_,
 
18
  `PNG <en/_static/en/bzr-en-quick-reference.png>`_)
19
19
 
20
20
* `Release Notes <en/release-notes/NEWS.html>`_
21
21
 
22
 
* `Developer Document Catalog <developers/index.html>`_ |--| for developers
 
22
* `2.0 Upgrade Guide <en/upgrade-guide/index.html>`_
 
23
 
 
24
 
 
25
Tutorials
 
26
=========
 
27
 
 
28
* `Bazaar in five minutes <en/mini-tutorial/index.html>`_
 
29
 
 
30
* `A longer tutorial <en/tutorials/tutorial.html>`_
 
31
 
 
32
* `Using Bazaar with Launchpad <en/tutorials/using_bazaar_with_launchpad.html>`_
 
33
 
 
34
* `Centralized workflow <en/tutorials/centralized_workflow.html>`_
 
35
 
 
36
 
 
37
Developer Documentation
 
38
=======================
 
39
 
 
40
* `Developer Document Catalog <developers/index-plain.html>`_ |--| for developers
23
41
  of Bazaar and plugins
24
42
 
25
 
 
26
 
Tutorials
27
 
=========
28
 
 
29
 
* `Bazaar in five minutes <en/mini-tutorial/index.html>`_ 
30
 
 
31
 
* `A longer tutorial <en/tutorials/tutorial.html>`_ 
32
 
 
33
 
* `Using Bazaar with Launchpad <en/tutorials/using_bazaar_with_launchpad.html>`_ 
34
 
 
35
 
* `Centralized workflow <en/tutorials/centralized_workflow.html>`_ 
36
 
 
37
 
 
38
43
Web links
39
44
=========
40
45
 
41
 
* `Switching Guides <http://bazaar-vcs.org/BzrSwitching>`_ 
 
46
* `Switching Guides <http://bazaar-vcs.org/BzrSwitching>`_
42
47
  |--| for users moving from another VCS tool
43
48
 
44
49
* `Migration Guide <http://bazaar-vcs.org/BzrMigration>`_
53
58
===============
54
59
 
55
60
* `Spanish Documentation <index.es.html>`_
 
61
* `Russian Documentation <index.ru.html>`_ |--| документация на русском
 
62
* `Japanese Documentation <index.ja.html>`_ |--| 日本語のドキュメント
56
63
 
57
64
.. |--| unicode:: U+2014
58
65