Viewing all changes in revision 2692.1.17.
- Committer: Andrew Bennetts
- Date: 2008-01-04 03:12:11 UTC
- mfrom: (3164 +trunk)
- mto: This revision was merged to the branch mainline in revision 3320.
- Revision ID: andrew.bennetts@canonical.com-20080104031211-wy4uxo2j4elvip1j
Merge from bzr.dev.
- files added:
- bzrlib/help_topics
- bzrlib/help_topics/en
- files removed:
- doc/en/user-reference/index.txt
- files renamed:
- bzrlib/help_topics.py => bzrlib/help_topics/__init__.py
- doc/en/user-guide/authentication_conf.txt => bzrlib/help_topics/en/authentication.txt
- doc/en/user-guide/configuration.txt => bzrlib/help_topics/en/configuration.txt
- doc/en/user-guide/conflicts.txt => bzrlib/help_topics/en/conflicts.txt
- doc/en/user-reference/hooks.txt => bzrlib/help_topics/en/hooks.txt
- bzrlib/tests/HttpServer.py => bzrlib/tests/http_server.py
- bzrlib/tests/HTTPTestUtil.py => bzrlib/tests/http_utils.py
- files modified:
- .bzrignore
expand all
collapse all
added
removed
doc/en/quick-reference/quick-start-summary.png
doc/en/quick-reference/quick-start-summary.svg
