diff --git a/docs/changelog.rst b/docs/changelog.rst
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,13 +4,13 @@ Changelog
=========
1.2.0 (**2011-XX-XX**)
-----------------------
+======================
:status: in-progress
:branch: beta
news
-++++
+----
- implemented #89 Can setup google analytics code from settings menu
- implemented #91 added nicer looking archive urls
@@ -21,7 +21,7 @@ news
line
fixes
-++++
+-----
- fixed file browser bug, when switching into given form revision the url was
not changing
@@ -29,17 +29,17 @@ fixes
1.1.1 (**2011-01-06**)
-----------------------
+======================
news
-++++
+----
- added force https option into ini files for easier https usage (no need to
set server headers with this options)
- small css updates
fixes
-++++
+-----
- fixed #96 redirect loop on files view on repositories without changesets
- fixed #97 unicode string passed into server header in special cases (mod_wsgi)
@@ -48,10 +48,10 @@ fixes
- fixed #92 whoosh indexer is more error proof
1.1.0 (**2010-12-18**)
-----------------------
+======================
news
-++++
+----
- rewrite of internals for vcs >=0.1.10
- uses mercurial 1.7 with dotencode disabled for maintaining compatibility
@@ -76,7 +76,7 @@ news
- other than sqlite database backends can be used
fixes
-+++++
+-----
- fixes #61 forked repo was showing only after cache expired
- fixes #76 no confirmation on user deletes
@@ -96,16 +96,16 @@ fixes
1.0.2 (**2010-11-12**)
-----------------------
+======================
news
-++++
+----
- tested under python2.7
- bumped sqlalchemy and celery versions
fixes
-+++++
+-----
- fixed #59 missing graph.js
- fixed repo_size crash when repository had broken symlinks
@@ -113,15 +113,15 @@ fixes
1.0.1 (**2010-11-10**)
-----------------------
+======================
news
-++++
+----
- small css updated
fixes
-+++++
+-----
- fixed #53 python2.5 incompatible enumerate calls
- fixed #52 disable mercurial extension for web
@@ -129,7 +129,7 @@ fixes
1.0.0 (**2010-11-02**)
-----------------------
+======================
- security bugfix simplehg wasn't checking for permissions on commands
other than pull or push.
@@ -139,7 +139,7 @@ 1.0.0 (**2010-11-02**)
- permissions cached queries
1.0.0rc4 (**2010-10-12**)
---------------------------
+==========================
- fixed python2.5 missing simplejson imports (thanks to Jens Bäckman)
- removed cache_manager settings from sqlalchemy meta
@@ -149,12 +149,12 @@ 1.0.0rc4 (**2010-10-12**)
1.0.0rc3 (**2010-10-11**)
--------------------------
+=========================
- fixed i18n during installation.
1.0.0rc2 (**2010-10-11**)
--------------------------
+=========================
- Disabled dirsize in file browser, it's causing nasty bug when dir renames
occure. After vcs is fixed it'll be put back again.
diff --git a/docs/setup.rst b/docs/setup.rst
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -256,27 +256,27 @@ Apache virtual host example
Sample config for apache using proxy::
-
- ServerName hg.myserver.com
- ServerAlias hg.myserver.com
-
-
- Order allow,deny
- Allow from all
-
-
- #important !
- #Directive to properly generate url (clone url) for pylons
- ProxyPreserveHost On
-
- #rhodecode instance
- ProxyPass / http://127.0.0.1:5000/
- ProxyPassReverse / http://127.0.0.1:5000/
-
- #to enable https use line below
- #SetEnvIf X-Url-Scheme https HTTPS=1
-
-
+
+ ServerName hg.myserver.com
+ ServerAlias hg.myserver.com
+
+
+ Order allow,deny
+ Allow from all
+
+
+ #important !
+ #Directive to properly generate url (clone url) for pylons
+ ProxyPreserveHost On
+
+ #rhodecode instance
+ ProxyPass / http://127.0.0.1:5000/
+ ProxyPassReverse / http://127.0.0.1:5000/
+
+ #to enable https use line below
+ #SetEnvIf X-Url-Scheme https HTTPS=1
+
+
Additional tutorial