Beware of low-flying butterfliesv1.2.0

5 files changed, 25 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 3b2ee97a..f1417fee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,21 @@
+This log only documents changes between stable versions.
+
+From 1.2 on, odd minor version numbers (1.3, 1.5, 1.7,..) are assigned to the
+fresh git snapshots while stable versions will have even minor numbers.
+
+1.1.2 -> 1.2:
+* !!! Changed the default configuration directory to ~/.config/ranger !!!
+* Removed "Console Modes", each old mode is now a simple command
+* Disabled file previews by default if ranger is used by root
+* Allow to jump to specific help sections by typing two numbers, e.g. 13?
+* Added keys: da, dr, ya, yr for adding and removing files from copy buffer
+* Added keys: gl and gL to resolve links, see 11?
+* Added key: pL to create a relative symlink
+* Added %<LETTER> and %<N><LETTER> macros for the console, see 33?
+* Fixed ansi codes for colors in the pager
+* Use the file ~/.mime.types for mime type detection
+* Several clean-ups and fixes
+
 1.1.1 -> 1.1.2:
 * Fix crash when using scrollwheel to scroll down in some cases
 * The command "ranger dir1 dir2 ..." opens multiple directories in tabs
diff --git a/README b/README
index 4fd9876f..85b7e857 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Ranger v.1.1.2
+Ranger v.1.2.0
 ==============
 
 Ranger is a free console file manager that gives you greater flexibility
diff --git a/doc/ranger.1 b/doc/ranger.1
index fab42496..d81db6d4 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -1,4 +1,4 @@
-.TH RANGER 1 ranger-1.1.2
+.TH RANGER 1 ranger-1.2.0
 .SH NAME
 ranger - visual file manager
 .\"-----------------------------------------
diff --git a/ranger/__init__.py b/ranger/__init__.py
index 57e0e5a2..c2a695c9 100644
--- a/ranger/__init__.py
+++ b/ranger/__init__.py
@@ -20,7 +20,7 @@ import sys
 from ranger.ext.openstruct import OpenStruct
 
 __license__ = 'GPL3'
-__version__ = '1.1.2'
+__version__ = '1.2.0'
 __credits__ = 'Roman Zimbelmann'
 __author__ = 'Roman Zimbelmann'
 __maintainer__ = 'Roman Zimbelmann'
diff --git a/ranger/__main__.py b/ranger/__main__.py
index 7db82a57..0ded8c95 100644
--- a/ranger/__main__.py
+++ b/ranger/__main__.py
@@ -35,7 +35,10 @@ def parse_arguments():
 	if '.' in minor_version:
 		minor_version = minor_version[:minor_version.find('.')]
 	version_tag = ' (stable)' if int(minor_version) % 2 == 0 else ' (testing)'
-	version_string = 'ranger ' + __version__ + version_tag
+	if __version__.endswith('.0'):
+		version_string = 'ranger ' + __version__[:-2] + version_tag
+	else:
+		version_string = 'ranger ' + __version__ + version_tag
 
 	parser = OptionParser(usage=USAGE, version=version_string)