From 57fcee0f1c520a7c5e3aa5e2bde974154cdaf0c3 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sat, 24 Sep 2016 16:06:44 -0700
Subject: README copy updates

---
 README.md | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index aab1af9fd..6da731890 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,15 @@
   <img src="https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png" alt="Oh My Zsh">
 </p>
 
-Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration. That sounds boring. Let's try this again.
+Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration.
 
-__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interact with your command prompt, you'll be able to take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
+That sounds boring. Let's try this again.
+
+__Oh My Zsh is a way of life!__
+
+Once installed, your terminal shell will become the talk of the town _or your money back!_ With each keystroke in your command prompt, you'll take advantage of the hundreds of powerful plugins and beautiful themes. Strangers will come up to you in cafés and ask you, _"that is amazing! are you some sort of genius?"_
+
+Finally, you'll begin to get the sort of attention that you have always felt you deserved. ...or maybe you'll use the time that you're saving to start flossing more often.
 
 To learn more, visit [ohmyz.sh](http://ohmyz.sh) and follow [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter.
 
@@ -202,7 +208,10 @@ Thank you so much!
 
 ## Follow Us
 
-We have an [@ohmyzsh](https://twitter.com/ohmyzsh) Twitter account. You should follow it.
+We're on the social medias.
+
+* [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter. You should follow it.
+* [Oh My Zsh](https://www.facebook.com/Oh-My-Zsh-296616263819290/) on Facebook.
 
 ## Merchandise
 
-- 
cgit v1.2.3-70-g09d2


From 0f4d6a5056d458e04d11c046820e5d17f65c161e Mon Sep 17 00:00:00 2001
From: Thomas <GrmpCerber@users.noreply.github.com>
Date: Mon, 26 Sep 2016 16:40:07 +0200
Subject: Add a tip to ease agnoster first setup

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 6da731890..268c1b39d 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,9 @@ ZSH_THEME="robbyrussell"
 To use a different theme, simply change the value to match the name of your desired theme. For example:
 
 ```shell
-ZSH_THEME="agnoster" # (this is one of the fancy ones)
+ZSH_THEME="agnoster" # (this is one of the fancy ones ;
+                     # you might need to install a specific font on your console's host for this to work ;
+                     # see https://github.com/powerline/fonts/tree/master/DejaVuSansMono)
 ```
 
 Open up a new terminal window and your prompt should look something like...
-- 
cgit v1.2.3-70-g09d2


From c861430d3e8ff202b84b2a89c3caa6e414e2f8c1 Mon Sep 17 00:00:00 2001
From: Chenje Katanda <chenje@ssn.co.zw>
Date: Thu, 13 Oct 2016 17:33:44 -0400
Subject: readme change OS X to macOS

Change OS X to macOS in the read me file in line with apples rebranding
of the operating system.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 6da731890..2b0856c2d 100644
--- a/README.md
+++ b/README.md
@@ -18,9 +18,9 @@ To learn more, visit [ohmyz.sh](http://ohmyz.sh) and follow [@ohmyzsh](https://t
 
 ### Prerequisites
 
-__Disclaimer:__ _Oh My Zsh works best on OS X and Linux._
+__Disclaimer:__ _Oh My Zsh works best on macOS and Linux._
 
-* Unix-based operating system (OS X or Linux)
+* Unix-based operating system (macOS or Linux)
 * [Zsh](http://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (`zsh --version` to confirm), check the following instruction here: [Installing ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH)
 * `curl` or `wget` should be installed
 * `git` should be installed
-- 
cgit v1.2.3-70-g09d2


From 7d8618ec9a3a311a8df3cd2062e7fb2277fb8604 Mon Sep 17 00:00:00 2001
From: Sayalee Pote <sayaleepote44@gmail.com>
Date: Tue, 18 Oct 2016 00:57:58 +0530
Subject: Update README with grammar corrections (#5503)

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 2b0856c2d..c304c75d3 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ Oh My Zsh comes with a shit load of plugins to take advantage of. You can take a
 
 #### Enabling Plugins
 
-If you spot a plugin (or several) that you would like to use with Oh My Zsh, you will need to edit the `~/.zshrc` file. Once you open it with your favorite editor, you'll see a spot to list all the plugins that you'd like Oh My Zsh to load in initialization.
+If you spot a plugin (or several) that you would like to use with Oh My Zsh, you will need to edit the `~/.zshrc` file. Once you open it with your favorite editor, you'll see a spot to list all the plugins that you'd like Oh My Zsh to load on initialization.
 
 For example, this line might begin to look like...
 
@@ -67,7 +67,7 @@ We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme
 
 #### Selecting a Theme
 
-_Robby's theme is the default one. It's not the fanciest one. It's not the simplest one. It's just right (for him)._
+_Robby's theme is the default one. It's not the fanciest one. It's not the simplest one. It's just the right one (for him)._
 
 Once you find a theme that you want to use, you will need to edit the `~/.zshrc` file. You'll see an environment variable (all caps) in there that looks like:
 
@@ -81,7 +81,7 @@ To use a different theme, simply change the value to match the name of your desi
 ZSH_THEME="agnoster" # (this is one of the fancy ones)
 ```
 
-Open up a new terminal window and your prompt should look something like...
+Open up a new terminal window and your prompt should look something like this:
 
 ![Agnoster theme](https://cloud.githubusercontent.com/assets/2618447/6316862/70f58fb6-ba03-11e4-82c9-c083bf9a6574.png)
 
@@ -129,7 +129,7 @@ cp ~/.zshrc ~/.zshrc.orig
 
 ##### 3. Create a new zsh configuration file
 
-You can create a new zsh config file by copying the template that we included for you.
+You can create a new zsh config file by copying the template that we have included for you.
 
 ```shell
 cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
@@ -208,7 +208,7 @@ Thank you so much!
 
 ## Follow Us
 
-We're on the social medias.
+We're on the social media.
 
 * [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter. You should follow it.
 * [Oh My Zsh](https://www.facebook.com/Oh-My-Zsh-296616263819290/) on Facebook.
-- 
cgit v1.2.3-70-g09d2


From 3bd6be10769097351156c6460db78b5f529f4b03 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 25 Oct 2016 06:04:08 +0200
Subject: Change link to agnoster wiki + format changes

https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#agnoster
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 268c1b39d..5902c419e 100644
--- a/README.md
+++ b/README.md
@@ -78,9 +78,9 @@ ZSH_THEME="robbyrussell"
 To use a different theme, simply change the value to match the name of your desired theme. For example:
 
 ```shell
-ZSH_THEME="agnoster" # (this is one of the fancy ones ;
-                     # you might need to install a specific font on your console's host for this to work ;
-                     # see https://github.com/powerline/fonts/tree/master/DejaVuSansMono)
+ZSH_THEME="agnoster" # (this is one of the fancy ones)
+# you might need to install a special Powerline font on your console's host for this to work
+# see https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#agnoster
 ```
 
 Open up a new terminal window and your prompt should look something like...
-- 
cgit v1.2.3-70-g09d2


From 80924959c4f41bcebe7b7c667f2d7489bf8fcb74 Mon Sep 17 00:00:00 2001
From: Tanin Rojanapiansatith <sp_land@hotmail.com>
Date: Fri, 21 Oct 2016 00:35:55 +0100
Subject: Clarify how to open ~/.zshrc file in README.md

Closes #5558
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 0e39f4c55..eecde1551 100644
--- a/README.md
+++ b/README.md
@@ -49,9 +49,9 @@ Oh My Zsh comes with a shit load of plugins to take advantage of. You can take a
 
 #### Enabling Plugins
 
-If you spot a plugin (or several) that you would like to use with Oh My Zsh, you will need to edit the `~/.zshrc` file. Once you open it with your favorite editor, you'll see a spot to list all the plugins that you'd like Oh My Zsh to load on initialization.
+Once you spot a plugin (or several) that you'd like to use with Oh My Zsh, you'll need to enable them in the `.zshrc` file. You'll find the zshrc file in your `$HOME` directory. Open it with your favorite text editor and you'll see a spot to list all the plugins you want to load.
 
-For example, this line might begin to look like...
+For example, this line might begin to look like this:
 
 ```shell
 plugins=(git bundler osx rake ruby)
-- 
cgit v1.2.3-70-g09d2


From 937a7f66ef852c2d2a5da7907504f6d61ed92433 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 8 Dec 2016 02:10:18 +0100
Subject: Precise Unix-based wording

Closes #5681
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index eecde1551..d56534977 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ To learn more, visit [ohmyz.sh](http://ohmyz.sh) and follow [@ohmyzsh](https://t
 
 __Disclaimer:__ _Oh My Zsh works best on macOS and Linux._
 
-* Unix-based operating system (macOS or Linux)
+* Unix-like operating system (macOS or Linux)
 * [Zsh](http://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (`zsh --version` to confirm), check the following instruction here: [Installing ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH)
 * `curl` or `wget` should be installed
 * `git` should be installed
-- 
cgit v1.2.3-70-g09d2


From e609fd5a9f7f7c9a16945ca9c0748b6de99f6635 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sat, 25 Feb 2017 19:59:11 -0800
Subject: Updating README intro

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index d56534977..54107b1cb 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@
 
 Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration.
 
-That sounds boring. Let's try this again.
+Sounds boring. Let's try again.
 
-__Oh My Zsh is a way of life!__
+__Oh My Zsh will not make you a 10x developer...but you might feel like one.__
 
 Once installed, your terminal shell will become the talk of the town _or your money back!_ With each keystroke in your command prompt, you'll take advantage of the hundreds of powerful plugins and beautiful themes. Strangers will come up to you in cafés and ask you, _"that is amazing! are you some sort of genius?"_
 
-- 
cgit v1.2.3-70-g09d2


From 2e4539b0d4613e8e5081c81b80959e506038d295 Mon Sep 17 00:00:00 2001
From: Clay Anderson <claycephas@users.noreply.github.com>
Date: Wed, 1 Nov 2017 06:57:15 -0600
Subject: Added link to powerline (#6352)

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index fd4a0abc0..558d24120 100644
--- a/README.md
+++ b/README.md
@@ -79,10 +79,11 @@ To use a different theme, simply change the value to match the name of your desi
 
 ```shell
 ZSH_THEME="agnoster" # (this is one of the fancy ones)
-# you might need to install a special Powerline font on your console's host for this to work
 # see https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#agnoster
 ```
 
+_Note: many themes require installing the [Powerline Fonts](https://github.com/powerline/fonts) in order to render properly._
+
 Open up a new terminal window and your prompt should look something like this:
 
 ![Agnoster theme](https://cloud.githubusercontent.com/assets/2618447/6316862/70f58fb6-ba03-11e4-82c9-c083bf9a6574.png)
-- 
cgit v1.2.3-70-g09d2


From f812cfa16ab605a88793dce5b169886ae2802031 Mon Sep 17 00:00:00 2001
From: Eli Boyarski <eli@boyar.ski>
Date: Wed, 1 Nov 2017 15:10:02 +0200
Subject: README.md: shit load -> shit-load (#6344)

* README.md: shit load -> shit-load

* README.md: shit-load -> shitload
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 558d24120..4531f7b7b 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ sh -c "$(wget https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/to
 
 ### Plugins
 
-Oh My Zsh comes with a shit load of plugins to take advantage of. You can take a look in the [plugins](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins) directory and/or the [wiki](https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins) to see what's currently available.
+Oh My Zsh comes with a shitload of plugins to take advantage of. You can take a look in the [plugins](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins) directory and/or the [wiki](https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins) to see what's currently available.
 
 #### Enabling Plugins
 
-- 
cgit v1.2.3-70-g09d2


From 2526d71c56efe821caec6e2f03f0e5d695db3ecb Mon Sep 17 00:00:00 2001
From: Doug Yun <doug.yun@dockyard.com>
Date: Wed, 1 Nov 2017 06:21:07 -0700
Subject: Use HTTPS for Planet Argon links (#6326)

---
 README.md        | 4 ++--
 tools/install.sh | 2 +-
 tools/upgrade.sh | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 4531f7b7b..0771a0361 100644
--- a/README.md
+++ b/README.md
@@ -226,7 +226,7 @@ We're on the social media.
 
 ## Merchandise
 
-We have [stickers](http://shop.planetargon.com/products/ohmyzsh-stickers-set-of-3-stickers) and [shirts](http://shop.planetargon.com/products/ohmyzsh-t-shirts) for you to show off your love of Oh My Zsh. Again, this will help you become the talk of the town!
+We have [stickers](https://shop.planetargon.com/products/ohmyzsh-stickers-set-of-3-stickers) and [shirts](http://shop.planetargon.com/products/ohmyzsh-t-shirts) for you to show off your love of Oh My Zsh. Again, this will help you become the talk of the town!
 
 ## License
 
@@ -234,6 +234,6 @@ Oh My Zsh is released under the [MIT license](LICENSE.txt).
 
 ## About Planet Argon
 
-![Planet Argon](http://pa-github-assets.s3.amazonaws.com/PARGON_logo_digital_COL-small.jpg)
+![Planet Argon](https://pa-github-assets.s3.amazonaws.com/PARGON_logo_digital_COL-small.jpg)
 
 Oh My Zsh was started by the team at [Planet Argon](https://www.planetargon.com/?utm_source=github), a [Ruby on Rails development agency](https://www.planetargon.com/skills/ruby-on-rails-development?utm_source=github).
diff --git a/tools/install.sh b/tools/install.sh
index 3f4de8681..187c828f5 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -107,7 +107,7 @@ main() {
   echo ''
   echo 'p.s. Follow us at https://twitter.com/ohmyzsh.'
   echo ''
-  echo 'p.p.s. Get stickers and t-shirts at http://shop.planetargon.com.'
+  echo 'p.p.s. Get stickers and t-shirts at https://shop.planetargon.com.'
   echo ''
   printf "${NORMAL}"
   env zsh
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index d5e7e8ba8..25b2de27a 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -33,7 +33,7 @@ then
   printf '%s\n' '                        /____/                       '
   printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version."
   printf "${BLUE}${BOLD}%s${NORMAL}\n" "To keep up on the latest news and updates, follow us on twitter: https://twitter.com/ohmyzsh"
-  printf "${BLUE}${BOLD}%s${NORMAL}\n" "Get your Oh My Zsh swag at:  http://shop.planetargon.com/"
+  printf "${BLUE}${BOLD}%s${NORMAL}\n" "Get your Oh My Zsh swag at:  https://shop.planetargon.com/"
 else
   printf "${RED}%s${NORMAL}\n" 'There was an error updating. Try again later?'
 fi
-- 
cgit v1.2.3-70-g09d2


From 970fcec40e7f4b4fb1b3789d67a396d16226056d Mon Sep 17 00:00:00 2001
From: Muhammad Surga Savero <saveroo27@gmail.com>
Date: Sat, 4 Nov 2017 17:32:14 +0000
Subject: README.md: ZSH_THEM_RANDOM.. > ZSH_THEME_RANDOM.. (#6390)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 0771a0361..df5ef48be 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ ZSH_THEME="random" # (...please let it be pie... please be some pie..)
 And if you want to pick random theme from a list of your favorite themes:
 
 ```shell
-ZSH_THEM_RANDOM_CANDIDATES=(
+ZSH_THEME_RANDOM_CANDIDATES=(
   "robbyrussell"
   "agnoster"
 )
-- 
cgit v1.2.3-70-g09d2


From 7a7480b987c00bd916e2abf7179f92164ac44362 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Wed, 8 Nov 2017 10:46:40 -0800
Subject: Updating template and README to list plugins on individual lines vs
 one long one. Easier scanning for you and me.

---
 README.md                    | 22 +++++++++++++++++-----
 templates/zshrc.zsh-template |  4 +++-
 2 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index df5ef48be..541f48d40 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ __Oh My Zsh will not make you a 10x developer...but you might feel like one.__
 
 Once installed, your terminal shell will become the talk of the town _or your money back!_ With each keystroke in your command prompt, you'll take advantage of the hundreds of powerful plugins and beautiful themes. Strangers will come up to you in cafés and ask you, _"that is amazing! are you some sort of genius?"_
 
-Finally, you'll begin to get the sort of attention that you have always felt you deserved. ...or maybe you'll use the time that you're saving to start flossing more often.
+Finally, you'll begin to get the sort of attention that you have always felt you deserved. ...or maybe you'll use the time that you're saving to start flossing more often. 😬
 
 To learn more, visit [ohmyz.sh](http://ohmyz.sh) and follow [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter.
 
@@ -51,10 +51,22 @@ Oh My Zsh comes with a shitload of plugins to take advantage of. You can take a
 
 Once you spot a plugin (or several) that you'd like to use with Oh My Zsh, you'll need to enable them in the `.zshrc` file. You'll find the zshrc file in your `$HOME` directory. Open it with your favorite text editor and you'll see a spot to list all the plugins you want to load.
 
-For example, this line might begin to look like this:
+```shell
+vi ~/.zshrc
+```
+
+For example, this might begin to look like this:
 
 ```shell
-plugins=(git bundler osx rake ruby)
+plugins=(
+  git
+  bundler
+  dotenv
+  osx
+  rake
+  rbenv
+  ruby
+)
 ```
 
 #### Using Plugins
@@ -69,7 +81,7 @@ We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme
 
 _Robby's theme is the default one. It's not the fanciest one. It's not the simplest one. It's just the right one (for him)._
 
-Once you find a theme that you want to use, you will need to edit the `~/.zshrc` file. You'll see an environment variable (all caps) in there that looks like:
+Once you find a theme that you'd like to use, you will need to edit the `~/.zshrc` file. You'll see an environment variable (all caps) in there that looks like:
 
 ```shell
 ZSH_THEME="robbyrussell"
@@ -193,7 +205,7 @@ If you'd like to upgrade at any point in time (maybe someone just released a new
 upgrade_oh_my_zsh
 ```
 
-Magic!
+Magic! 🎉
 
 ## Uninstalling Oh My Zsh
 
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 966d7a975..bba2d370d 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -58,7 +58,9 @@ ZSH_THEME="robbyrussell"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git)
+plugins=(
+  git
+)
 
 source $ZSH/oh-my-zsh.sh
 
-- 
cgit v1.2.3-70-g09d2


From 2ff9560ad3fc6a3da256d34d0ba804b01d222293 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Fri, 23 Feb 2018 12:58:12 -0800
Subject: Adding link to our other open source projects page

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 541f48d40..a6d74cbd2 100644
--- a/README.md
+++ b/README.md
@@ -248,4 +248,4 @@ Oh My Zsh is released under the [MIT license](LICENSE.txt).
 
 ![Planet Argon](https://pa-github-assets.s3.amazonaws.com/PARGON_logo_digital_COL-small.jpg)
 
-Oh My Zsh was started by the team at [Planet Argon](https://www.planetargon.com/?utm_source=github), a [Ruby on Rails development agency](https://www.planetargon.com/skills/ruby-on-rails-development?utm_source=github).
+Oh My Zsh was started by the team at [Planet Argon](https://www.planetargon.com/?utm_source=github), a [Ruby on Rails development agency](https://www.planetargon.com/skills/ruby-on-rails-development?utm_source=github). Check out our [other open source projects](https://www.planetargon.com/open-source?utm_source=github).
-- 
cgit v1.2.3-70-g09d2


From 4fa4e5fe4ad356e1531bd60715b7e01f510ab083 Mon Sep 17 00:00:00 2001
From: Donncha Ó Cearbhaill <donncha@donncha.is>
Date: Sun, 15 Apr 2018 18:47:38 +0200
Subject: Use HTTPS for manual git clone to avoid  MITM (#6043)

The git:// transport is completely unauthenticated. An attacker on the local or upstream network can easily man-in-the-middle an oh-my-zsh update and get remote code execution on your system. Only the https:// git transport should be used.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index a6d74cbd2..128a07fb5 100644
--- a/README.md
+++ b/README.md
@@ -141,7 +141,7 @@ export ZSH="$HOME/.dotfiles/oh-my-zsh"; sh -c "$(curl -fsSL https://raw.githubus
 ##### 1. Clone the repository:
 
 ```shell
-git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
+git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
 ```
 
 ##### 2. *Optionally*, backup your existing `~/.zshrc` file:
-- 
cgit v1.2.3-70-g09d2


From 08153ff526dab352a1ddc991ada0076041f22f66 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 15 Jun 2018 18:55:39 +0200
Subject: Use https everywhere in the README

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 128a07fb5..b3651a99c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
   <img src="https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png" alt="Oh My Zsh">
 </p>
 
-Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration.
+Oh My Zsh is an open source, community-driven framework for managing your [zsh](https://www.zsh.org/) configuration.
 
 Sounds boring. Let's try again.
 
@@ -12,7 +12,7 @@ Once installed, your terminal shell will become the talk of the town _or your mo
 
 Finally, you'll begin to get the sort of attention that you have always felt you deserved. ...or maybe you'll use the time that you're saving to start flossing more often. 😬
 
-To learn more, visit [ohmyz.sh](http://ohmyz.sh) and follow [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter.
+To learn more, visit [ohmyz.sh](https://ohmyz.sh) and follow [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter.
 
 ## Getting Started
 
@@ -21,7 +21,7 @@ To learn more, visit [ohmyz.sh](http://ohmyz.sh) and follow [@ohmyzsh](https://t
 __Disclaimer:__ _Oh My Zsh works best on macOS and Linux._
 
 * Unix-like operating system (macOS or Linux)
-* [Zsh](http://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (`zsh --version` to confirm), check the following instruction here: [Installing ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH)
+* [Zsh](https://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (`zsh --version` to confirm), check the following instruction here: [Installing ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH)
 * `curl` or `wget` should be installed
 * `git` should be installed
 
@@ -215,7 +215,7 @@ If you want to uninstall `oh-my-zsh`, just run `uninstall_oh_my_zsh` from the co
 
 ## Contributing
 
-I'm far from being a [Zsh](http://www.zsh.org/) expert and suspect there are many ways to improve – if you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
+I'm far from being a [Zsh](https://www.zsh.org/) expert and suspect there are many ways to improve – if you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
 
 We also need people to test out pull-requests. So take a look through [the open issues](https://github.com/robbyrussell/oh-my-zsh/issues) and help where you can.
 
@@ -238,7 +238,7 @@ We're on the social media.
 
 ## Merchandise
 
-We have [stickers](https://shop.planetargon.com/products/ohmyzsh-stickers-set-of-3-stickers) and [shirts](http://shop.planetargon.com/products/ohmyzsh-t-shirts) for you to show off your love of Oh My Zsh. Again, this will help you become the talk of the town!
+We have [stickers](https://shop.planetargon.com/products/ohmyzsh-stickers-set-of-3-stickers) and [shirts](https://shop.planetargon.com/products/ohmyzsh-t-shirts) for you to show off your love of Oh My Zsh. Again, this will help you become the talk of the town!
 
 ## License
 
-- 
cgit v1.2.3-70-g09d2


From f319aa845dfa6b202e31dacf49ec8c2b2d5d17c2 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Mon, 25 Feb 2019 19:22:07 -0600
Subject: Updating Oh My Zsh shop URLs (#7619)

* Updating Oh My Zsh shop URLs

Linking directly to the Oh My Zsh inventory vs the top-level store with non-OMZ items.

* Updating link to Oh My Zsh products in the install script

* Updating link to Oh My Zsh shop products in the upgrade script

* Getting rid of 't-' in shirts for now
---
 README.md        | 2 +-
 tools/install.sh | 2 +-
 tools/upgrade.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index b3651a99c..d6c77a147 100644
--- a/README.md
+++ b/README.md
@@ -238,7 +238,7 @@ We're on the social media.
 
 ## Merchandise
 
-We have [stickers](https://shop.planetargon.com/products/ohmyzsh-stickers-set-of-3-stickers) and [shirts](https://shop.planetargon.com/products/ohmyzsh-t-shirts) for you to show off your love of Oh My Zsh. Again, this will help you become the talk of the town!
+We have [stickers, shirts, and coffee mugs available](https://shop.planetargon.com/collections/oh-my-zsh?utm_source=github) for you to show off your love of Oh My Zsh. Again, you will become the talk of the town!
 
 ## License
 
diff --git a/tools/install.sh b/tools/install.sh
index 2fb87cdaf..e2b33f640 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -105,7 +105,7 @@ main() {
   echo ''
   echo 'p.s. Follow us at https://twitter.com/ohmyzsh.'
   echo ''
-  echo 'p.p.s. Get stickers and t-shirts at https://shop.planetargon.com.'
+  echo 'p.p.s. Get stickers, shirts, and coffee mugs at https://shop.planetargon.com/collections/oh-my-zsh.'
   echo ''
   printf "${NORMAL}"
   env zsh -l
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 25b2de27a..d234c7f88 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -33,7 +33,7 @@ then
   printf '%s\n' '                        /____/                       '
   printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version."
   printf "${BLUE}${BOLD}%s${NORMAL}\n" "To keep up on the latest news and updates, follow us on twitter: https://twitter.com/ohmyzsh"
-  printf "${BLUE}${BOLD}%s${NORMAL}\n" "Get your Oh My Zsh swag at:  https://shop.planetargon.com/"
+  printf "${BLUE}${BOLD}%s${NORMAL}\n" "Get your Oh My Zsh swag at:  https://shop.planetargon.com/collections/oh-my-zsh"
 else
   printf "${RED}%s${NORMAL}\n" 'There was an error updating. Try again later?'
 fi
-- 
cgit v1.2.3-70-g09d2


From 934615480e8a008deda1a5330d8fbd47815b7cf4 Mon Sep 17 00:00:00 2001
From: Alec Ge <me@alec.ge>
Date: Tue, 26 Feb 2019 15:13:27 -0500
Subject: docs: fixed themes link for readme (#7620)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index d6c77a147..511e6aeff 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ Most plugins (should! we're working on this) include a __README__, which documen
 
 ### Themes
 
-We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme happy. We have over one hundred themes now bundled. Most of them have [screenshots](https://wiki.github.com/robbyrussell/oh-my-zsh/themes) on the wiki. Check them out!
+We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme happy. We have over one hundred themes now bundled. Most of them have [screenshots](https://github.com/robbyrussell/oh-my-zsh/wiki/Themes) on the wiki. Check them out!
 
 #### Selecting a Theme
 
-- 
cgit v1.2.3-70-g09d2


From 4ddb2e384ab0840b1d8a6d4c95770ef8a6c25fcc Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 4 Apr 2019 09:45:00 -0700
Subject: Introducing a Code of Conduct based on the Contributor Covenant
 project. Adding links from the README and CONTRIBUTING pages to this, too,
 along with an email address for reporting abusive behavior to. Closes #7733
 (#7734)

---
 CODE_OF_CONDUCT.md | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 CONTRIBUTING.md    |  4 ++-
 README.md          |  6 ++++-
 3 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 CODE_OF_CONDUCT.md

(limited to 'README.md')

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000..20ad1ccee
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies within all project spaces, and it also applies when
+an individual is representing the project or its community in public spaces.
+Examples of representing a project or community include using an official
+project e-mail address, posting via an official social media account, or acting
+as an appointed representative at an online or offline event. Representation of
+a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at ohmyzsh@planetargon.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ac263fd18..f575157c2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,8 +1,10 @@
 # CONTRIBUTING GUIDELINES
 
-Oh-My-Zsh is a community-driven project. Contribution is welcome, encouraged and appreciated.
+Oh-My-Zsh is a community-driven project. Contribution is welcome, encouraged, and appreciated.
 It is also essential for the development of the project.
 
+First, please take a moment to review our [code of conduct](CODE_OF_CONDUCT.md).
+
 These guidelines are an attempt at better addressing the huge amount of pending
 issues and pull requests. Please read them closely.
 
diff --git a/README.md b/README.md
index 511e6aeff..dd330d19e 100644
--- a/README.md
+++ b/README.md
@@ -213,12 +213,16 @@ Oh My Zsh isn't for everyone. We'll miss you, but we want to make this an easy b
 
 If you want to uninstall `oh-my-zsh`, just run `uninstall_oh_my_zsh` from the command-line. It will remove itself and revert your previous `bash` or `zsh` configuration.
 
-## Contributing
+## How do I contribute to Oh My Zsh?
+
+Before you participate in our delightful community, please read the [code of conduct](CODE_OF_CONDUCT.md).
 
 I'm far from being a [Zsh](https://www.zsh.org/) expert and suspect there are many ways to improve – if you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
 
 We also need people to test out pull-requests. So take a look through [the open issues](https://github.com/robbyrussell/oh-my-zsh/issues) and help where you can.
 
+See [Contributing](CONTRIBUTING.md) for more details.
+
 ### Do NOT send us themes
 
 We have (more than) enough themes for the time being. Please add your theme to the [external themes](https://github.com/robbyrussell/oh-my-zsh/wiki/External-themes) wiki page.
-- 
cgit v1.2.3-70-g09d2


From 177d11d30ecd978b68b08b86d7dabff4c3218280 Mon Sep 17 00:00:00 2001
From: Peter Stevenson <2e0pgs@gmail.com>
Date: Sat, 4 May 2019 17:36:29 +0100
Subject: readme: add notice about shell changes (#6288)

Add important notice about `chsh -s /bin/zsh` command requiring the user to log out and log back in to see the changes.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'README.md')

diff --git a/README.md b/README.md
index dd330d19e..38f6ae9f3 100644
--- a/README.md
+++ b/README.md
@@ -163,6 +163,7 @@ cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
 ```shell
 chsh -s /bin/zsh
 ```
+You must log out and log back in to see this change.
 
 ##### 5. Initialize your new zsh configuration
 
-- 
cgit v1.2.3-70-g09d2


From c8ac4038cf41112161de984d3f7eef8579eb085e Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 3 Jun 2019 16:47:54 +0200
Subject: installer: add documentation of new installer features to README

---
 README.md | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 61 insertions(+), 8 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 38f6ae9f3..3924c3a92 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,18 @@ sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/mas
 #### via wget
 
 ```shell
-sh -c "$(wget https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"
+sh -c "$(wget -O- https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
+```
+
+#### Manual inspection
+
+It's a good idea to inspect the install script from projects you don't yet know. You can do
+that by downloading the install script first, looking through it so everything looks normal,
+then running it:
+
+```shell
+curl -Lo install.sh https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh
+sh install.sh
 ```
 
 ## Using Oh My Zsh
@@ -69,6 +80,8 @@ plugins=(
 )
 ```
 
+_Note that the plugins are separated by whitespace. **Do not** use commas between them._
+
 #### Using Plugins
 
 Most plugins (should! we're working on this) include a __README__, which documents how to use them.
@@ -124,16 +137,53 @@ If you're the type that likes to get their hands dirty, these sections might res
 
 ### Advanced Installation
 
-Some users may want to change the default path, or manually install Oh My Zsh.
+Some users may want to manually install Oh My Zsh, or change the default path or other settings that
+the installer accepts (these settings are also documented at the top of the install script).
 
 #### Custom Directory
 
 The default location is `~/.oh-my-zsh` (hidden in your home directory)
 
-If you'd like to change the install directory with the `ZSH` environment variable, either by running `export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline like this:
+If you'd like to change the install directory with the `ZSH` environment variable, either by running
+`export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline
+like this:
+
+```shell
+ZSH="$HOME/.dotfiles/oh-my-zsh" sh install.sh
+```
+
+#### Unattended install
+
+If you're running the Oh My Zsh install script as part of an automated install, you can pass the
+flag `--unattended` to the `install.sh` script. This will have the effect of not trying to change
+the default shell, and also won't run `zsh` when the installation has finished.
 
 ```shell
-export ZSH="$HOME/.dotfiles/oh-my-zsh"; sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
+curl -Lo install.sh https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh
+sh install.sh --unattended
+```
+
+#### Installing from a forked repository
+
+The install script also accepts these variables to allow installation of a different repository:
+
+- `REPO` (default: `robbyrussell/oh-my-zsh`): this takes the form of `owner/repository`. If you set
+  this variable, the installer will look for a repository at `https://github.com/{owner}/{repository}`.
+
+- `REMOTE` (default: `https://github.com/${REPO}.git`): this is the full URL of the git repository
+  clone. You can use this setting if you want to install from a fork that is not on GitHub (GitLab,
+  Bitbucket...) or if you want to clone with SSH instead of HTTPS (`git@github.com:user/project.git`).
+
+  _NOTE: it's incompatible with setting the `REPO` variable. This setting will take precedence._
+
+- `BRANCH` (default: `master`): you can use this setting if you want to change the default branch to be
+  checked out when cloning the repository. This might be useful for testing a Pull Request, or if you
+  want to use a branch other than `master`.
+
+For example:
+
+```shell
+REPO=apjanke/oh-my-zsh BRANCH=edge sh install.sh
 ```
 
 #### Manual Installation
@@ -161,9 +211,10 @@ cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
 ##### 4. Change your default shell
 
 ```shell
-chsh -s /bin/zsh
+chsh -s $(which zsh)
 ```
-You must log out and log back in to see this change.
+
+You must log out from your user session and log back in to see this change.
 
 ##### 5. Initialize your new zsh configuration
 
@@ -173,8 +224,10 @@ Once you open up a new terminal window, it should load zsh with Oh My Zsh's conf
 
 If you have any hiccups installing, here are a few common fixes.
 
-* You _might_ need to modify your `PATH` in `~/.zshrc` if you're not able to find some commands after switching to `oh-my-zsh`.
-* If you installed manually or changed the install location, check the `ZSH` environment variable in `~/.zshrc`.
+* You _might_ need to modify your `PATH` in `~/.zshrc` if you're not able to find some commands after
+switching to `oh-my-zsh`.
+* If you installed manually or changed the install location, check the `ZSH` environment variable in
+`~/.zshrc`.
 
 ### Custom Plugins and Themes
 
-- 
cgit v1.2.3-70-g09d2


From b259cdf7e71ad6c3cc1a66a48c6c79cf63f38590 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Mon, 1 Jul 2019 08:01:24 -0700
Subject: s/might/may

After wandering into a few articles that discuss the difference between might and may...opting for may.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 3924c3a92..43dcdd3a2 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Oh My Zsh is an open source, community-driven framework for managing your [zsh](
 
 Sounds boring. Let's try again.
 
-__Oh My Zsh will not make you a 10x developer...but you might feel like one.__
+__Oh My Zsh will not make you a 10x developer...but you may feel like one.__
 
 Once installed, your terminal shell will become the talk of the town _or your money back!_ With each keystroke in your command prompt, you'll take advantage of the hundreds of powerful plugins and beautiful themes. Strangers will come up to you in cafés and ask you, _"that is amazing! are you some sort of genius?"_
 
-- 
cgit v1.2.3-70-g09d2


From 29fb617e6b6b18fc7bdfef74fc57bbdf0e2fe52b Mon Sep 17 00:00:00 2001
From: Mark Coleman <MEHColeman@users.noreply.github.com>
Date: Fri, 12 Jul 2019 13:16:00 +0100
Subject: readme: document oneliner unattended installation command (#7983)

The original suggestion for an unattended install downloads the installation script to a file, then runs that file with the --unattended argument. The install.sh file would be left behind after the suggested command was run.
This change passes the --unattended argument directly into sh. So, it's a nice one-liner like the default installation script, and it doesn't leave a dangling install.sh script.
---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 43dcdd3a2..78a5b56bd 100644
--- a/README.md
+++ b/README.md
@@ -159,8 +159,7 @@ flag `--unattended` to the `install.sh` script. This will have the effect of not
 the default shell, and also won't run `zsh` when the installation has finished.
 
 ```shell
-curl -Lo install.sh https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh
-sh install.sh --unattended
+sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" "" --unattended
 ```
 
 #### Installing from a forked repository
-- 
cgit v1.2.3-70-g09d2


From a6d71ddadb5c9c1f0ded8ecce228dcde1a23ad05 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 1 Oct 2019 21:11:18 +0200
Subject: Update README with up-to-date platform requirements

Co-authored-by: Emil Engler <me@emilengler.com>
Closes #8157
---
 README.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 78a5b56bd..2f23febf5 100644
--- a/README.md
+++ b/README.md
@@ -18,10 +18,8 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh) and follow [@ohmyzsh](https://
 
 ### Prerequisites
 
-__Disclaimer:__ _Oh My Zsh works best on macOS and Linux._
-
-* Unix-like operating system (macOS or Linux)
-* [Zsh](https://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (`zsh --version` to confirm), check the following instruction here: [Installing ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH)
+* A Unix-like operating system: macOS, Linux, BSD. On Windows: WSL is preferred, but cygwin or msys also mostly work.
+* [Zsh](https://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (run `zsh --version` to confirm), check the following instructions here: [Installing ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH)
 * `curl` or `wget` should be installed
 * `git` should be installed
 
-- 
cgit v1.2.3-70-g09d2