Bazaar

Merge lp:~nmb/bzr/311518-apache-doc-rewrite into lp:bzr

  1. 311518-apache-doc-rewrite
  2. Merge into bzr.dev
Proposed by Neil Martinsen-Burrell
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merged at revision: 5479
Proposed branch: lp:~nmb/bzr/311518-apache-doc-rewrite
Merge into: lp:bzr
Diff against target: 66 lines (+9/-6)
3 files modified
NEWS (+3/-0)
doc/en/user-guide/http_smart_server.txt (+3/-3)
doc/ja/user-guide/http_smart_server.txt (+3/-3)
To merge this branch: bzr merge lp:~nmb/bzr/311518-apache-doc-rewrite
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Martin Pool Needs Information
Review via email: mp+37553@code.launchpad.net

Commit message

Fix the documentation on using the smart server with Apache

Description of the change

This fixes the rewrite rules given in the User Guide in the section on using Apache with the smart server.

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

That looks pretty good, though I'd still like to understand why this change is actually needed? I guess because some Apaches don't understand (ab|)

review: Needs Information
Revision history for this message
Neil Martinsen-Burrell (nmb) wrote :

I believe that is the case, but I don't think that the bug report fully specified why (string|) didn't work.

Revision history for this message
Vincent Ladeuil (vila) wrote :

Using '?' seems clearer (and cleaner) than '|)' to me anyway

review: Approve
Revision history for this message
Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2010-10-01 08:49:39 +0000
3+++ NEWS 2010-10-05 03:36:47 +0000
4@@ -54,6 +54,9 @@
5 Documentation
6 *************
7
8+* Correct the documentation for setting up the smart server with Apache.
9+ (Neil Martinsen-Burrell, #311518)
10+
11 API Changes
12 ***********
13
14
15=== modified file 'doc/en/user-guide/http_smart_server.txt'
16--- doc/en/user-guide/http_smart_server.txt 2010-10-01 23:09:27 +0000
17+++ doc/en/user-guide/http_smart_server.txt 2010-10-05 03:36:47 +0000
18@@ -47,7 +47,7 @@
19 Options Indexes FollowSymLinks
20 RewriteEngine On
21 RewriteBase /code
22- RewriteRule ^(.*/|)\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
23+ RewriteRule ^(.*/)?\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
24 </Directory>
25
26 # bzr-smart.fcgi isn't under the DocumentRoot, so Alias it into the URL
27@@ -80,11 +80,11 @@
28 Define the rewrite rules with mod_rewrite the same way as for FastCGI, except
29 change::
30
31- RewriteRule ^(.*/|)\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
32+ RewriteRule ^(.*/)?\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
33
34 to::
35
36- RewriteRule ^(.*/|)\.bzr/smart$ /srv/example.com/scripts/bzr-smart.py
37+ RewriteRule ^(.*/)?\.bzr/smart$ /srv/example.com/scripts/bzr-smart.py
38
39 Like with mod_fastcgi, we also define how our script is to be handled::
40
41
42=== modified file 'doc/ja/user-guide/http_smart_server.txt'
43--- doc/ja/user-guide/http_smart_server.txt 2009-12-02 20:34:07 +0000
44+++ doc/ja/user-guide/http_smart_server.txt 2010-10-05 03:36:47 +0000
45@@ -44,7 +44,7 @@
46 Options Indexes FollowSymLinks
47 RewriteEngine On
48 RewriteBase /code
49- RewriteRule ^(.*/|)\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
50+ RewriteRule ^(.*/)?\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
51 </Directory>
52
53 # bzr-smart.fcgiはDocumentRootの元に存在しないので、実行されるように
54@@ -74,11 +74,11 @@
55
56 FastCGIと同じ方法でmod_rewriteを用いて書き換えルールを定義します::
57
58- RewriteRule ^(.*/|)\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
59+ RewriteRule ^(.*/)?\.bzr/smart$ /srv/example.com/scripts/bzr-smart.fcgi
60
61 変更は次のようになります::
62
63- RewriteRule ^(.*/|)\.bzr/smart$ /srv/example.com/scripts/bzr-smart.py
64+ RewriteRule ^(.*/)?\.bzr/smart$ /srv/example.com/scripts/bzr-smart.py
65
66 mod_fastcgiのように、スクリプトがどのように扱われるのかも定義します::
67