From e31ca40cb6269a13dc6a37b2ea6167c29a71e5d7 Mon Sep 17 00:00:00 2001
From: Przemyslaw Murawski <przemyslaw.murawski@castingnetworks.com>
Date: Mon, 14 Dec 2015 14:02:35 +0100
Subject: [PATCH 1/4] removed rule forbidding usage of reserved words as keys

---
 README.md | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 5276f4a932..2c59bdffbe 100644
--- a/README.md
+++ b/README.md
@@ -151,21 +151,7 @@ Other Style Guides
     const item = {};
     ```
 
-  - [3.2](#3.2) <a name='3.2'></a> If your code will be executed in browsers in script context, don't use [reserved words](http://es5.github.io/#x7.6.1) as keys. It won't work in IE8. [More info](https://github.com/airbnb/javascript/issues/61). It’s OK to use them in ES6 modules and server-side code.
-
-    ```javascript
-    // bad
-    const superman = {
-      default: { clark: 'kent' },
-      private: true,
-    };
-
-    // good
-    const superman = {
-      defaults: { clark: 'kent' },
-      hidden: true,
-    };
-    ```
+  - ~~[3.2](#3.2)~~ Rule was removed.
 
   - [3.3](#3.3) <a name='3.3'></a> Use readable synonyms in place of reserved words.
 

From eb43f9f7a942cbca0b5b6905b2866ec397d925ad Mon Sep 17 00:00:00 2001
From: Przemyslaw Murawski <przemyslaw.murawski@castingnetworks.com>
Date: Mon, 14 Dec 2015 14:03:02 +0100
Subject: [PATCH 2/4] changed indent rule from spaces to tabs

---
 packages/eslint-config-airbnb/.eslintrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/eslint-config-airbnb/.eslintrc b/packages/eslint-config-airbnb/.eslintrc
index 4b3b1fa429..068ede6b8e 100644
--- a/packages/eslint-config-airbnb/.eslintrc
+++ b/packages/eslint-config-airbnb/.eslintrc
@@ -3,6 +3,7 @@
   "rules": {
     // disable requiring trailing commas because it might be nice to revert to
     // being JSON at some point, and I don't want to make big changes now.
-    "comma-dangle": 0
+    "comma-dangle": 0,
+    "indent": [2, "tab"]
   }
 }

From a8c9030763156b26a5e56081706a7694538e02cb Mon Sep 17 00:00:00 2001
From: Przemyslaw Murawski <przemyslaw.murawski@castingnetworks.com>
Date: Mon, 14 Dec 2015 14:22:09 +0100
Subject: [PATCH 3/4] fix tab indent rule

---
 packages/eslint-config-airbnb/.eslintrc      | 3 +--
 packages/eslint-config-airbnb/rules/style.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/eslint-config-airbnb/.eslintrc b/packages/eslint-config-airbnb/.eslintrc
index 068ede6b8e..4b3b1fa429 100644
--- a/packages/eslint-config-airbnb/.eslintrc
+++ b/packages/eslint-config-airbnb/.eslintrc
@@ -3,7 +3,6 @@
   "rules": {
     // disable requiring trailing commas because it might be nice to revert to
     // being JSON at some point, and I don't want to make big changes now.
-    "comma-dangle": 0,
-    "indent": [2, "tab"]
+    "comma-dangle": 0
   }
 }
diff --git a/packages/eslint-config-airbnb/rules/style.js b/packages/eslint-config-airbnb/rules/style.js
index 204d69c5b3..f7e5a3aee2 100644
--- a/packages/eslint-config-airbnb/rules/style.js
+++ b/packages/eslint-config-airbnb/rules/style.js
@@ -24,7 +24,7 @@ module.exports = {
     'id-length': 0,
     // this option sets a specific tab width for your code
     // https://github.com/eslint/eslint/blob/master/docs/rules/indent.md
-    'indent': [2, 2, { "SwitchCase": 1, "VariableDeclarator": 1 }],
+    'indent': [2, 'tab'],
     // specify whether double or single quotes should be used in JSX attributes
     'jsx-quotes': 2,
     // enforces spacing between keys and values in object literal properties

From 5d1d53b8544fb7e6678fef039108115d45b4c6b2 Mon Sep 17 00:00:00 2001
From: Przemyslaw Murawski <przemyslaw.murawski@castingnetworks.com>
Date: Tue, 15 Dec 2015 08:42:41 +0100
Subject: [PATCH 4/4] changed indentation note to tabs in readme

---
 README.md | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 2c59bdffbe..99385851d2 100644
--- a/README.md
+++ b/README.md
@@ -1352,27 +1352,10 @@ Other Style Guides
 
 ## Whitespace
 
-  - [18.1](#18.1) <a name='18.1'></a> Use soft tabs set to 2 spaces.
+  - [18.1](#18.1) <a name='18.1'></a> Use tabs for indentation.
 
   eslint rules: [`indent`](http://eslint.org/docs/rules/indent.html).
 
-    ```javascript
-    // bad
-    function () {
-    ∙∙∙∙const name;
-    }
-
-    // bad
-    function () {
-    ∙const name;
-    }
-
-    // good
-    function () {
-    ∙∙const name;
-    }
-    ```
-
   - [18.2](#18.2) <a name='18.2'></a> Place 1 space before the leading brace.
 
   eslint rules: [`space-before-blocks`](http://eslint.org/docs/rules/space-before-blocks.html).