Commit Graph

143 Commits

Author SHA1 Message Date
Erik Johnson
d6b62f73a4 Update manpages to reflect 2015.2 rename to 2015.5 2015-05-06 11:13:13 -06:00
Erik Johnson
0504e7a184 Update Lithium docstrings in 2015.2 branch 2015-05-06 11:01:53 -06:00
Colton Myers
a18e017619 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/man/salt.1
    doc/ref/cli/salt.rst
2015-04-24 10:07:48 -06:00
Jonathan Ballet
19efd419b5 Improve state_output documentation
List all the available settings in the documentation and on the command
line.
Also, make the documentation clearer about the different possibilities.
2015-04-23 10:22:11 +02:00
Jacob Hammons
99abfd7755 Regenerated man pages 2015-04-21 11:33:30 -06:00
Jacob Hammons
32ef5ca397 Revert "Regenerated man pages"
This reverts commit 069a0cac71.
2015-04-21 11:27:31 -06:00
Jacob Hammons
069a0cac71 Regenerated man pages 2015-04-21 11:20:52 -06:00
Colton Myers
ccfcedbf6b Go back to the 2015.2 version of salt.7 2015-04-16 11:46:30 -06:00
Colton Myers
8d9874a78a Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-16 10:37:38 -06:00
Jacob Hammons
6e416fc300 Regenerated salt-call and salt.7 man pages Refs #22239 2015-04-14 13:56:31 -06:00
Jacob Hammons
7cb6c8fdcb Updated salt man page 2015-03-27 12:15:49 -06:00
Jacob Hammons
921d679065 Regenerated and updated man pages, updated release version in conf.py to 2014.7.2 2015-03-10 09:22:57 -06:00
Jacob Hammons
767a3c378d Updated man pages, updated copyright year in conf.py 2015-03-09 18:36:38 -06:00
Metin OSMAN
21a6f6f0e7 Add the ability to filter the map file with salt-cloud 2014-12-11 01:39:54 +01:00
Chris Martin
d03a2bf753 Remove an awkward comma splice in the docs. 2014-11-10 20:02:02 -08:00
Stephen Wood
1be08146c8 Fix minor typos. 2014-10-11 17:03:38 -07:00
Colton Myers
8d0bf0ee95 Merge branch '2014.7' into develop
Conflicts:
	salt/states/pip_state.py
2014-09-15 11:49:04 -06:00
Seth House
978931c470 Added salt-unity manpages
Closes #13937
2014-09-13 12:56:25 -06:00
Colton Myers
36ef47e7a2 Merge branch '2014.7' into develop
Conflicts:
	conf/minion
	salt/modules/mine.py
2014-09-02 10:43:31 -06:00
Jille Timmermans
4064a8cf4c Fix some documentation inconsistencies 2014-09-02 11:38:23 +02:00
Kamal Nasser
c613c08869 Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-25 13:42:01 -06:00
Joseph Hall
e90b55650e Merge pull request #15020 from Jille/typos
Fix two typos in docs
2014-08-15 08:21:13 -06:00
Sylvain Bellemare
9f6ecc4874 Removed duplicate occurrences of the word "the" 2014-08-11 16:05:29 +02:00
Jille Timmermans
1618c8d257 Fix typo in manpage: s/inetrfaces/interfaces/ 2014-08-11 15:42:03 +02:00
Kamal Nasser
825bb191bf Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-08 22:16:37 +03:00
Bertrand Janin
3cc6fb4fe7 Fix copy-pasta error in user_update example. 2014-07-18 08:32:40 -04:00
Thomas S Hatch
1577bf0fad Merge pull request #14178 from khrisrichardson/spelling
add sphinx spelling extension. enforce en_US
2014-07-14 15:43:33 -06:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
Volker Schwicking
92ff66b2e5 add signature-path to manpage 2014-07-10 11:33:39 +02:00
vs
11e25ed9d1 add documentation for salt-keys signature generation options to manpage 2014-07-10 02:16:22 -07:00
Thomas S Hatch
1cd95aa0c8 Revert "Sign the masters pub-key" 2014-06-30 15:04:53 -06:00
vs
f54b90b07c pylinting, better log messages, docstrings, no logic changes 2014-06-25 06:26:01 -07:00
Pedro Algarvio
1f0e0d4465 Remove doc/man/salt-api.7 2014-06-21 19:00:55 +01:00
Seth House
53bab586f4 Merged salt-api into Salt
Woot!

The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.

Conflicts:
	debian/changelog
	debian/control
	doc/conf.py
	doc/index.rst
	opt_requirements.txt
	salt/config.py
	salt/loader.py
2014-06-18 22:13:56 -06:00
Arnold Bechtoldt
04a0133945 updating homebrew installation URL 2014-05-19 20:27:43 +02:00
David Lindquist
1937eb85af Update all raw.github.com references to raw.githubusercontent.com
Per
https://developer.github.com/changes/2014-04-25-user-content-security/
raw.github.com is now served from raw.githubusercontent.com.
2014-04-29 14:29:34 -07:00
Pedro Algarvio
a1d446d1e5 Revert "Default to https instead of http"
This reverts commit 6fc260be9e.
2014-04-27 11:46:36 +01:00
Daniel Wallace
6fc260be9e Default to https instead of http
For everything that doesn't use python urllib
2014-04-26 20:20:32 -05:00
Seth House
dbc41bf5b5 Updated manpages for 0.8.4 2014-04-05 01:51:16 -06:00
viod
f6bd8415b3 Add the indication that pillar_roots should not be subdirectories of file_roots, as that won't work, everywhere it looks relevant. 2014-03-03 00:15:51 +01:00
Jens Rantil
302629bc72 Fix typo: maintinance => maintenance 2014-02-27 14:59:24 +01:00
David Lindquist
9c91539de7 Replace mentions of 0.18.0 with 2014.1.0 2014-02-14 17:01:57 -08:00
Daniel Wallace
7042099c14 [salt.cloud] missing a : in documentation 2014-02-08 22:05:14 -06:00
regilero
93f8cdc0f0 Doc: fix bad usage of requisite in man salt 2014-02-04 10:47:34 +01:00
Alexey Ivanov
d23ff3821e
codespell: grammar nazi
Run codespell[1] against sources.

[1] https://github.com/lucasdemarchi/codespell
2014-01-26 18:41:28 -08:00
Bruno Binet
c374214d4d Fix documentation related to docker port_bindings 2014-01-04 11:30:58 +01:00
Thomas S Hatch
1ef832d093 update man pages to 2014.1.0 2014-01-02 12:59:16 -07:00
Sylvestre Ledru
0d5afed1a8 Debian is not necessary a Linux. It can also be a Freebsd or HURD based 2013-11-19 17:23:56 +01:00
Jeffrey C. Ollie
b1fb52a680 fix more funcion => function typos 2013-11-15 14:50:17 -06:00
Pedro Algarvio
5feb449584 Add the missing salt-cloud man page. 2013-11-10 13:28:19 +00:00