merge with betav1.5.0

5 files changed, 109 insertions, 6 deletions

diff --git a/docs/changelog.rst b/docs/changelog.rst
index a8645d95..a8797185 100755
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,71 @@
 Changelog
 =========
 
+
+1.5.0 (**2012-12-12**)
+----------------------
+
+news
+++++
+
+- new rewritten from scratch diff engine. 10x faster in edge cases. Handling
+  of file renames, copies, change flags and binary files
+- added lightweight dashboard option. ref #500. New version of dashboard
+  page that doesn't use any VCS data and is super fast to render. Recommended
+  for large amount of repositories.
+- implements #648 write Script for updating last modification time for
+  lightweight dashboard
+- implemented compare engine for git repositories.
+- LDAP failover, option to specify multiple servers
+- added Errormator and Sentry support for monitoring RhodeCode
+- implemented #628: Pass server URL to rc-extensions hooks
+- new tooltip implementation - added lazy loading of changesets from journal
+  pages. This can significantly improve speed of rendering the page
+- implements #632,added branch/tag/bookmarks info into feeds
+  added changeset link to body of message
+- implemented #638 permissions overview to groups
+- implements #636, lazy loading of history and authors to speed up source
+  pages rendering
+- implemented #647, option to pass list of default encoding used to 
+  encode to/decode from unicode
+- added caching layer into RSS/ATOM feeds.
+- basic implementation of cherry picking changesets for pull request, ref #575
+- implemented #661 Add option to include diff in RSS feed
+- implemented file history page for showing detailed changelog for a given file
+- implemented #663 Admin/permission: specify default repogroup perms
+- implemented #379 defaults settings page for creation of repositories, locking
+  statistics, downloads, repository type
+- implemented #210 filtering of admin journal based on Whoosh Query language
+- added parents/children links in changeset viewref #650
+
+fixes
++++++
+
+- fixed git version checker
+- #586 patched basic auth handler to fix issues with git behind proxy
+- #589 search urlgenerator didn't properly escape special characters
+- fixed issue #614 Include repo name in delete confirmation dialog
+- fixed #623: Lang meta-tag doesn't work with C#/C++
+- fixes #612 Double quotes to Single quotes result in bad html in diff
+- fixes #630 git statistics do too much work making them slow.
+- fixes #625 Git-Tags are not displayed in Shortlog
+- fix for issue #602, enforce str when setting mercurial UI object. 
+  When this is used together with mercurial internal translation system
+  it can lead to UnicodeDecodeErrors
+- fixes #645 Fix git handler when doing delete remote branch
+- implements #649 added two seperate method for author and commiter to VCS
+  changeset class switch author for git backed to be the real author not commiter
+- fix issue #504 RhodeCode is showing different versions of README on
+  different summary page loads
+- implemented #658 Changing username in LDAP-Mode should not be allowed.
+- fixes #652 switch to generator approach when doing file annotation to prevent
+  huge memory consumption 
+- fixes #666 move lockkey path location to cache_dir to ensure this path is
+  always writable for rhodecode server
+- many more small fixes and improvements
+- fixed issues with recursive scans on removed repositories that could take
+  long time on instance start
+
 1.4.4 (**2012-10-08**)
 ----------------------
 
diff --git a/docs/index.rst b/docs/index.rst
index e56e2bbd..b2b293ef 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -25,6 +25,7 @@ Users Guide
    usage/locking
    usage/statistics
    usage/backup
+   usage/subrepos
    usage/debugging
    usage/troubleshooting
 
diff --git a/docs/setup.rst b/docs/setup.rst
index 74324022..24e9fa56 100755
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -204,7 +204,8 @@ Enable LDAP : required
 .. _ldap_host:
 
 Host : required
-    LDAP server hostname or IP address.
+    LDAP server hostname or IP address. Can be also a comma separated
+    list of servers to support LDAP fail-over.
 
 .. _Port:
 
diff --git a/docs/usage/git_support.rst b/docs/usage/git_support.rst
index 19193a75..c40d436e 100644
--- a/docs/usage/git_support.rst
+++ b/docs/usage/git_support.rst
@@ -8,16 +8,15 @@ GIT support
 Git support in RhodeCode 1.3 was enabled by default. You need to have a git
 client installed on the machine to make git fully work.
 
-Although There are some limitations on git usage.
+Although There is one limitation on git usage.
 
-- hooks that are executed on pull/push are not *real* hooks, they are 
-  just emulating the behavior, and are executed **BEFORE** action takes place.
-- large pushes needs http server with chunked encoding support.
+- large pushes requires a http server with chunked encoding support.
  
 if you plan to use git you need to run RhodeCode with some
 http server that supports chunked encoding which git http protocol uses, 
 i recommend using waitress_ or gunicorn_ (linux only) for `paste` wsgi app 
-replacement.
+replacement. Starting from version 1.4 waitress_ is the default wsgi server
+used in RhodeCode.
 
 To use, simply change change the following in the .ini file::
 
diff --git a/docs/usage/subrepos.rst b/docs/usage/subrepos.rst
new file mode 100644
index 00000000..83ae5b3b
--- /dev/null
+++ b/docs/usage/subrepos.rst
@@ -0,0 +1,37 @@
+.. _subrepos:
+
+=============================================
+working with RhodeCode and mercurial subrepos
+=============================================
+
+example usage of Subrepos with RhodeCode::
+    
+    ## init a simple repo
+    hg init repo1                                                                                                                                                                                         
+    cd repo1
+    echo "file1" > file1
+    hg add file1 
+    hg ci --message "initial file 1"
+        
+    #clone subrepo we want to add
+    hg clone http://rc.local/subrepo
+
+    ## use path like url to existing repo in RhodeCode
+    echo "subrepo = http://rc.local/subrepo" > .hgsub
+
+    hg add .hgsub
+    hg ci --message "added remote subrepo"
+
+    
+
+In file list of repo1 you will see a connected subrepo at revision it was
+during cloning.
+Clicking in subrepos link should send you to proper repository in RhodeCode
+
+cloning repo1 will also clone attached subrepository.
+
+Next we can edit the subrepo data, and push back to RhodeCode. This will update
+both of repositories.
+
+see http://mercurial.aragost.com/kick-start/en/subrepositories/ for more
+information about subrepositories   
\ No newline at end of file