Rev 5479: Merge lp:~nmb/bzr/311518-apache-doc-rewrite fixing NEWS entry in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration/

------------------------------------------------------------
revno: 5479 [merge]
revision-id: v.ladeuil+lp at free.fr-20101011102723-ttkp1trr7k4gybbe
parent: pqm at pqm.ubuntu.com-20101011021544-4gewnsxq9vvjpggc
parent: nmb at wartburg.edu-20101005033150-qvuzbfre64kvj4le
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2010-10-11 12:27:23 +0200
message:
  Merge lp:~nmb/bzr/311518-apache-doc-rewrite fixing NEWS entry
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
  doc/ja/user-guide/http_smart_server.txt http_smart_server.tx-20091029100035-1rni8rgpen0pe1g2-41
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-10-11 02:15:44 +0000
+++ b/NEWS	2010-10-11 10:27:23 +0000
@@ -19,6 +19,9 @@
 Bug Fixes
 *********
 
+* Don't force openssh to use protocol=2, since that is now the default.
+  (Neil Martinsen-Burrell, #561061)
+
 Improvements
 ************
 
@@ -81,9 +84,6 @@
   using this, make sure the process holding the lock really is dead.)
   (Martin Pool, #397315)
 
-* Don't force openssh to use protocol=2, since that is now the default.
-  (Neil Martinsen-Burrell, #561061)
-
 * Fix signature of RemoteBzrDir.create_workingtree to match that of its
   superclass.  (Neil Martinsen-Burrell, Martin Pool, #524627)
 
@@ -122,6 +122,9 @@
 Documentation
 *************
 
+* Correct the documentation for setting up the smart server with Apache.
+  (Neil Martinsen-Burrell, #311518)
+
 * Provide more detailed help on the Launchpad plugin at "bzr help
   plugins/launchpad".  (Neil Martinsen-Burrell, #589379)
 

=== modified file 'doc/en/user-guide/http_smart_server.txt'
--- a/doc/en/user-guide/http_smart_server.txt	2010-10-01 23:09:27 +0000
+++ b/doc/en/user-guide/http_smart_server.txt	2010-10-05 03:31:50 +0000
@@ -47,7 +47,7 @@
         Options Indexes FollowSymLinks
         RewriteEngine On
         RewriteBase /code
-        RewriteRule ^(.*/|)\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
+        RewriteRule ^(.*/)?\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
     </Directory>
 
     # bzr-smart.fcgi isn't under the DocumentRoot, so Alias it into the URL
@@ -80,11 +80,11 @@
 Define the rewrite rules with mod_rewrite the same way as for FastCGI, except
 change::
 
-    RewriteRule ^(.*/|)\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
+    RewriteRule ^(.*/)?\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
 
 to::
 
-    RewriteRule ^(.*/|)\.bzr/smart$ /srv/example.com/scripts/bzr-smart.py
+    RewriteRule ^(.*/)?\.bzr/smart$ /srv/example.com/scripts/bzr-smart.py
 
 Like with mod_fastcgi, we also define how our script is to be handled::
 

=== modified file 'doc/ja/user-guide/http_smart_server.txt'
--- a/doc/ja/user-guide/http_smart_server.txt	2009-12-02 20:34:07 +0000
+++ b/doc/ja/user-guide/http_smart_server.txt	2010-10-05 03:31:50 +0000
@@ -44,7 +44,7 @@
         Options Indexes FollowSymLinks
         RewriteEngine On
         RewriteBase /code
-        RewriteRule ^(.*/|)\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
+        RewriteRule ^(.*/)?\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
     </Directory>
 
     # bzr-smart.fcgi???DocumentRoot?????????????????????????????????????????????????????????
@@ -74,11 +74,11 @@
 
 FastCGI??????????????????mod_rewrite???????????????????????????????????????????????????::
 
-    RewriteRule ^(.*/|)\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
+    RewriteRule ^(.*/)?\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
 
 ????????????????????????????????????::
 
-    RewriteRule ^(.*/|)\.bzr/smart$ /srv/example.com/scripts/bzr-smart.py
+    RewriteRule ^(.*/)?\.bzr/smart$ /srv/example.com/scripts/bzr-smart.py
 
 mod_fastcgi????????????????????????????????????????????????????????????????????????????????????::