Commit Graph

182 Commits

Author SHA1 Message Date
Thayne Harbaugh
6179839225 Improve documentation for nested nodegroup. 2015-04-09 01:43:18 -06:00
Erik Johnson
175ba127be Merge branch '2014.7' into 2014.7-2015.2
Conflicts:
	salt/modules/archive.py
2015-01-14 14:26:22 -06:00
rallytime
4a1a5123f2 Remove old --out options from salt-cloud docs
Fixes #19453
2015-01-13 21:39:27 -07:00
Thomas Jackson
23674c100d Comma cleanup 2014-12-12 11:33:14 -08:00
Thomas S Hatch
e094b0136f Merge pull request #18902 from jacksontj/develop
More grammar/style cleanup
2014-12-12 09:40:55 -07:00
Metin OSMAN
d0799a864c Update documentation 2014-12-11 22:25:29 +01:00
Thomas Jackson
68c0dc0717 Whitespace cleanup 2014-12-11 07:53:20 -08:00
Henrik Holmboe
1f3ba9ced5 Add possible values to arguments in Salt man-page 2014-11-03 21:27:14 +01:00
Henrik Holmboe
d3da8549a2 Typo jod -> job 2014-11-03 21:26:28 +01:00
Henrik Holmboe
878a227837 Choose vs chose typo 2014-11-03 20:54:39 +01: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
Thomas S Hatch
39b107a283 Merge pull request #14820 from steverweber/add_conf_help
show_timeouts, new default
2014-09-02 12:13:31 -06:00
rallytime
cfcfb4bdac Change --list-profiles to accept an argument such as "linode" or "all" 2014-08-26 08:03:39 -06:00
rallytime
0f4f68eddf Add --list-providers and --list-profiles to cloud docs 2014-08-26 00:18:57 -06:00
steve
d13c7275a7 show_timeouts, new default 2014-08-14 13:10:52 -04:00
Erik Johnson
2849950bce Docs cleanup
Fixes double-colons by making them code-block directives, so they do not
erroneously show up as "PYTHON" blocks. Also corrects a few instances of
2nd person pronoun usage.
2014-07-13 11:02:33 -05:00
rallytime
f0d9db2497 Removed the term "Hydrogen" from versionadded notation 2014-07-01 15:01:12 -06:00
Seth House
acb203c735 Added salt-api to CLI TOC 2014-06-20 10:20:58 -06: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
Erik Johnson
5db13960b1 Add links to targeting pages 2014-06-11 16:19:24 -05:00
Pedro Algarvio
7bd8b1360f Remove remaining exsel code 2014-05-29 01:32:54 +01:00
Mike Place
0c9f7eb356 Merge pull request #11983 from xenuser/fix_11961
Refs #11961: Add a short note regarding --show-timeout in the salt manpage
2014-04-14 13:15:10 -06:00
Valentin Hoebel
ff07ccac94 Refs #11961: Add a short note regarding --show-timeout in the salt manpage 2014-04-14 21:11:01 +02:00
Aditya Kulkarni
2b97fbfd1b Add a note about outputter color codes 2014-03-26 14:16:59 -04: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
Bogdan Radulescu
ff4342adcb Add two options in the salt-ssh documentation 2014-02-05 16:32:16 +02:00
pille
3eee5d8697 fix doc typo 2014-02-03 11:19:11 +01:00
Erik Johnson
e13b253f67 Add --roster-file online docs option (new in 2014.1.0) 2014-01-22 11:24:29 -06:00
Erik Johnson
40cd458d70 Correct salt-ssh docs inaccuracy 2014-01-22 11:18:09 -06:00
Erik Johnson
1c24bbe7fc Update salt-key documentation
Bring docs.saltstack.com in line with the CLI usage
2013-11-28 12:05:37 -06:00
Henrik Holmboe
c1bb9d5619 Upcase SSH in Salt SSH. 2013-11-24 00:18:40 +01:00
Seth House
e4f638e6d7 Moved salt-cloud documentation into main docs dir 2013-11-08 14:08:36 -07:00
Wari Wahab
d2094f8b60 Fixed all typos I can find 2013-10-25 16:26:57 +08:00
Forrest Alvarez
1c043c3d45 Updated the salt-ssh.rst to add the new options that are available via the command line. Modified the ssh index.rst to include a link to the salt-ssh cli commands page. Updated parsers.py to fix the default value that is present in the documentation from 5 to 25 (as 25 is the actual default). Updated roster.rst to note that the default file location is /etc/salt/roster since it was absent, and might be confusing if you head to the roster documentation before reading the rest of the salt-ssh documentation. 2013-09-29 05:16:13 +00:00
Justin Carmony
7e2389782c Adding versionadd's for salt cli ref and salt.states.file to denote some new 0.17 features 2013-09-19 11:22:03 -06:00
Erik Johnson
9c63495e04 Formatting fixes
This completes the documentation audit begun in cf365f7, using proper
backticks and :strong: tags to emphasize text, converting groups of
shell commands to bash code-block sections, etc. This also replaces the
use of \* with the easier-to-grok '*', which will hopefully reduce
confusion among new users.
2013-08-11 22:17:47 -05:00
Chris Rebert
25ff009ee9 Some docs copyediting & formatting 2013-08-10 22:43:12 -07:00
Pedro Algarvio
23052f6c95 Let the note stand out. 2013-08-10 16:06:30 +01:00
Pedro Algarvio
30828a7c01 Re add the JSON note lost in a rebase. 2013-08-10 15:39:04 +01:00
Pedro Algarvio
8185dbd75f Correct order and added missing options. 2013-08-10 15:37:38 +01:00
Pedro Algarvio
86521e62e8 salt-ssh does not provide --return. 2013-08-10 15:37:38 +01:00
Pedro Algarvio
19cdcd9970 Ordered the options output of salt-key added missing finger options. 2013-08-10 15:37:38 +01:00
Pedro Algarvio
a611a35fe1 salt-run also has the doc option. 2013-08-10 15:37:38 +01:00
Pedro Algarvio
836a557804 The timeout is now on a common document.
Added the missing includes.
2013-08-10 15:37:37 +01:00
Pedro Algarvio
fe43bb6558 Match option order and add missing --master. 2013-08-10 15:37:37 +01:00
Pedro Algarvio
13c7255980 Common daemon options are now on a separate document. 2013-08-10 15:37:37 +01:00
Pedro Algarvio
c304872ab1 General options are now on a common document. 2013-08-10 15:37:37 +01:00
Pedro Algarvio
3fd8ac7924 Logging options is now on it's own, common, document.
* Added logging options for all the CLI tools that supported it and were lacking them.
2013-08-10 15:37:37 +01:00
Pedro Algarvio
5268601ef6 Fix include path. 2013-08-10 15:37:37 +01:00
Pedro Algarvio
153475fa60 Target selection documentation now reside on it's own, common, document. 2013-08-10 15:37:37 +01:00
Pedro Algarvio
d009a82998 Add --output-file to the documentation. Minor formatting update. 2013-08-10 15:37:37 +01:00
Pedro Algarvio
f94e9f5e02 Add --force-color to the documentation. 2013-08-10 15:37:37 +01:00
Pedro Algarvio
9f47a1a0ad CLI Output options now reside on it's own, common, document. 2013-08-10 15:37:33 +01:00
Joseph Hall
e940f60c3c Merge pull request #6600 from TheRealBill/develop
Adding some clarification about the use of --out=json and the output.
2013-08-09 12:47:08 -07:00
Bill Anderson
5cc8142d2a Adding some clarification about the use of --out=json and the output. 2013-08-09 14:11:41 -05:00
Thomas S Hatch
b12ce6c6e8 Start on salt-ssh manpage 2013-07-06 21:33:46 -06: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
Erik Johnson
f2b036b625 Update salt-key manpage to reflect changes to "-l" arg 2013-06-06 17:44:52 -05:00
Thomas S Hatch
4240e55b55 Add --async to the salt man page 2013-03-23 15:49:00 -06:00
Gary Wilson Jr
bd499e5640 Fixed several minor misspellings and acronym capitalizations. 2013-03-18 16:42:57 -05:00
John Albietz
cb5a69150f static doesn't take arguments. 2013-02-27 13:07:39 -08:00
Thomas S Hatch
d18d77c609 Add some extra docs on the timeout 2013-01-30 01:14:09 -07:00
Thomas S Hatch
5bee3b8c15 update salt-syndic manpage 2012-12-14 06:48:46 -07:00
Thomas S Hatch
49dfd75660 remove deprecated --config 2012-12-14 06:48:11 -07:00
Thomas S Hatch
e12df0b745 update the salt-run manpage 2012-12-14 06:47:26 -07:00
Thomas S Hatch
1924df2f4b update the salt-minion manpage 2012-12-14 06:46:30 -07:00
Thomas S Hatch
64655a2ca4 Add version options to salt-key manpage 2012-12-14 06:45:31 -07:00
Thomas S Hatch
61792628ae Add --versions-report to salt-call manpage 2012-12-14 06:44:23 -07:00
Thomas S Hatch
025736216f Add --versions-report to salt manpage 2012-12-14 06:43:05 -07:00
Thomas S Hatch
eb1f18f3dc update salt-master manpage 2012-12-14 06:42:18 -07:00
Thomas S Hatch
a98c05f5fe update salt-key manpage 2012-12-14 06:39:38 -07:00
Thomas S Hatch
7feabb7043 update salt-call manpage 2012-12-14 06:32:23 -07:00
Thomas S Hatch
b6bd9bc616 update the sale manpage 2012-12-14 06:28:39 -07:00
Thomas S Hatch
66716492d0 change salt-call manpage with outputter option 2012-12-14 06:20:22 -07:00
Thomas S Hatch
e9f7f5dc2c -Q has been gone for a while! And add --out to salt manpage 2012-12-14 06:18:49 -07:00
Seth House
83724b99f0 Updated the CLI docs 2012-10-25 15:44:22 -06:00
Thomas S Hatch
099d37fcbe Update manpage for eauth 2012-10-23 14:31:12 -06:00
Dave Boucha
acdbd79652 Update docs regarding recent update to salt-key -d 2012-10-16 09:31:49 -06:00
Erik Johnson
3eed6c857e Add Subnet/IP address matcher
This implements #653. Note that there appears to be an underlying
problem with how highstates instantiate Matcher objects, which is
keeping this from working in an SLS file. See issue #2167 for more
details on that.
2012-10-04 13:02:59 -05:00
Ryan P. Kelly
e08cd261ff Generic keyword argument usage documentation 2012-10-01 20:13:34 -04:00
Jeff Bauer
8daf10e373 update salt-key man page 2012-09-25 14:31:16 -05:00
Thomas S Hatch
bcc1dbbca8 Add the doc tree for salt-api 2012-09-24 14:17:56 -06:00
Sean Channel
9572e67d11 minimal description added per Issue #1605
manpage had no description. the added text is excerpted from salt(7).

pls. advise if there are other/better ways to update docs.
2012-09-09 12:05:10 -07:00
Sean Channel
6ffe36f322 misplaced space
"tot he" -> "to the"
2012-08-30 16:02:55 -07:00
Thomas S Hatch
8883bb6442 Update man page source 2012-08-02 20:58:52 -06:00
Thomas S Hatch
ab7e02544e Add verbose flag to salt manpage 2012-07-12 11:46:56 -06:00
L.C. Rees
3315dad9e7 documentation updates 2012-05-22 22:43:12 -06:00
Baiju Muthukadan
1bbb280581 Add 'See also' section to man pages 2012-05-11 03:40:39 +05:30
Thomas S Hatch
f8e518690c some small fixes in the compound command doc 2012-04-03 11:48:27 -06:00
Thomas S Hatch
345a6383e1 fix typo in man pages on Range target 2012-03-19 22:16:15 -06:00
Thomas S Hatch
66cb8daba7 Update salt-syndic manpage 2012-03-19 12:58:15 -06:00
Thomas S Hatch
bf6117cb53 update salt-minion manpage 2012-03-19 12:57:46 -06:00
Thomas S Hatch
efca4be049 update salt-master manpage 2012-03-19 12:54:49 -06:00
Thomas S Hatch
91ecf8e550 update manpage salt-call 2012-03-19 12:47:05 -06:00
Thomas S Hatch
66f2674f8b update salt-key manpage 2012-03-19 12:44:24 -06:00