Rev 2745: Style tweakage and NEWS in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2745
revision-id: pqm at pqm.ubuntu.com-20070823005013-ada9x55rc31yiwou
parent: pqm at pqm.ubuntu.com-20070823001812-eermtd2vfr5o6b7o
parent: aaron.bentley at utoronto.ca-20070822235917-m0im4dpa8wni7q3k
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-08-23 01:50:13 +0100
message:
  Style tweakage and NEWS
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
  doc/en/user-guide/server.txt   server.txt-20060913044801-h939fvbwzz39gf7g-1
    ------------------------------------------------------------
    revno: 2706.1.3
    merged: aaron.bentley at utoronto.ca-20070822235917-m0im4dpa8wni7q3k
    parent: aaron.bentley at utoronto.ca-20070822234623-nsms2wm36knntp7x
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab.integration
    timestamp: Wed 2007-08-22 19:59:17 -0400
    message:
      Style tweakage and NEWS
    ------------------------------------------------------------
    revno: 2706.1.2
    merged: aaron.bentley at utoronto.ca-20070822234623-nsms2wm36knntp7x
    parent: martin at pentacorp.net-20070815211426-thbyeb5ecbxhocsd
    parent: pqm at pqm.ubuntu.com-20070822052832-nxby1d1plok4syek
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab.integration
    timestamp: Wed 2007-08-22 19:46:23 -0400
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    revno: 2706.1.1
    merged: martin at pentacorp.net-20070815211426-thbyeb5ecbxhocsd
    parent: pqm at pqm.ubuntu.com-20070815200214-d3uyn1kkhzekttes
    committer: Martin Albisetti <martin at pentacorp.net>
    branch nick: bzr_doc
    timestamp: Wed 2007-08-15 18:14:26 -0300
    message:
      updated smart server documentation
=== modified file 'NEWS'
--- a/NEWS	2007-08-22 05:28:32 +0000
+++ b/NEWS	2007-08-22 23:59:17 +0000
@@ -44,6 +44,8 @@
     * ``send`` now sends the directive as an attachment by default.
       (Aaron Bentley, Lukáš Lalinský, Alexander Belchenko)
 
+    * Documentation updates (Martin Albisetti)
+
   API BREAKS:
 
    * ``Branch.append_revision`` is removed altogether; please use 

=== modified file 'doc/en/user-guide/http_smart_server.txt'
--- a/doc/en/user-guide/http_smart_server.txt	2007-08-10 05:17:09 +0000
+++ b/doc/en/user-guide/http_smart_server.txt	2007-08-22 23:59:17 +0000
@@ -50,7 +50,7 @@
 
     Alias /code /srv/example.com/www/code
     <Directory /srv/example.com/www/code>
-        Options Indexes, FollowSymLinks
+        Options Indexes FollowSymLinks
         RewriteEngine On
         RewriteBase /code
         RewriteRule ^(.*/|)\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
@@ -106,6 +106,16 @@
 This instructs Apache to hand requests for any URL ending with `/.bzr/smart`
 inside `/code` to a Bazaar smart server via mod_python.
 
+NOTE: If you don't have bzrlib in your PATH, you will be need to change the
+following line::
+
+            PythonPath "sys.path+['/srv/example.com/scripts']"
+
+To::
+
+            PythonPath "['/path/to/bzr']+sys.path+['/srv/example.com/scripts']"
+
+
 Refer to the mod_python_ documentation for further information.
 
 .. _mod_python: http://www.modpython.org/
@@ -162,6 +172,8 @@
         
 The `modpywsgi` module can be found at http://trac.pocoo.org/wiki/ModPyWsgi.  It
 is part of pocoo_.
+You sould make sure you place modpywsgi.py in the same directory as
+bzr-smart.py (ie. /srv/example.com/scripts/).
 
 .. _pocoo: http://trac.pocoo.org/wiki/
 

=== modified file 'doc/en/user-guide/server.txt'
--- a/doc/en/user-guide/server.txt	2007-08-10 05:17:09 +0000
+++ b/doc/en/user-guide/server.txt	2007-08-22 23:59:17 +0000
@@ -60,7 +60,7 @@
 
 Running a Bazaar server from inetd requires an inetd.conf entry::
 
-    4155  stream  tcp  nowait  bzruser  /usr/bin/bzr serve --inet --directory=/srv/bzr/repo
+    4155  stream  tcp  nowait  bzruser  /usr/bin/bzr /usr/bin/bzr serve --inet --directory=/srv/bzr/repo
 
 When running client commands, the URL you supply is a `bzr://` URL relative to
 the ``--directory`` option given in inetd.conf::
@@ -87,4 +87,5 @@
 your machine on port `4155`.
 
 server::
+
     bzr serve --directory=/srv/bzr/repo