Move nightly .phar info to standard install section. Cleanup tabs.

chrfritsch · Nov 27, 2015 · d46aa40 · d46aa40
1 parent 3657fa9
commit d46aa40
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 22 deletions.
diff --git a/docs/install-alternative.md b/docs/install-alternative.md
@@ -1,35 +1,28 @@
 Install a global Drush via Composer
 ------------------
-Follow the instructions below, or [watch a video by Drupalize.me](https://youtu.be/eAtDaD8xz0Q).		
-		
-1. [Install Composer globally](https://getcomposer.org/doc/00-intro.md#globally).		
+Follow the instructions below, or [watch a video by Drupalize.me](https://youtu.be/eAtDaD8xz0Q).
+
+1. [Install Composer globally](https://getcomposer.org/doc/00-intro.md#globally).
 1. Add composer's `bin` directory to the system path by placing `export PATH="$HOME/.composer/vendor/bin:$PATH"` into your ~/.bash_profile (Mac OS users) or into your ~/.bashrc (Linux users).		
 1. Install latest stable Drush: `composer global require drush/drush`.		
 1. Verify that Drush works: `drush status`				
-		
+
 #### Notes		
-* Update to latest release (per your specification in ~/.composer/composer.json): `composer global update`		
+* Update to latest release (per your specification in ~/.composer/composer.json): `composer global update`
 * Install a specific version of Drush:		
-
-        # Install a specific version of Drush, e.g. Drush 7.1.0		
-        composer global require drush/drush:7.1.0		
-
-        # Install master branch as a git clone. Great for contributing back to Drush project.		
-        composer global require drush/drush:dev-master --prefer-source        		
-
-* Alternate way to install for all users via Composer:		
-
-        COMPOSER_HOME=/opt/drush COMPOSER_BIN_DIR=/usr/local/bin COMPOSER_VENDOR_DIR=/opt/drush/7 composer require drush/drush:7		
-
-* [Documentation for composer's require command.](http://getcomposer.org/doc/03-cli.md#require)
-* Uninstall with : `composer global remove drush-ops/drush`
 
-Install a .phar from master branch
-----------------------------------
+        # Install a specific version of Drush, e.g. Drush 7.1.0
+        composer global require drush/drush:7.1.0
 
-Drush's [master branch](https://github.com/drush-ops/drush/commits/master) is mostly stable.
+        # Install master branch as a git clone. Great for contributing back to Drush project.
+        composer global require drush/drush:dev-master --prefer-source
 
-Follow the normal [installation instructions](http://docs.drush.org/en/master/install/), except change the download URL to [http:/files.drush.org/drush-unstable.phar](https:/files.drush.org/drush-unstable.phar)
+* Alternate way to install for all users via Composer:
+
+        COMPOSER_HOME=/opt/drush COMPOSER_BIN_DIR=/usr/local/bin COMPOSER_VENDOR_DIR=/opt/drush/7 composer require drush/drush:7
+
+* [Documentation for composer's require command.](http://getcomposer.org/doc/03-cli.md#require)
+* Uninstall with : `composer global remove drush-ops/drush`
 
 Windows
 ------------

diff --git a/docs/install.md b/docs/install.md
@@ -3,6 +3,7 @@ Install/Upgrade a global Drush
 ```bash    
 # Download latest stable release using the code below or browse to github.com/drush-ops/drush/releases.
 wget http://files.drush.org/drush.phar
+# Or use our upcoming release: wget http://files.drush.org/drush-unstable.phar  
 
 # Test your install.
 php drush.phar core-status