Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Tue, 09 Mar 2010 19:59:44 +0100
branchstable
changeset 4857 a9caa76ba2c8
parent 4856 c8f887a5b2fa (current diff)
parent 4852 1693d6174251 (diff)
child 4858 8c886610e5ee
merge
--- a/doc/book/en/admin/instance-config.rst	Tue Mar 09 19:58:30 2010 +0100
+++ b/doc/book/en/admin/instance-config.rst	Tue Mar 09 19:59:44 2010 +0100
@@ -49,13 +49,13 @@
    and `https://localhost/demo` and actually running on port 8080, it
    takes to the http:::
 
-     RewriteCond %(REQUEST_URI) ^/demo
+     RewriteCond %{REQUEST_URI} ^/demo
      RewriteRule ^/demo$ /demo/
      RewriteRule ^/demo/(.*) http://127.0.0.1:8080/$1 [L,P]
 
    and for the https:::
 
-     RewriteCond %(REQUEST_URI) ^/ demo
+     RewriteCond %{REQUEST_URI} ^/ demo
      RewriteRule ^/demo$/demo/
      RewriteRule ^/demo/(.*) http://127.0.0.1:8080/https/$1 [L,P]
 
@@ -63,7 +63,7 @@
    and we will file in the all-in-one.conf of the instance:::
 
      base-url = http://localhost/demo
-     https-url = `https://localhost/demo`
+     https-url = https://localhost/demo
 
 Setting up the web client
 -------------------------
cubicweb