Commit graph

43 commits

Author SHA1 Message Date
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3'
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/modules/all/index.rst
  - doc/topics/grains/index.rst
  - doc/topics/releases/2016.3.4.rst
  - doc/topics/spm/spm_formula.rst
  - doc/topics/tutorials/cron.rst
  - doc/topics/tutorials/index.rst
  - doc/topics/tutorials/stormpath.rst
  - salt/engines/slack.py
  - salt/log/handlers/fluent_mod.py
  - salt/modules/cyg.py
  - salt/modules/junos.py
  - salt/modules/namecheap_dns.py
  - salt/modules/namecheap_domains.py
  - salt/modules/namecheap_ns.py
  - salt/modules/namecheap_ssl.py
  - salt/modules/namecheap_users.py
  - salt/modules/reg.py
  - salt/modules/tomcat.py
  - salt/modules/vault.py
  - salt/modules/win_file.py
  - salt/modules/zpool.py
  - salt/output/highstate.py
  - salt/renderers/pass.py
  - salt/runners/cache.py
  - salt/states/boto_apigateway.py
  - salt/states/boto_iam.py
  - salt/states/boto_route53.py
  - salt/states/msteams.py
  - salt/states/reg.py
  - salt/states/win_iis.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/states/test_user.py
  - tests/support/helpers.py
  - tests/unit/cloud/clouds/test_openstack.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_junos.py
  - tests/unit/pillar/test_git.py
  - tests/unit/states/test_win_path.py
  - tests/unit/test_pillar.py
  - tests/unit/utils/test_format_call.py
  - tests/unit/utils/test_utils.py
  - tests/unit/utils/test_warnings.py
2018-06-01 14:54:12 -04:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings
Well, all but one, which we expect to see
2018-05-31 15:28:25 -05:00
David Boucha
0ceb8009c7 remove Stormpath module, states and docs 2017-08-14 16:03:00 -06:00
rallytime
02bfe7912c Remove more ":doc:" references from doc/* files 2016-12-15 15:36:44 -07:00
Mate Ory
d2f8f18430 doc: document what the argument of salt --subset means 2016-10-12 10:42:31 -06:00
Alexey Pakseykin
454b7b5815 Change docs for --static option with JSON - text B 2015-07-25 23:39:50 +08: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
Thomas Jackson
23674c100d Comma cleanup 2014-12-12 11:33:14 -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
steve
d13c7275a7 show_timeouts, new default 2014-08-14 13:10:52 -04: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
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
Pedro Algarvio
8185dbd75f Correct order and added missing options. 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
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
153475fa60 Target selection documentation now reside on it's own, common, document. 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
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
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
025736216f Add --versions-report to salt manpage 2012-12-14 06:43:05 -07:00
Thomas S Hatch
b6bd9bc616 update the sale manpage 2012-12-14 06:28:39 -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
Thomas S Hatch
099d37fcbe Update manpage for eauth 2012-10-23 14:31:12 -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
Sean Channel
6ffe36f322 misplaced space
"tot he" -> "to the"
2012-08-30 16:02:55 -07: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
Thomas S Hatch
345a6383e1 fix typo in man pages on Range target 2012-03-19 22:16:15 -06:00
Thomas S Hatch
297968df74 update salt manpage 2012-03-19 12:38:23 -06:00
Gordon McAllister
72c2014767 War on typos
Also cleanup whitespace and break some long lines
2012-03-14 17:09:19 -07:00
Thomas S Hatch
a010ffa9f3 Add deprecation warning to manpage for salt -Q 2012-02-25 23:41:41 -07:00
Thomas S Hatch
4d3c68c1c6 update the salt manpage for new features 2012-01-13 11:28:08 -07:00
Aaron Bull Schaefer
21d0aef86d Fix typo in man page's query option description 2012-01-07 15:34:57 -08:00
Christer Edwards
ba8f18c542 fix grains usage example and syntax
Port of change from e5aea88fbf which will get overwritten when the
manpages are generated from Sphinx.
2012-01-04 02:15:44 -07:00
Thomas S Hatch
46a3e538f3 update salt manpage for the new compound matcher 2011-12-04 15:34:01 -07:00
Seth House
fe434b872d Moved manpages into Sphinx 2011-05-23 01:20:36 -06:00