Merge branch 'master' into newkey

Conflicts:
	ranger/api/keys.py
	ranger/container/commandlist.py
	ranger/core/actions.py
	ranger/defaults/keys.py
	ranger/gui/ui.py
	ranger/gui/widgets/browserview.py

1 files changed, 33 insertions, 21 deletions

diff --git a/README b/README
index 88d9523f..b97b5ed7 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Ranger v.1.0.3
+Ranger v.1.0.4
 ==============
 
 Ranger
@@ -6,23 +6,28 @@ Ranger
    A keeper, guardian, or soldier who ranges over a region
    to protect the area or enforce the law.
 
-This file browser gives you the ability to swiftly move around
-and get a broad overview of your forest of directory trees.
+This is the filemanager Chuck Norris the Texas Ranger would use
+if he had a computer with a unix-like operating system.  (He doesn't
+trust computers though and prefers to do the calculations himself.)
 
-Rangers default hotkeys make it intuitive for users of the popular
-text-editor VIM, but it is fully customizable.
+After all, as a professional ranger, he needs a broad overview of his
+territory, and the multi-column display of ranger provides just that,
+rather than restricting you to the current directory only.
+You can preview the content of the selected file or directory, copy or move
+files around with the VIM-like commands dd and yy, execute predefined
+applications when opening a file, etc...
 
-The program is written in Python since version 1.0.0 and uses
-ncurses for the (completely text based) user interface.
+Everything is fully customizable and written in Python (2.6 and 3.1
+compatible) using curses for the text-based user interface.
 
 
 About
 -----
 
-* Author:          hut
-* Email:           hut@lavabit.com
-* Git repo:        http://repo.or.cz/w/ranger.git
-* Version:         1.0.3
+* Author:          Roman Zimbelmann
+* Email:           romanz@lavabit.com
+* Git repo:        http://git.savannah.gnu.org/cgit/ranger.git
+* Version:         1.0.4
 
 
 Features
@@ -42,32 +47,39 @@ Features
 Dependencies
 ------------
 
-* A Unix-like OS        (Linux, BSD, Mac OS, ...)
+* A Unix-like Operating System
 * Python 2.6 or 3.1
-* Python curses module
+* Python curses module  (often but not always included with Python)
 
 
 Bugs and Feature Requests
 -------------------------
 
-Report bugs and feature requests on the bug tracker of
-the ranger repository on GitHub:
-    http://github.com/hut/ranger/issues
+Report bugs and feature requests on savannah:
+    https://savannah.nongnu.org/bugs/?func=additem&group=ranger
 
-Alternatively you can send an email to hut@lavabit.com.
+Alternatively you can send an email to romanz@lavabit.com.
 
 Please include as much relevant information as possible.
 Using ranger with the --debug option will abort the program and
-print tracebacks in certain cases.
+print tracebacks rather than a red message in the statusbar.
+If this applies to you, please include such a traceback in your report.
 
 
 Getting Started
 ---------------
 
-At first, it's a good idea to create a symlink in your bin dir:
-    sudo ln -s /path/to/ranger.py /usr/bin/ranger
+If you just want to check out ranger without installing it, type
 
-Now type in ranger to start it.
+    ./ranger.py --clean
+
+in the top directory of ranger.  By using the --clean switch, it will
+leave no trace on your system whatsoever.
+
+To properly install it, follow the instructions in the INSTALL file,
+then type:
+
+    ranger
 
 You should see 4 columns.  The third is the directory where you are at
 the moment.  To the left, there are the directories above the current