Merge branch 'develop' into stable for v2015.11.04 release

Author: s0undt3ch

AUTHORS.rst

@@ -18,6 +18,7 @@ bruce-one                   bruce-one
 C. R. Oldham                cro                    [email protected]
 Cam                         camereonsparr
 Chris Rebert                cvrebert               [email protected]
+Chris Buechler              cbuechler              [email protected]
 Christer Edwards            cedwards
 denmat                      denmat
 Dag Viggo Lokøen            dagvl                  [email protected]
@@ -28,6 +29,7 @@ Diego Woitasen              diegows                [email protected]
 Elias Probst                eliasp
 Erik Ankrom                 erikankrom
 Erik Johnson                terminalmage           [email protected]
+EYJ                         eyj
 Forrest Alvarez             gravyboat
 Fred Reimer                 freimer                [email protected]
 Geoff Garside               geoffgarside           [email protected]
@@ -53,6 +55,7 @@ Matthew Mead-Briggs         mattmb
 Matthew Willson             ixela
 Matthieu Guegan             mguegan
 Michael Scherer             mscherer
+Michele Bologna             mbologna               [email protected]
 Mike Carlson                m87carlson             [email protected]
 Mike Place                  cachedout              [email protected]
 nevins-b                    nevins-b
@@ -66,6 +69,7 @@ Pedro Paulo                 pedropaulovc
 Peter Tripp                 notpeter
 ptonelli                    ptonelli
 Raymond Barbiero            visualphoenix
+Rob Eden                    hedinfaok
 Roberto Aguilar             rca                    [email protected]
 Roman Inflianskas           rominf                 [email protected]
 Ronald van Zantvoort        The-Loeki              [email protected]

ChangeLog

@@ -1,3 +1,14 @@
+Version 2015.11.04:
+	* Allow bypassing dependencies installation. Thanks EYJ. #656.
+	* Add FreeBSD 11 support. Thanks Chris Buechler(cbuechler). #653
+	* Move RHEL installations to use repo.saltstack.com #674
+	* Move Debian 8 installation to use repo.saltstack.com #674
+	* Fix error finding python-jinja2 in RHEL 7. Thanks Rob Eden(hedinfaok). #654
+	* Move Ubuntu 12 and 14 installations to use repo.saltstack.com #674
+	* Move FreeBSD installations to use repo.saltstack.com #674
+	* Use dnf on Fedora 22 and later. Thanks Michele Bologna (mbologna). #665
+
+
 Version 2015.08.06:
 	* Fix python-requests installations for Ubuntu >= 14.04 LTS. #631, #632, #633
 	* Install python-crypto from Chris Lea's PPA for Ubuntu < 14.04

README.rst

@@ -9,7 +9,7 @@ script runs through a series of checks to determine operating system type and ve
 install the `Salt`_ binaries using the appropriate methods.
 
 
-.. Note::
+.. note::
 
   This ``README`` file is not the absolute truth to what the bootstrap script is capable of, for 
   that, please read the generated help by passing ``-h`` to the script or even better, `read the 
@@ -27,13 +27,14 @@ Bootstrap
 ---------
 
 If you're looking for the *one-liner* to install salt, please scroll to the bottom and use the
-instructions for `Installing via an Insecure One-Liner`_
+instructions for `Installing via an Insecure One-Liner`_.
 
 
 Examples
 ~~~~~~~~
 
-.. Note::
+.. note::
+
     In every two-step example, you would be well-served to examine the downloaded file and examine
     it to ensure that it does what you expect.
 
@@ -132,28 +133,41 @@ To install a specific branch from a git fork:
   sudo sh install_salt.sh -g https://github.com/myuser/salt.git git mybranch
 
 
+Any of the example above which use two-lines can be made to run in a single-line
+configuration with minor modifications, see `Installing via an Insecure One-Liner`_.
+
+
 Installing via an Insecure One-Liner
 ------------------------------------
 
 The following examples illustrate how to install Salt via a one-liner.
 
-.. Note::
+.. note::
+
     Warning! These methods do not involve a verification step and assume that the delivered file
     is trustworthy.
 
 
 Examples
 ~~~~~~~~
 
-Installing the latest develop branch of Salt:
+Installing the latest stable release of Salt (default):
 
 .. code:: console
 
-  curl -L https://bootstrap.saltstack.com | sudo sh -s -- git develop
+  curl -L https://bootstrap.saltstack.com | sudo sh -s -- stable
 
-Any of the example above which use two-lines can be made to run in a single-line
-configuration with minor modifications.
+or
 
+.. code:: console
+
+  curl -L https://bootstrap.saltstack.com | sudo sh -s
+
+Installing the latest develop branch of Salt:
+
+.. code:: console
+
+  curl -L https://bootstrap.saltstack.com | sudo sh -s -- git develop
 
 
 Adding support for other operating systems
@@ -325,7 +339,7 @@ Supported Operating Systems
 - CentOS 5/6/7
 - Debian 6/7/8
 - Fedora 17/18/20/21/22
-- FreeBSD 9.1/9.2/10
+- FreeBSD 9.1/9.2/10/11
 - Gentoo
 - Linaro
 - Linux Mint 13/14