Merge branch 'stable'

7 files changed, 29 insertions, 6 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 9cf031cf..e7411e11 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,10 @@ Stable versions are identifiable (since 1.2) through their even minor
 version number, like 1.2.x, 1.4.x, etc.  Odd minor version numbers
 are used for rolling-release git snapshots.
 
+2011-01-04: Version 1.4.1
+* Fixed crash when preview failed under some circumstances
+* Fixed graphical bug when pressing i
+
 2010-12-22: Version 1.4.0
 * Added option to use any external scripts for previews (see scope.sh)
 * Added key: zv to toggle the use of the external script
diff --git a/README b/README
index b410e2f1..fc576315 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Ranger v.1.4.0
+Ranger v.1.4.1
 ==============
 
 Ranger is a free console file manager that gives you greater flexibility
diff --git a/HACKING b/doc/HACKING
index dd384758..dd384758 100644
--- a/HACKING
+++ b/doc/HACKING
diff --git a/TODO b/doc/TODO
index 1577f97a..1577f97a 100644
--- a/TODO
+++ b/doc/TODO
diff --git a/doc/ranger.1 b/doc/ranger.1
index 2e4092f9..832c07d2 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -1,4 +1,4 @@
-.TH RANGER 1 ranger-1.4.0
+.TH RANGER 1 ranger-1.4.1
 .SH NAME
 ranger - visual file manager
 .\"-----------------------------------------
diff --git a/ranger/__init__.py b/ranger/__init__.py
index a5fa1643..8aa59b42 100644
--- a/ranger/__init__.py
+++ b/ranger/__init__.py
@@ -29,7 +29,7 @@ from ranger.core.main import main
 
 # Information
 __license__ = 'GPL3'
-__version__ = '1.4.0'
+__version__ = '1.4.1'
 __author__ = __maintainer__ = 'Roman Zimbelmann'
 __email__ = 'romanz@lavabit.com'
 
diff --git a/ranger/help/index.py b/ranger/help/index.py
index 9ade3098..a10a8406 100644
--- a/ranger/help/index.py
+++ b/ranger/help/index.py
@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-                       Ranger - main help file
+                    ranger %s - main help file
                                                                      k
     Move around:  Use the cursor keys, or "h" to go left,          h   l
                   "j" to go down, "k" to go up, "l" to go right.     j
@@ -30,7 +30,23 @@
 
 
 ==============================================================================
-0.1. General information
+0.1. About ranger
+
+Ranger is a free console file manager that gives you greater flexibility
+and a good overview of your files without having to leave your *nix console.
+It visualizes the directory tree in two dimensions: the directory hierarchy
+on one, lists of files on the other, with a preview to the right so you know
+where you'll be going.
+
+The default keys are similar to those of Vim, Emacs and Midnight Commander,
+though Ranger is easily controllable with just the arrow keys or the mouse.
+
+The program is written in Python (2.6 or 3.1) and uses curses for the
+text-based user interface.
+
+
+==============================================================================
+0.2. About these help pages
 
 Annotations like |1?| indicate that the topic is explained in more
 detail in chapter 1. You can type 1? to view it.
@@ -38,7 +54,7 @@ You can type 16? to open chapter 1, paragraph 6.
 
 
 ==============================================================================
-0.2. Copying
+0.3. Copying
 
 Copyright (C) 2009, 2010  Roman Zimbelmann <romanz@lavabit.com>
 
@@ -58,4 +74,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ==============================================================================
 """
+
+import ranger
+__doc__ %= ranger.__version__
 # vim:tw=78:sw=4:sts=8:ts=8:ft=help