diff --git a/NEWS b/NEWS
index 150c2067..ecac84e6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,46 @@
+==============================================================================
+Glances Version 2.x
+==============================================================================
+
 Version 2.0
 ===========
 
+    Glances v2.0 is not a simple upgrade of the version 1.x but a complete code refactoring.
+    Based on a plugins system, it aims at providing an easy way to add news features.
+    - Core defines the basics and commons functions. 
+    - all stats are grabed through plugins (see the glances/plugins source folder).
+    - also toutputs methods (Curse, Web mode, CSV) are manage as plugins.
+
+    The Curse inteface is almost the same than the version 1.7. Somes improvements have been made:
+    - space optimisation for the CPU, LOAD and MEM stats (justified alignment)
+    - CPU:
+        . CPU stats are displayed as soons as Glances is started  
+        . steal CPU alerts are no more logged
+    - LOAD:
+        . 5 min LOAD alerts are no more logged
+    - File System:
+        . Display the device name (if space is available)
+    - Sensors:
+        . Sensors and HDD temperature are displayed in the same block 
+    - Process list:
+        . Refactor columns: CPU%, MEM%, VIRT, RES, PID, USER, NICE, STATUS, TIME, IO, Command/name
+        . The running processes status is highlighted
+        . The process name is highlighted in the command line
+
+    Glances 2.0 brings a brand new Web Interface. You can run Glances in Web server mode and consult the stats diretly from a standard Web Browser.
+
+    The client mode can now fallback to a simple SNMP mode if Glances server is not found on the remote machine.
+
+
+    Complete release notes:
+
     * ...
 
+
+==============================================================================
+Glances Version 1.x
+==============================================================================
+
 Version 1.7.4
 =============
 
diff --git a/README.rst b/README.rst
index 24f3a157..d84c7c0e 100644
--- a/README.rst
+++ b/README.rst
@@ -18,7 +18,7 @@ Glances - An eye on your system
 .. image:: https://raw.github.com/nicolargo/glances/master/docs/images/glances-white-256.png
         :width: 128
 
-**Glances** is a cross-platform curses-based monitoring tool written in Python.
+**Glances** is a cross-platform curses-based system monitoring tool written in Python.
 
 It uses the `psutil`_ library to get information from your system.
 
@@ -34,7 +34,7 @@ Requirements
 Optional dependencies:
 
 - ``bottle`` (for Web Server mode)
-- ``py3sensors`` (for HW monitoring support) [Linux-only]
+- ``py3sensors`` (for hardware monitoring support) [Linux-only]
 - ``hddtemp`` (for HDD temperature monitoring support)
 - ``batinfo`` (for battery monitoring support) [Linux-only]
 
@@ -44,13 +44,15 @@ Installation
 PyPI: The simple way
 --------------------
 
-Glances is on `PyPI`_. To install, simply use `pip`_:
+Glances is on `PyPI`_. By using Pypi, you are sure to have the latest stable version.
+
+To install, simply use `pip`_:
 
 .. code-block:: console
 
     pip install Glances
 
-*Note*: Python headers are required to install psutil. For example,
+*Note*: Python headers are required to install PSutil. For example,
 on Debian/Ubuntu you need to install first the *python-dev* package.
 
 To upgrade Glances to the latest version:
@@ -59,10 +61,10 @@ To upgrade Glances to the latest version:
 
     pip install --upgrade Glances
 
-Linux
------
+GNU/Linux
+---------
 
-At the moment, packages exist for the following distributions:
+At the moment, packages exist for the following GNU/Linux distributions:
 
 - Arch Linux
 - Debian (Testing/Sid)
@@ -120,13 +122,8 @@ Windows
 -------
 
 Glances proposes a Windows client based on the `colorconsole`_ Python library.
-Glances version < 1.7.2 only works in server mode.
 
-Thanks to Nicolas Bourges, a Windows installer is available:
-
-- Glances-1.7.2-win32.msi_ (32-bit, MD5: dba4f6cc9f47b6806ffaeb665c093270)
-
-Otherwise, you have to follow these steps:
+To install Glances on Windows OS, you have to follow these steps:
 
 - Install Python for Windows: http://www.python.org/getit/
 - Install the psutil library: https://pypi.python.org/pypi?:action=display&name=psutil#downloads
@@ -156,13 +153,36 @@ You can install Glances using `Puppet`_: https://github.com/rverchere/puppet-gla
 Usage
 =====
 
-Just run:
+For the standalone mode, just run:
 
 .. code-block:: console
 
     $ glances
 
-and RTFM, always.
+
+For the Web server mode, run:
+
+.. code-block:: console
+
+    $ glances -w
+
+and enter the URL http://<ip>:61208 in your favorite Web Browser.
+
+For the client/server mode, run:
+
+.. code-block:: console
+
+    $ glances -s
+
+on the server side and run:
+
+.. code-block:: console
+
+    $ glances -c <ip>
+
+on the client one.
+
+And RTFM, always.
 
 Documentation
 =============