merge with betav1.3.3

12 files changed, 47 insertions, 9 deletions

diff --git a/docs/api/api.rst b/docs/api/api.rst
index ad34884d..a92f2a0c 100644
--- a/docs/api/api.rst
+++ b/docs/api/api.rst
@@ -1,6 +1,6 @@
 .. _api:
 
-
+===
 API
 ===
 
diff --git a/docs/api/models.rst b/docs/api/models.rst
index 64b35478..ac68bad0 100644
--- a/docs/api/models.rst
+++ b/docs/api/models.rst
@@ -1,5 +1,6 @@
 .. _models:
 
+========================
 The :mod:`models` Module
 ========================
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 181098e0..4c5d52e1 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,9 +1,36 @@
 .. _changelog:
 
+=========
 Changelog
 =========
 
 
+
+1.3.3 (**2012-03-02**)
+----------------------
+
+news
+++++
+
+
+fixes
++++++
+
+- fixed some python2.5 compatibility issues 
+- fixed issues with removed repos was accidentally added as groups, after
+  full rescan of paths
+- fixes #376 Cannot edit user (using container auth)
+- fixes #378 Invalid image urls on changeset screen with proxy-prefix 
+  configuration
+- fixed initial sorting of repos inside repo group
+- fixes issue when user tried to resubmit same permission into user/user_groups
+- bumped beaker version that fixes #375 leap error bug
+- fixed raw_changeset for git. It was generated with hg patch headers
+- fixed vcs issue with last_changeset for filenodes
+- fixed missing commit after hook delete
+- fixed #372 issues with git operation detection that caused a security issue 
+  for git repos
+
 1.3.2 (**2012-02-28**)
 ----------------------
 
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 9b317804..9f1b7e6c 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -1,5 +1,6 @@
 .. _contributing:
 
+=========================
 Contributing to RhodeCode
 =========================
 
@@ -14,16 +15,19 @@ fix might be already fixed there and i try to merge all fixes from beta into
 stable, and not the other way. Finally, when you are finished making a change, 
 please send me a pull request.
 
-To run RhodeCode in a development version you always need to install the tip
-version of RhodeCode and the VCS library.
+To run RhodeCode in a development version you always need to install the latest
+required libs from `requires.txt` file.
 
-after downloading RhodeCode make sure you run::
+after downloading/pulling RhodeCode make sure you run::
 
     python setup.py develop
 
-command to install all required packages, and prepare development enviroment
+command to install/verify all required packages, and prepare development 
+enviroment.
 
 
+After finishing your changes make sure all tests passes ok. You can run
+the testsuite running nosetest from the project root.
 
 | Thank you for any contributions!
 |  Marcin
diff --git a/docs/installation.rst b/docs/installation.rst
index 08bfa43e..50b9ce8b 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -1,5 +1,6 @@
 .. _installation:
 
+============
 Installation
 ============
 
diff --git a/docs/setup.rst b/docs/setup.rst
index e833ab3b..8021c5bc 100755
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -1,5 +1,6 @@
 .. _setup:
 
+=====
 Setup
 =====
 
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index 338c3386..be4530bb 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -1,5 +1,6 @@
 .. _upgrade:
 
+=======
 Upgrade
 =======
 
@@ -25,11 +26,11 @@ Then make sure you run the following command from the installation directory::
  
 This will display any changes made by the new version of RhodeCode to your
 current configuration. It will try to perform an automerge. It's always better
-to make a backup of your configuration file before hand and recheck the 
+to make a backup of your configuration file before hand and re check the 
 content after the automerge.
 
 .. note::
-   Please always make sure your .ini files are upto date. Often errors are
+   Please always make sure your .ini files are up to date. Often errors are
    caused by missing params added in new versions.
 
 
diff --git a/docs/usage/backup.rst b/docs/usage/backup.rst
index ac72094a..c7d6d5ff 100644
--- a/docs/usage/backup.rst
+++ b/docs/usage/backup.rst
@@ -1,5 +1,6 @@
 .. _backup:
 
+====================
 Backing up RhodeCode
 ====================
 
diff --git a/docs/usage/general.rst b/docs/usage/general.rst
index 18f6b4cd..0ab43e02 100644
--- a/docs/usage/general.rst
+++ b/docs/usage/general.rst
@@ -1,5 +1,6 @@
 .. _general:
 
+=======================
 General RhodeCode usage
 =======================
 
diff --git a/docs/usage/git_support.rst b/docs/usage/git_support.rst
index 7526163c..af523e85 100644
--- a/docs/usage/git_support.rst
+++ b/docs/usage/git_support.rst
@@ -1,5 +1,6 @@
 .. _git_support:
 
+===========
 GIT support
 ===========
 
diff --git a/docs/usage/statistics.rst b/docs/usage/statistics.rst
index 77b55c6b..409f2465 100644
--- a/docs/usage/statistics.rst
+++ b/docs/usage/statistics.rst
@@ -1,6 +1,6 @@
 .. _statistics:
 
-
+==========
 Statistics
 ==========
 
diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py
index 35c016fc..4fec3c01 100644
--- a/rhodecode/__init__.py
+++ b/rhodecode/__init__.py
@@ -26,7 +26,7 @@
 import sys
 import platform
 
-VERSION = (1, 3, 2)
+VERSION = (1, 3, 3)
 __version__ = '.'.join((str(each) for each in VERSION[:4]))
 __dbversion__ = 5  # defines current db version for migrations
 __platform__ = platform.system()