From 049d21cc1535a55fe25e0cb21fcc87a962286f2c Mon Sep 17 00:00:00 2001
From: Laurent Jouanneau <dev@ljouanneau.com>
Date: Thu, 22 Mar 2018 22:56:29 +0100
Subject: [PATCH] Prepare the 1.0 branch

---
 docs/conf.py               | 2 +-
 docs/release-notes-1.0.rst | 9 +++++----
 package.json               | 2 +-
 src/application.ini        | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 41cb505..c31c195 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,7 +51,7 @@
 # The short X.Y version.
 version = '1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.0-rc.1'
+release = '1.0.0-rc.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/release-notes-1.0.rst b/docs/release-notes-1.0.rst
index 9912040..6ddbd36 100644
--- a/docs/release-notes-1.0.rst
+++ b/docs/release-notes-1.0.rst
@@ -6,7 +6,7 @@ Release Notes of SlimerJS 1.0
 ==============================
 
 version 1.0
-==============
+===========
 
 Not released yet.
 
@@ -17,17 +17,17 @@ New features and API
 - ``onResourceError`` parameter contains now always ``status`` and ``statusText`` properties
 - ``proxy()`` and ``setProxy()`` methods
 - ``slimer.version`` and ``slimer.geckoVersion`` have a new ``prerelease`` property.
-- With Firefox 56 and more, SlimerJS can be trully headless by adding the --headless option on the command line
+- With Firefox 56 and more, SlimerJS can be trully headless by adding the ``--headless`` option on the command line
 - Proxy config: support https URI for pac
 - new ``fs.isSpecial()``
-- onResourceRequested: support of requestData.postData when http method is "patch"
+- ``onResourceRequested``: support of requestData.postData when http method is "patch"
 
 Improvements
 ------------
 
 * implements ``system.pid`` (#473)
 * implements ``phantom.proxy()`` and ``phantom.setProxy()`` methods (#436, #444, #445)
-* Compatibility with Firefox 53 to 58
+* Compatibility with Firefox 53 to 59
 
 Fixed bugs
 ----------
@@ -76,6 +76,7 @@ Known issues
 Contributors for this release
 -----------------------------
 
+- Avadh Patel
 - Brian Birtles
 - Brendan Dahl
 - Nagy Attila Gabor
diff --git a/package.json b/package.json
index 5b22d97..54d6ab1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "slimerjs",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.2",
   "description": "A scriptable browser like PhantomJS, based on Firefox",
   "bin": {
     "slimerjs": "./src/slimerjs-node"
diff --git a/src/application.ini b/src/application.ini
index 1cc4de4..0f438ec 100644
--- a/src/application.ini
+++ b/src/application.ini
@@ -1,8 +1,8 @@
 [App]
 Vendor=Innophi
 Name=SlimerJS
-Version=1.0.0-rc.1
-BuildID=20180314
+Version=1.0.0-rc.2
+BuildID=20180323
 ID=slimerjs@slimerjs.org
 Copyright=Copyright 2012-2018 Laurent Jouanneau & Innophi