Commit Graph

16 Commits

Author SHA1 Message Date
Jacob Hammons
499bd66378 Minor doc bug fixes
Refs #26403
Refs #26432
Refs #26233
Refs #26264
Refs #26329
2015-08-19 11:31:26 -06:00
Colton Myers
c3b7be0655 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	doc/topics/installation/rhel.rst
	salt/output/__init__.py
	salt/utils/__init__.py
2015-02-20 13:51:59 -07:00
Erik Johnson
396e234848 Update the RHEL installation guide
This updates the RHEL install instructions to reflect the new COPR for
installation on RHEL/CentOS 5.

Additionally, it provides better instructions on how to enable EPEL:

- We don't care about EPEL5, so this link has been removed.
- We needed a link for EPEL7, so this has been added.
- The old RPM installation example used hard-coded URLs to an arbitrary
  EPEL mirror. This is not a good idea since A) the mirror could go
  away, and B) we are unfairly sending people to a single mirror when
  the Fedora Project has a perfectly good link on their wiki to send
  people to a "random" mirror. The install example now uses these links.
2015-02-20 11:59:19 -06:00
Thomas Jackson
0f4a23b93a Trailing whitespace cleanup 2014-12-11 07:53:19 -08:00
Erik Johnson
6902e829dd Add warning on RHEL ZMQ4 docs regarding python-hashlib 2014-11-14 11:51:42 -06:00
Erik Johnson
706f53941b Add notice on automatic installation of repoquery 2014-10-24 16:15:48 -05:00
Erik Johnson
391a07e6ac Add info on upgrading to ZeroMQ 4 2014-10-08 16:51:33 -05:00
Erik Johnson
645ac140c0 Add information on yum-utils requirement for yum pkg mgmt 2014-03-05 12:09:07 -06:00
Mike Place
2637fc689f Docs build cleanly! Yay! 2014-02-26 13:32:33 -07:00
Chris Rebert
bf530eeb27 correctly capitalize GitHub 2013-07-02 19:23:44 -07:00
Colton Myers
3bb7366574 Add docs for enabling EPEL in RHEL 2013-06-12 17:17:44 -06:00
Colton Myers
75e9c9d61e Fix some formatting 2013-06-12 17:17:35 -06:00
Gary Wilson Jr
bd499e5640 Fixed several minor misspellings and acronym capitalizations. 2013-03-18 16:42:57 -05:00
John Albietz
f8ce121a27 restructured text formatting...
fixed invalid formatting.
2013-02-06 09:51:16 -08:00
ydavid365
36a881a2ca minion, not master. 2013-02-05 15:44:13 -08:00
ydavid365
18aebcdaf4 split fedora and rhel documentation. updated index. 2013-02-05 02:40:59 -08:00