Correct README file

NEWS

@@ -2,8 +2,13 @@
 Glances Version 2.x
 ==============================================================================
 
+<<<<<<< HEAD
 Version 2.3
 ===========
+=======
+Version 2.2.1
+=============
+>>>>>>> f2096d40c3086c062f882d6f115e9dd08ae26b62
 
 Enhancements and news features:
 

docs/glances-doc.html

@@ -123,7 +123,7 @@ td.option-group {
 <div class="document" id="glances">
 <h1 class="title">Glances</h1>
 
-<p>This manual describes <em>Glances</em> version 2.2.</p>
+<p>This manual describes <em>Glances</em> version 2.2.1.</p>
 <p>Copyright © 2012-2014 Nicolas Hennion &lt;<a class="reference external" href="mailto:nicolas&#64;nicolargo.com">nicolas&#64;nicolargo.com</a>&gt;</p>
 <p>December 2014</p>
 <div class="contents topic" id="table-of-contents">

docs/glances-doc.rst

@@ -2,7 +2,7 @@
 Glances
 =======
 
-This manual describes *Glances* version 2.2.
+This manual describes *Glances* version 2.2.1.
 
 Copyright © 2011-2015 Nicolas Hennion <nicolas@nicolargo.com>
 

glances/__init__.py

@@ -20,7 +20,7 @@
 """Init the Glances software."""
 
 __appname__ = 'glances'
-__version__ = '2.3_BETA'
+__version__ = '2.2.1'
 __author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
 __license__ = 'LGPL'
 

man/glances.1

@@ -1,4 +1,4 @@
-.TH glances 1  "December, 2014" "version 2.2" "USER COMMANDS"
+.TH glances 1  "December, 2014" "version 2.2.1" "USER COMMANDS"
 .SH NAME
 glances \- A cross-platform curses-based system monitoring tool
 .SH SYNOPSIS

setup.py

@@ -52,13 +52,13 @@ def get_requires():
 
 setup(
     name='Glances',
-    version='2.2',
+    version='2.2.1',
     description="A cross-platform curses-based monitoring tool",
     long_description=open('README.rst').read(),
     author='Nicolas Hennion',
     author_email='nicolas@nicolargo.com',
     url='https://github.com/nicolargo/glances',
-    # download_url='https://s3.amazonaws.com/glances/glances-2.2.tar.gz',
+    # download_url='https://s3.amazonaws.com/glances/glances-2.2.1.tar.gz',
     license="LGPL",
     keywords="cli curses monitoring system",
     install_requires=get_requires(),