From 6abba86969cd95466fa450baceb5400228ec4491 Mon Sep 17 00:00:00 2001 From: Caleb Hyde Date: Fri, 5 Dec 2014 09:47:26 -0600 Subject: [PATCH 1/4] Explicitly state Terminal; update link to Homebrew --- docs/starting/install/osx.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst index 3b31478..e765a9f 100644 --- a/docs/starting/install/osx.rst +++ b/docs/starting/install/osx.rst @@ -36,12 +36,13 @@ While OS X comes with a large number of UNIX utilities, those familiar with Linux systems will notice one key component missing: a decent package manager. `Homebrew `_ fills this void. -To `install Homebrew `_, -simply run +To `install Homebrew `_, open `Terminal` +(either via `Command-Spacebar` or from Finder, navigate to +`/Applications/Utilities/Terminal`) and run -.. code-block:: console + .. code-block:: console - $ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" + ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" The script will explain what changes it will make and prompt you before the installation begins. From 0559d84acac56b52f36383a499369ce99986d194 Mon Sep 17 00:00:00 2001 From: Caleb Hyde Date: Fri, 5 Dec 2014 09:50:16 -0600 Subject: [PATCH 2/4] Minor formatting fix --- docs/starting/install/osx.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst index e765a9f..27aedcc 100644 --- a/docs/starting/install/osx.rst +++ b/docs/starting/install/osx.rst @@ -40,7 +40,7 @@ To `install Homebrew `_, open `Terminal` (either via `Command-Spacebar` or from Finder, navigate to `/Applications/Utilities/Terminal`) and run - .. code-block:: console +.. code-block:: console ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" From 0f070bf3a71f92ae0fc22e3f2600cdc723dde551 Mon Sep 17 00:00:00 2001 From: Caleb Hyde Date: Fri, 5 Dec 2014 09:55:00 -0600 Subject: [PATCH 3/4] Restructured Text formatting, not Markdown --- docs/starting/install/osx.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst index 27aedcc..3eb65cb 100644 --- a/docs/starting/install/osx.rst +++ b/docs/starting/install/osx.rst @@ -36,9 +36,9 @@ While OS X comes with a large number of UNIX utilities, those familiar with Linux systems will notice one key component missing: a decent package manager. `Homebrew `_ fills this void. -To `install Homebrew `_, open `Terminal` -(either via `Command-Spacebar` or from Finder, navigate to -`/Applications/Utilities/Terminal`) and run +To `install Homebrew `_, open :file:`Terminal` +(either via ``Command-Spacebar`` or from Finder, navigate to +:file:`/Applications/Utilities/Terminal`) and run .. code-block:: console From dcecd4127e3029d77ccae11f1c58c517c03392f7 Mon Sep 17 00:00:00 2001 From: Caleb Hyde Date: Fri, 5 Dec 2014 11:19:25 -0600 Subject: [PATCH 4/4] Revert removal of user prompt; Don't prescribe which emulator to use --- docs/starting/install/osx.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst index 3eb65cb..f18ed09 100644 --- a/docs/starting/install/osx.rst +++ b/docs/starting/install/osx.rst @@ -36,13 +36,12 @@ While OS X comes with a large number of UNIX utilities, those familiar with Linux systems will notice one key component missing: a decent package manager. `Homebrew `_ fills this void. -To `install Homebrew `_, open :file:`Terminal` -(either via ``Command-Spacebar`` or from Finder, navigate to -:file:`/Applications/Utilities/Terminal`) and run +To `install Homebrew `_, open :file:`Terminal` or +your favorite OSX terminal emulator and run .. code-block:: console - ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" + $ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" The script will explain what changes it will make and prompt you before the installation begins.