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, 29 insertions, 4 deletions

diff --git a/INSTALL b/INSTALL
index 4635478b..d14d3891 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,23 @@
-You can run ranger without installing by simply starting the executable
-file ranger.py in the top directory of this package.
+Installing
+==========
 
+You don't need to install anything.
 
-To install ranger, follow this instructions:
+You can run ranger by simply starting the executable file ranger.py
+in the top directory of this package.
+Use the --clean option and it will leave no trace whatsoever on your system.
+
+
+If you insist on conventionally install it, use the package manager
+of your operating system.  If there is no package or it is out of date,
+you can also follow these instructions:
+
+
+Step by step
+============
+
+(This is all done automagically if you type `sudo make install',
+though you might want to read the Makefile first)
 
 0. Make sure you have a recent version of python, including the
    curses module, which is the case if this shell command prints no errors:
@@ -27,4 +42,14 @@ To install ranger, follow this instructions:
    alias rng="source ranger ranger"
 
    (Unfortunately this feature is shell dependent.  It has been
-   successfully tested with BASH only.)
+   successfully tested with BASH and ZSH only.)
+
+
+Uninstalling
+============
+
+Use your package manager to uninstall ranger.  If you manually installed
+it, revert the steps described above.
+
+Ranger can also create a configuration directory at ~/.ranger which
+you might want to remove as well.