← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help_topics/__init__.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-12 12:55:36 UTC
  • mfrom: (5031.1.3 merge-2.1-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20100212125536-75ekp8giqbsnunmu
(andrew) Merge lp:bzr/2.1 to lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics/__init__.py
269
269
  bzr+ssh://remote@shell.example.com/~/myproject/trunk
270
270
 
271
271
would refer to ``/home/remote/myproject/trunk``.
 
272
 
 
273
Many commands that accept URLs also accept location aliases too.  See
 
274
::doc:`location-alias-help`.
272
275
"""
273
276
 
274
277
    return out
758
761
                        'Types of conflicts and what to do about them')
759
762
topic_registry.register('debug-flags', _load_from_file,
760
763
                        'Options to show or record debug information')
 
764
topic_registry.register('location-alias', _load_from_file,
 
765
                        'Aliases for remembered locations')
761
766
topic_registry.register('log-formats', _load_from_file,
762
767
                        'Details on the logging formats available')
763
768