# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2016-11-17 14:57:15
# Node ID 754e16c04caa6bcf3b7174bbccca120acc44cdba
# Parent  d415536356cf8ed1d1da7fd2252db3cd0037e1c8

docs: fix apache as subdirectory instructions.

- fix HTTP flag
- fix badly stated force_https usage together with proxy-prefix

diff --git a/configs/development.ini b/configs/development.ini
--- a/configs/development.ini
+++ b/configs/development.ini
@@ -91,7 +91,7 @@ asyncore_use_poll = true
 #timeout = 21600
 
 
-## prefix middleware for RhodeCode, disables force_https flag.
+## prefix middleware for RhodeCode.
 ## recommended when using proxy setup.
 ## allows to set RhodeCode under a prefix in server.
 ## eg https://server.com/<prefix>. Enable `filter-with =` option below as well.
diff --git a/configs/production.ini b/configs/production.ini
--- a/configs/production.ini
+++ b/configs/production.ini
@@ -91,7 +91,7 @@ max_requests_jitter = 30
 timeout = 21600
 
 
-## prefix middleware for RhodeCode, disables force_https flag.
+## prefix middleware for RhodeCode.
 ## recommended when using proxy setup.
 ## allows to set RhodeCode under a prefix in server.
 ## eg https://server.com/custom_prefix. Enable `filter-with =` option below as well.
diff --git a/docs/admin/apache-subdirectory.rst b/docs/admin/apache-subdirectory.rst
--- a/docs/admin/apache-subdirectory.rst
+++ b/docs/admin/apache-subdirectory.rst
@@ -7,10 +7,11 @@ Use the following example to configure A
 
 .. code-block:: apache
 
-    <Location /<someprefix> > # Change <someprefix> into your chosen prefix
-      ProxyPass http://127.0.0.1:5000/<someprefix>
-      ProxyPassReverse http://127.0.0.1:5000/<someprefix>
-      SetEnvIf X-Url-Scheme https HTTPS=1
+    <Location /<someprefix>/ # Change <someprefix> into your chosen prefix
+      ProxyPreserveHost On
+      ProxyPass "http://127.0.0.1:5000/"
+      ProxyPassReverse "http://127.0.0.1:5000/"
+      Header set X-Url-Scheme https env=HTTPS
     </Location>
 
 In addition to the regular Apache setup you will need to add the following
diff --git a/rhodecode/tests/rhodecode.ini b/rhodecode/tests/rhodecode.ini
--- a/rhodecode/tests/rhodecode.ini
+++ b/rhodecode/tests/rhodecode.ini
@@ -150,7 +150,7 @@ asyncore_use_poll = true
 ## how many workers should be spawned at a time
 #cheaper-step = 1
 
-## prefix middleware for RhodeCode, disables force_https flag.
+## prefix middleware for RhodeCode.
 ## recommended when using proxy setup.
 ## allows to set RhodeCode under a prefix in server.
 ## eg https://server.com/<prefix>. Enable `filter-with =` option below as well.