# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2011-09-24 21:21:43
# Node ID dc16211e7292f769a682b6ba994ab4ebbe1e05d1
# Parent  a63fd105f2209580804fbf9b3b9a4af67c1a60ff

Updated  docs and contributors

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -7,4 +7,8 @@ List of contributors to RhodeCode projec
     Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
     Dmitri Kuznetsov
     Jared Bunting <jared.bunting@peachjean.com>
-    Steve Romanow <slestak989@gmail.com>
\ No newline at end of file
+    Steve Romanow <slestak989@gmail.com>
+    Augosto Hermann <augusto.herrmann@planejamento.gov.br>    
+    Ankit Solanki <ankit.solanki@gmail.com>    
+    Liad Shani <liadff@gmail.com>
+    
diff --git a/README.rst b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -25,13 +25,13 @@ The default access is anonymous but you 
 using the following credentials:
 
 - username: demo
-- password: demo
+- password: demo12
 
 Source code
 -----------
 
 The latest sources can be obtained from official RhodeCode instance
-https://hg.rhodecode.org 
+https://secure.rhodecode.org 
 
 
 MIRRORS:
@@ -63,8 +63,8 @@ RhodeCode Features
 - Repository groups let you group repos and manage them easier.
 - Users can fork other users repo. RhodeCode have also compare view to see
   combined changeset for all changeset made within single push.
-- Build in commit-api let's you edit and commit files right from RhodeCode
-  interface using simple editor.
+- Build in commit-api let's you add, edit and commit files right from RhodeCode
+  interface using simple editor or upload form for binaries.
 - Mako templates let's you customize the look and feel of the application.
 - Beautiful diffs, annotations and source code browsing all colored by pygments. 
   Raw diffs are made in git-diff format, including git_ binary-patches
@@ -94,7 +94,9 @@ RhodeCode Features
 Incoming / Plans
 ----------------
 
-- Finer granular permissions (per branch or subrepo)
+- Finer granular permissions per branch, repo group or subrepo
+- pull requests and web based merges
+- notification and message system 
 - SSH based authentication with server side key management
 - Code review (probably based on hg-review)
 - Full git_ support, with push/pull server (currently in beta tests)
diff --git a/docs/changelog.rst b/docs/changelog.rst
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -38,7 +38,8 @@ news
   repository, and manually updated (via pull) from admin panel
 - beta git support - push/pull server + basic view for git repos
 - added followers page and forks page
-- server side file edition with commits powered by codemirror
+- server side file creation (with binary file upload interface) 
+  and edition with commits powered by codemirror 
 - #111 file browser file finder, quick lookup files on whole file tree 
 - added quick login sliding menu into main page
 - changelog uses lazy loading of affected files details, in some scenarios