From f3ef819f08eb4a9b0646f50d3ac8265081838f16 Mon Sep 17 00:00:00 2001
From: spences10 <spences10apps@gmail.com>
Date: Mon, 26 Mar 2018 16:18:46 +0100
Subject: [PATCH 01/12] new page an title

---
 docs/docs/gatsby-on-linux.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 docs/docs/gatsby-on-linux.md

diff --git a/docs/docs/gatsby-on-linux.md b/docs/docs/gatsby-on-linux.md
new file mode 100644
index 0000000000000..a15ab0083e9ce
--- /dev/null
+++ b/docs/docs/gatsby-on-linux.md
@@ -0,0 +1,4 @@
+---
+title: Gatsby on Linux
+---
+

From a12f423e910153c0ee30ea598000a86e7d24e385 Mon Sep 17 00:00:00 2001
From: spences10 <spences10apps@gmail.com>
Date: Mon, 26 Mar 2018 16:26:01 +0100
Subject: [PATCH 02/12] add in outline

---
 docs/docs/gatsby-on-linux.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/docs/gatsby-on-linux.md b/docs/docs/gatsby-on-linux.md
index a15ab0083e9ce..689e1d8c328ca 100644
--- a/docs/docs/gatsby-on-linux.md
+++ b/docs/docs/gatsby-on-linux.md
@@ -2,3 +2,27 @@
 title: Gatsby on Linux
 ---
 
+## Using Windows Usbsystem Lunux: Ububtu
+
+Fresh install of Ubuntu
+
+```sh
+sudo apt update
+sudo apt -y upgrade
+```
+
+## Using Windows Usbsystem Lunux: Debian
+
+```sh
+sudo apt update
+sudo apt -y upgrade
+sudo apt install build-essential
+sudo apt install git
+sudo apt install libpng-dev
+```
+
+Or to install all at the same time and approve (y) all installs:
+
+```sh
+sudo apt update && sudo apt -y upgrade && sudo apt install build-essential && sudo apt install git && sudo apt install libpng-dev
+```

From 074379533301e5bbc67f61c0bf09a269872c1786 Mon Sep 17 00:00:00 2001
From: spences10 <spences10apps@gmail.com>
Date: Mon, 26 Mar 2018 16:38:35 +0100
Subject: [PATCH 03/12] build tools

---
 docs/docs/gatsby-on-linux.md | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/docs/docs/gatsby-on-linux.md b/docs/docs/gatsby-on-linux.md
index 689e1d8c328ca..45c2e82e3b0d4 100644
--- a/docs/docs/gatsby-on-linux.md
+++ b/docs/docs/gatsby-on-linux.md
@@ -1,17 +1,32 @@
 ---
 title: Gatsby on Linux
 ---
+# Linux
 
-## Using Windows Usbsystem Lunux: Ububtu
+## Windows Subsystem Linux (WSL)
 
-Fresh install of Ubuntu
+As of October 17th 2017 Windows 10 ships with Just for info for those that are not aware WSL has been available in Windows 10 via the Windows Store since the Fall Creators Update there will be a very large portion of developers that could use this instead of
+
+### Using Windows Subsystem Linux: Ubuntu
+
+If you have a fresh install of Ubuntu then update and upgrade:
 
 ```sh
 sudo apt update
 sudo apt -y upgrade
 ```
 
-## Using Windows Usbsystem Lunux: Debian
+>Only use `-y` if you're happy to upgrade to the latest versions of the software.
+
+**Build tools**
+
+To compile and install native addons from npm you may also need to install build tools, I need this for Gatsby images which uses `sharp` which in turn uses `node-gyp`:
+
+```sh
+sudo apt install -y build-essential
+```
+
+### Using Windows Subsystem Linux: Debian
 
 ```sh
 sudo apt update

From 0d6d5fe72441d83a038db0430354d1988ea8c13b Mon Sep 17 00:00:00 2001
From: spences10 <spences10apps@gmail.com>
Date: Mon, 26 Mar 2018 16:43:13 +0100
Subject: [PATCH 04/12] node-install

---
 docs/docs/gatsby-on-linux.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/docs/gatsby-on-linux.md b/docs/docs/gatsby-on-linux.md
index 45c2e82e3b0d4..a05b9106dd894 100644
--- a/docs/docs/gatsby-on-linux.md
+++ b/docs/docs/gatsby-on-linux.md
@@ -26,6 +26,12 @@ To compile and install native addons from npm you may also need to install build
 sudo apt install -y build-essential
 ```
 
+**Install node**
+
+If installing node via the instructions given on the nodejs.org site doesn't give the correct permissions i.e. permission errors when trying to `npm install` try using [n] instead, you can install it with [n-install]:
+
+
+
 ### Using Windows Subsystem Linux: Debian
 
 ```sh
@@ -41,3 +47,7 @@ Or to install all at the same time and approve (y) all installs:
 ```sh
 sudo apt update && sudo apt -y upgrade && sudo apt install build-essential && sudo apt install git && sudo apt install libpng-dev
 ```
+
+<!-- links -->
+[n]: https://github.com/tj/n
+[n-install]: https://github.com/mklement0/n-install
\ No newline at end of file

From ba33dd385538370da045d695c6d1ea77f8b9a353 Mon Sep 17 00:00:00 2001
From: spences10 <spences10apps@gmail.com>
Date: Mon, 26 Mar 2018 16:53:57 +0100
Subject: [PATCH 05/12] links and preamble

---
 docs/docs/gatsby-on-linux.md | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/docs/docs/gatsby-on-linux.md b/docs/docs/gatsby-on-linux.md
index a05b9106dd894..5540f70b05226 100644
--- a/docs/docs/gatsby-on-linux.md
+++ b/docs/docs/gatsby-on-linux.md
@@ -5,7 +5,12 @@ title: Gatsby on Linux
 
 ## Windows Subsystem Linux (WSL)
 
-As of October 17th 2017 Windows 10 ships with Just for info for those that are not aware WSL has been available in Windows 10 via the Windows Store since the Fall Creators Update there will be a very large portion of developers that could use this instead of
+As of October 17th 2017 Windows 10 ships with WSL and is available via the Windows Store, there are several different distributions to use which can be configured via `wslconfig` if you have more than one distribution installed.
+
+```sh
+# set default distribution to Ubuntu
+wslconfig /setdefault ubuntu
+```
 
 ### Using Windows Subsystem Linux: Ubuntu
 
@@ -28,12 +33,18 @@ sudo apt install -y build-essential
 
 **Install node**
 
-If installing node via the instructions given on the nodejs.org site doesn't give the correct permissions i.e. permission errors when trying to `npm install` try using [n] instead, you can install it with [n-install]:
+If installing node via the instructions given on the nodejs.org site doesn't give the correct permissions (i.e. permission errors when trying to `npm install`) try using [n] instead, you can install it with [n-install]:
 
+```sh
+curl -L https://git.io/n-install | bash
+```
 
+There are other alternatives for managing you node versions such as [nvm] but this is known to slow down [bash startup] on WSL.
 
 ### Using Windows Subsystem Linux: Debian
 
+Debian 
+
 ```sh
 sudo apt update
 sudo apt -y upgrade
@@ -50,4 +61,6 @@ sudo apt update && sudo apt -y upgrade && sudo apt install build-essential && su
 
 <!-- links -->
 [n]: https://github.com/tj/n
-[n-install]: https://github.com/mklement0/n-install
\ No newline at end of file
+[n-install]: https://github.com/mklement0/n-install
+[nvm]: https://github.com/creationix/nvm
+[bash startup]: https://github.com/Microsoft/WSL/issues/776#issuecomment-266112578

From c7e133c33428b2e6b96aa76bf241f07e9cd889bb Mon Sep 17 00:00:00 2001
From: spences10 <spences10apps@gmail.com>
Date: Mon, 26 Mar 2018 16:58:52 +0100
Subject: [PATCH 06/12] debian too

---
 docs/docs/gatsby-on-linux.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/docs/gatsby-on-linux.md b/docs/docs/gatsby-on-linux.md
index 5540f70b05226..aa73a9ac04220 100644
--- a/docs/docs/gatsby-on-linux.md
+++ b/docs/docs/gatsby-on-linux.md
@@ -5,7 +5,7 @@ title: Gatsby on Linux
 
 ## Windows Subsystem Linux (WSL)
 
-As of October 17th 2017 Windows 10 ships with WSL and is available via the Windows Store, there are several different distributions to use which can be configured via `wslconfig` if you have more than one distribution installed.
+As of October 17th 2017 Windows 10 ships with WSL and Linux distributions are available via the [Windows Store], there are several different distributions to use which can be configured via `wslconfig` if you have more than one distribution installed.
 
 ```sh
 # set default distribution to Ubuntu
@@ -25,7 +25,7 @@ sudo apt -y upgrade
 
 **Build tools**
 
-To compile and install native addons from npm you may also need to install build tools, I need this for Gatsby images which uses `sharp` which in turn uses `node-gyp`:
+To compile and install native addons from npm you may also need to install build tools for `node-gyp`:
 
 ```sh
 sudo apt install -y build-essential
@@ -43,7 +43,7 @@ There are other alternatives for managing you node versions such as [nvm] but th
 
 ### Using Windows Subsystem Linux: Debian
 
-Debian 
+Debian setup is nearly identical to Ubuntu except for the additional installs of `git` and `libpng-dev`.
 
 ```sh
 sudo apt update
@@ -60,6 +60,7 @@ sudo apt update && sudo apt -y upgrade && sudo apt install build-essential && su
 ```
 
 <!-- links -->
+[windows store]: https://www.microsoft.com/en-us/store/p/ubuntu/9nblggh4msv6
 [n]: https://github.com/tj/n
 [n-install]: https://github.com/mklement0/n-install
 [nvm]: https://github.com/creationix/nvm

From e2d89c3eca931549e72f253b39d8d7707ce0a534 Mon Sep 17 00:00:00 2001
From: Kyle Mathews <mathews.kyle@gmail.com>
Date: Mon, 26 Mar 2018 15:07:30 -0700
Subject: [PATCH 07/12] Update gatsby-on-linux.md

---
 docs/docs/gatsby-on-linux.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/docs/gatsby-on-linux.md b/docs/docs/gatsby-on-linux.md
index aa73a9ac04220..d3ea84a4dc775 100644
--- a/docs/docs/gatsby-on-linux.md
+++ b/docs/docs/gatsby-on-linux.md
@@ -3,6 +3,8 @@ title: Gatsby on Linux
 ---
 # Linux
 
+TODO
+
 ## Windows Subsystem Linux (WSL)
 
 As of October 17th 2017 Windows 10 ships with WSL and Linux distributions are available via the [Windows Store], there are several different distributions to use which can be configured via `wslconfig` if you have more than one distribution installed.

From 32fc8985e023d20657a1baef9be3997d8b11151e Mon Sep 17 00:00:00 2001
From: Kyle Mathews <mathews.kyle@gmail.com>
Date: Mon, 26 Mar 2018 15:10:00 -0700
Subject: [PATCH 08/12] Copy edits

---
 docs/docs/gatsby-on-linux.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs/gatsby-on-linux.md b/docs/docs/gatsby-on-linux.md
index d3ea84a4dc775..fba705dc60b25 100644
--- a/docs/docs/gatsby-on-linux.md
+++ b/docs/docs/gatsby-on-linux.md
@@ -7,7 +7,7 @@ TODO
 
 ## Windows Subsystem Linux (WSL)
 
-As of October 17th 2017 Windows 10 ships with WSL and Linux distributions are available via the [Windows Store], there are several different distributions to use which can be configured via `wslconfig` if you have more than one distribution installed.
+As of October 17th 2017, Windows 10 ships with WSL and Linux distributions are available via the [Windows Store], there are several different distributions to use which can be configured via `wslconfig` if you have more than one distribution installed.
 
 ```sh
 # set default distribution to Ubuntu
@@ -35,7 +35,7 @@ sudo apt install -y build-essential
 
 **Install node**
 
-If installing node via the instructions given on the nodejs.org site doesn't give the correct permissions (i.e. permission errors when trying to `npm install`) try using [n] instead, you can install it with [n-install]:
+Following the install instructions on nodejs.org leaves a slightly broken install (i.e. permission errors when trying to `npm install`). Instead trying installing node versions using [n] which you can install with [n-install]:
 
 ```sh
 curl -L https://git.io/n-install | bash

From aac849924531a9c5ce68dac2eb1a290468bcb660 Mon Sep 17 00:00:00 2001
From: Kyle Mathews <mathews.kyle@gmail.com>
Date: Mon, 26 Mar 2018 15:10:10 -0700
Subject: [PATCH 09/12] Copy edits


From 526f7b9f3f6224b400df038db249010d73f7cc09 Mon Sep 17 00:00:00 2001
From: Kyle Mathews <mathews.kyle@gmail.com>
Date: Mon, 26 Mar 2018 15:10:39 -0700
Subject: [PATCH 10/12] Update gatsby-on-linux.md

---
 docs/docs/gatsby-on-linux.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/gatsby-on-linux.md b/docs/docs/gatsby-on-linux.md
index fba705dc60b25..b5b412ba14690 100644
--- a/docs/docs/gatsby-on-linux.md
+++ b/docs/docs/gatsby-on-linux.md
@@ -35,7 +35,7 @@ sudo apt install -y build-essential
 
 **Install node**
 
-Following the install instructions on nodejs.org leaves a slightly broken install (i.e. permission errors when trying to `npm install`). Instead trying installing node versions using [n] which you can install with [n-install]:
+Following the install instructions on nodejs.org leaves a slightly broken install (i.e. permission errors when trying to `npm install`). Instead try installing node versions using [n] which you can install with [n-install]:
 
 ```sh
 curl -L https://git.io/n-install | bash

From 8924dafb36e30cb100f79e4e7146b9dd4e7a3f31 Mon Sep 17 00:00:00 2001
From: spences10 <spences10apps@gmail.com>
Date: Tue, 27 Mar 2018 10:03:09 +0100
Subject: [PATCH 11/12] typo you, your

---
 docs/docs/gatsby-on-linux.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/gatsby-on-linux.md b/docs/docs/gatsby-on-linux.md
index b5b412ba14690..73e80cbe3c54d 100644
--- a/docs/docs/gatsby-on-linux.md
+++ b/docs/docs/gatsby-on-linux.md
@@ -41,7 +41,7 @@ Following the install instructions on nodejs.org leaves a slightly broken instal
 curl -L https://git.io/n-install | bash
 ```
 
-There are other alternatives for managing you node versions such as [nvm] but this is known to slow down [bash startup] on WSL.
+There are other alternatives for managing your node versions such as [nvm] but this is known to slow down [bash startup] on WSL.
 
 ### Using Windows Subsystem Linux: Debian
 

From 0805f8baf9025fc97852dec76df606200f271d1f Mon Sep 17 00:00:00 2001
From: spences10 <spences10apps@gmail.com>
Date: Tue, 27 Mar 2018 10:55:59 +0100
Subject: [PATCH 12/12] typo you, your

---
 docs/docs/gatsby-on-linux.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/docs/gatsby-on-linux.md b/docs/docs/gatsby-on-linux.md
index b5454f3738840..73e80cbe3c54d 100644
--- a/docs/docs/gatsby-on-linux.md
+++ b/docs/docs/gatsby-on-linux.md
@@ -41,11 +41,7 @@ Following the install instructions on nodejs.org leaves a slightly broken instal
 curl -L https://git.io/n-install | bash
 ```
 
-<<<<<<< HEAD
 There are other alternatives for managing your node versions such as [nvm] but this is known to slow down [bash startup] on WSL.
-=======
-There are other alternatives for managing you node versions such as [nvm] but this is known to slow down [bash startup] on WSL.
->>>>>>> 0d73e670239a3b020545c3787ca4d7e5875f2f3b
 
 ### Using Windows Subsystem Linux: Debian