Jacob Hammons
8df5d53bb8
Refs #24235
2015-06-10 09:45:03 -06:00
Jacob Hammons
d45c4ed11f
Bug fixes and build errors
...
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
2015-06-05 17:32:35 -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
Colton Myers
8d9874a78a
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-16 10:37:38 -06:00
Michael Steed
70f1ca9ea5
Add missing command line options to man pages
...
Refs #22676
2015-04-14 17:32:56 -06:00
Michael Steed
5efb284c22
Update salt-call manpage to match cli help text
...
refs #22239
2015-04-14 11:52:55 -06:00
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
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
