Colton Myers
35425b14ad
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/man/salt-api.1
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt-key.1
doc/man/salt-master.1
doc/man/salt-minion.1
doc/man/salt-run.1
doc/man/salt-ssh.1
doc/man/salt-syndic.1
doc/man/salt-unity.1
doc/man/salt.1
doc/man/salt.7
salt/modules/pip.py
salt/states/user.py
2015-10-07 12:06:12 -06:00
Jacob Hammons
76dc8de71b
Assorted doc bugs
...
Refs #9051
Refs #13407
Refs #21475
Refs #14876
Refs #27005
2015-10-05 17:37:13 -06:00
Jacob Hammons
701f47a658
Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py
...
Added salt-proxy release notes topic
Added note to pip state for Refs #21845
Regenerated and versioned man pages
2015-09-01 17:09:35 -06:00
Joseph Hall
1e4f7aa574
Add man page for spm, change pillar to .orig
2015-06-30 09:45:13 -06:00
Thayne Harbaugh
6179839225
Improve documentation for nested nodegroup.
2015-04-09 01:43:18 -06:00
Thomas Jackson
23674c100d
Comma cleanup
2014-12-12 11:33:14 -08:00
Seth House
acb203c735
Added salt-api to CLI TOC
2014-06-20 10:20:58 -06:00
Erik Johnson
5db13960b1
Add links to targeting pages
2014-06-11 16:19:24 -05:00
Mike Place
cfa859c76e
Reconsile docs and fix build warnings.
2014-03-14 14:18:56 -06:00
Mike Place
d7873621b1
Wrapping up sub-TOCs.
2014-02-26 13:32:33 -07:00
Mike Place
6af7ff5dff
First pass at refactoring Salt documentation.
2014-02-26 13:31:11 -07:00
Erik Johnson
9c63495e04
Formatting fixes
...
This completes the documentation audit begun in cf365f7
2013-08-11 22:17:47 -05:00
Aurélien Geron
9690cd7908
cleaned up and finished kwargs parsing upgrade, added et fixed doc
2013-06-13 17:58:10 +02:00
Aurélien Geron
7e4634a3e1
Document the new compound-commands arguments parsing
2013-06-12 12:50:41 +02:00
yinchuan
3163cb5100
correct the doc for cli to fix issuse #5420
...
Hope that's a right fix.
https://github.com/saltstack/salt/issues/5420
2013-06-07 09:25:47 +08:00
Ryan P. Kelly
e08cd261ff
Generic keyword argument usage documentation
2012-10-01 20:13:34 -04:00
L.C. Rees
3315dad9e7
documentation updates
2012-05-22 22:43:12 -06:00
Thomas S Hatch
f8e518690c
some small fixes in the compound command doc
2012-04-03 11:48:27 -06:00
Gordon McAllister
72c2014767
War on typos
...
Also cleanup whitespace and break some long lines
2012-03-14 17:09:19 -07:00
Seth House
958347a7be
Spelling fixes
2012-01-21 21:38:28 -07:00
Thomas S Hatch
ddfef6e1c2
Add nodegroup targeting doc
2012-01-13 17:37:18 -07:00
Thomas S Hatch
6caf98e9d6
change syntax
2012-01-13 17:29:58 -07:00
Seth House
13ae216307
Added a versionadded directive for the new compound targeting
2011-12-07 23:42:05 -07:00
Thomas S Hatch
6edb7f4c38
dd some documentation for compond targets
2011-12-04 16:09:12 -07:00
Seth House
a912520cf8
Reorganized and reworded the contents page for better focus
...
Also moved the TOC to its own doc to provide a complete and
comprehensive overview. Removed some extra and unecessary toctree calls.
2011-10-30 12:41:14 -06:00
Seth House
280c5ec4eb
Moved configuration into its own doc
2011-10-30 12:41:14 -06:00
Thomas S Hatch
e3caf8d59c
Add execution matching docs
2011-06-25 20:04:09 -06:00
Thomas S Hatch
55b1f8ab7e
Add grains docs
2011-06-25 16:16:50 -06:00
Thomas S Hatch
e7dda28650
Add docs for compund command execution
2011-06-25 15:53:02 -06:00
Travis Cline
df6e523063
Added ability to load configuration from two new variables: SALT_MASTER_CONFIG and SALT_MINION_CONFIG
2011-06-20 21:24:45 -05:00
Seth House
fe434b872d
Moved manpages into Sphinx
2011-05-23 01:20:36 -06:00
