From 921b60dbe52f80e34358da9daba6f7606bc06d97 Mon Sep 17 00:00:00 2001
From: Nick Siscoe <nick.siscoe@gmail.com>
Date: Mon, 13 Aug 2018 17:40:43 -0500
Subject: [PATCH 1/4] "codestyle" comment typo fix

---
 packages/material-ui/src/LinearProgress/LinearProgress.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/material-ui/src/LinearProgress/LinearProgress.js b/packages/material-ui/src/LinearProgress/LinearProgress.js
index 3d7b451784dcd6..b638d28fa70950 100644
--- a/packages/material-ui/src/LinearProgress/LinearProgress.js
+++ b/packages/material-ui/src/LinearProgress/LinearProgress.js
@@ -18,7 +18,7 @@ export const styles = theme => ({
   colorPrimary: {
     backgroundColor: lighten(theme.palette.primary.light, 0.6),
   },
-  /* Styles applied to the root & bar2 elements if `color="secondary"`; bar2 if variant="buffer". */
+  /* Styles applied to the root & bar2 elements if `color="secondary"`; bar2 if `variant="buffer"`. */
   colorSecondary: {
     backgroundColor: lighten(theme.palette.secondary.light, 0.4),
   },

From 51aea6fd45e4b9887687f3b42b0956d6a3bd6516 Mon Sep 17 00:00:00 2001
From: Nick Siscoe <nick.siscoe@gmail.com>
Date: Mon, 13 Aug 2018 18:12:49 -0500
Subject: [PATCH 2/4] Update LinearProgress.js

---
 packages/material-ui/src/LinearProgress/LinearProgress.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/material-ui/src/LinearProgress/LinearProgress.js b/packages/material-ui/src/LinearProgress/LinearProgress.js
index b638d28fa70950..c840c20cd9ab8f 100644
--- a/packages/material-ui/src/LinearProgress/LinearProgress.js
+++ b/packages/material-ui/src/LinearProgress/LinearProgress.js
@@ -18,7 +18,8 @@ export const styles = theme => ({
   colorPrimary: {
     backgroundColor: lighten(theme.palette.primary.light, 0.6),
   },
-  /* Styles applied to the root & bar2 elements if `color="secondary"`; bar2 if `variant="buffer"`. */
+  /* Styles applied to the root & bar2 elements 
+  if `color="secondary"`; bar2 if `variant="buffer"`. */
   colorSecondary: {
     backgroundColor: lighten(theme.palette.secondary.light, 0.4),
   },

From bb8002c38259c406a08c5ce97477de9a15025412 Mon Sep 17 00:00:00 2001
From: Nick Siscoe <nick.siscoe@gmail.com>
Date: Mon, 13 Aug 2018 19:54:53 -0500
Subject: [PATCH 3/4] undo two line

---
 packages/material-ui/src/LinearProgress/LinearProgress.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/material-ui/src/LinearProgress/LinearProgress.js b/packages/material-ui/src/LinearProgress/LinearProgress.js
index c840c20cd9ab8f..b638d28fa70950 100644
--- a/packages/material-ui/src/LinearProgress/LinearProgress.js
+++ b/packages/material-ui/src/LinearProgress/LinearProgress.js
@@ -18,8 +18,7 @@ export const styles = theme => ({
   colorPrimary: {
     backgroundColor: lighten(theme.palette.primary.light, 0.6),
   },
-  /* Styles applied to the root & bar2 elements 
-  if `color="secondary"`; bar2 if `variant="buffer"`. */
+  /* Styles applied to the root & bar2 elements if `color="secondary"`; bar2 if `variant="buffer"`. */
   colorSecondary: {
     backgroundColor: lighten(theme.palette.secondary.light, 0.4),
   },

From 0e748bf304c766ec070eba69391d4fbf63c2a840 Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Tue, 14 Aug 2018 23:57:38 +0200
Subject: [PATCH 4/4] green

---
 packages/material-ui/src/LinearProgress/LinearProgress.js | 1 +
 pages/api/linear-progress.md                              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/material-ui/src/LinearProgress/LinearProgress.js b/packages/material-ui/src/LinearProgress/LinearProgress.js
index b638d28fa70950..44e9e7b9ddc909 100644
--- a/packages/material-ui/src/LinearProgress/LinearProgress.js
+++ b/packages/material-ui/src/LinearProgress/LinearProgress.js
@@ -18,6 +18,7 @@ export const styles = theme => ({
   colorPrimary: {
     backgroundColor: lighten(theme.palette.primary.light, 0.6),
   },
+  // eslint-disable-next-line max-len
   /* Styles applied to the root & bar2 elements if `color="secondary"`; bar2 if `variant="buffer"`. */
   colorSecondary: {
     backgroundColor: lighten(theme.palette.secondary.light, 0.4),
diff --git a/pages/api/linear-progress.md b/pages/api/linear-progress.md
index c6ecf59973d923..8fb40fcd279de6 100644
--- a/pages/api/linear-progress.md
+++ b/pages/api/linear-progress.md
@@ -37,7 +37,7 @@ This property accepts the following keys:
 |:-----|:------------|
 | <span class="prop-name">root</span> | Styles applied to the root element.
 | <span class="prop-name">colorPrimary</span> | Styles applied to the root & bar2 element if `color="primary"`; bar2 if `variant-"buffer"`.
-| <span class="prop-name">colorSecondary</span> | Styles applied to the root & bar2 elements if `color="secondary"`; bar2 if variant="buffer".
+| <span class="prop-name">colorSecondary</span> | Styles applied to the root & bar2 elements if `color="secondary"`; bar2 if `variant="buffer"`.
 | <span class="prop-name">buffer</span> | Styles applied to the root element if `variant="buffer"`.
 | <span class="prop-name">query</span> | Styles applied to the root element if `variant="query"`.
 | <span class="prop-name">dashed</span> | Styles applied to the additional bar element if `variant="buffer"`.