Colton Myers 95fe811724 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/minion.py salt/modules/network.py salt/scripts.py salt/states/file.py salt/states/git.py salt/utils/event.py		2015-12-18 15:00:24 -07:00
..
arch.rst	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-02-23 14:25:51 -07:00
debian.rst	Append missing wget in debian installation guide	2015-12-16 13:44:35 -08:00
fedora.rst	Minor doc bug fixes	2015-08-19 11:31:26 -06:00
freebsd.rst	Updated FreeBSD installation docs:	2015-11-02 11:31:23 -05:00
gentoo.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
index.rst	Add OpenBSD installation documentation to 2015.5 branch	2015-10-20 09:13:28 -06:00
openbsd.rst	Add OpenBSD installation documentation to 2015.5 branch	2015-10-20 09:13:28 -06:00
osx.rst	Note change in yosemite max values and warn.	2015-03-12 10:02:53 -06:00
rhel.rst	Fix a typo in the gpgkey URL	2015-12-17 10:48:24 -05:00
solaris.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
suse.rst	states/pkgrepo examples, suse installation updates	2015-09-02 11:37:40 -06:00
ubuntu.rst	Updated Debian, RHEL / Cent, Ubuntu installation instructions with new repo structure for 2015.8.3. Added CVE-2015-8034 to release notes.	2015-12-03 10:55:32 -07:00
windows.rst	Fix typo sofwares -> software	2015-11-04 10:59:22 +01:00