Rev 2238: Document global options in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2238
revision-id: pqm at pqm.ubuntu.com-20070117162220-c8e98cc6eec6ed27
parent: pqm at pqm.ubuntu.com-20070117161135-075d32222962c3eb
parent: abentley at panoramicfeedback.com-20070117144846-7ql2d2433v28cbwy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-17 16:22:20 +0000
message:
  Document global options
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070117144846-7ql2d2433v28cbwy
    parent: abentley at panoramicfeedback.com-20070117144647-ae1gogd30h12vgwm
    parent: abentley at panoramicfeedback.com-20070117143854-l2r4csg4s6pyosha
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2007-01-17 09:48:46 -0500
    message:
      Merge the ls changes, so I don't get conflicts submitting this
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070117144647-ae1gogd30h12vgwm
    parent: abentley at panoramicfeedback.com-20070117144403-inwzdbaaj8zrfxow
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2007-01-17 09:46:47 -0500
    message:
      Fix NEWS and whitespace
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070117144403-inwzdbaaj8zrfxow
    parent: abentley at panoramicfeedback.com-20070115150638-jvpe348rvjd5rjz4
    parent: pqm at pqm.ubuntu.com-20070117020432-338f7296818dc56e
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2007-01-17 09:44:03 -0500
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070115150638-jvpe348rvjd5rjz4
    parent: abentley at panoramicfeedback.com-20070111155749-v70rw01ug96bs1ll
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Mon 2007-01-15 10:06:38 -0500
    message:
      Add global option help