Commit Graph

4967 Commits

Author SHA1 Message Date
C. R. Oldham
5b33df9d19 Add docs for 2015.8.2+ changes 2015-10-12 14:55:19 -06:00
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
Justin Findlay
03400ef45b fix virtual fcn return doc indentation
Fixes #27724.
2015-10-07 11:49:16 -06:00
Justin Findlay
4b9128b491 Merge pull request #27732 from jacobhammons/26673
update docs for __virtual__ and __virtualname__
2015-10-07 11:29:31 -06:00
Jacob Hammons
75cc07cf10 noted that __virtual__ can return False and an error string 2015-10-07 09:48:46 -06:00
Jacob Hammons
3a52d3606b Updated saltstack2 theme to add SaltConf16 banner 2015-10-06 17:42:53 -06:00
Jacob Hammons
cbecd4f553 Updated saltstack2 theme to add SaltConf16 banner 2015-10-06 17:38:49 -06:00
Jacob Hammons
117e0c2bcc Added hardening topic based on the information in Refs #27088 2015-10-06 17:36:54 -06:00
Jacob Hammons
b928e1afa8 update docs for __virtual__ and __virtualname__
Refs #26673
2015-10-06 17:23:42 -06:00
Justin Findlay
6bddf80546 update __virtual__ return documentation
Related to #26755; fixes #27116; implements part of #27643.
2015-10-06 13:47:31 -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
1c51ce28a9 Update compound matcher docs to clarify the usage of alternate delimiters
Refs #26604
2015-10-05 17:29:39 -06:00
Jacob Hammons
5a3e72fc8e __ops__ to __opts__ 2015-10-05 15:00:56 -06:00
Jacob Hammons
5a9867aad1 initial engines topic, updates to windows repo docs
Refs #23239
Refs #27520
2015-10-05 14:22:59 -06:00
Gary Wright
84b6ee0c58 .pub as public key is what we should send to remote 2015-10-05 11:40:55 -06:00
avinassh
bfa0acfbfe Fix a typo 2015-10-05 08:58:51 -06:00
Stephen Medina
a9063a9745 fix typo in default pillar path
I am a newb and this threw me off for a bit. Wanted to make it consistent with the rest of the doc.
2015-10-02 16:50:28 -06:00
Mike Place
eb59cb8d1c Merge pull request #27614 from blueyed/doc-minor
doc: minor fixes to doc and comments
2015-10-02 09:34:02 -06:00
Jacob Hammons
1c8b32ce26 Updated windows software repository docs 2015-10-01 22:02:01 -06:00
Daniel Hahler
98a8c0f055 doc: minor fixes to doc and comments 2015-10-02 01:18:32 +02:00
rallytime
8dc047dc18 If external_up is set to None, don't stacktrace, just use the private ip. 2015-10-01 16:37:17 -06:00
Mike Place
c84a1edc1b Merge pull request #27568 from jacobhammons/man-pages-five
regenerated man pages
2015-10-01 09:39:37 -06:00
Justin Findlay
f2eb20f26b add autogenerated 2015.8.1 release notes 2015-09-30 22:51:36 -06:00
Jacob Hammons
ee4a3b3549 added changes list for 2015.8.1 2015-09-30 16:58:53 -06:00
Justin Findlay
4f0d55cda6 add 2015.5.6 release notes 2015-09-30 16:29:57 -06:00
Jacob Hammons
b59c03d20d regenerated man pages 2015-09-30 13:32:58 -06:00
Jacob Hammons
cc37dc1087 updated version in salt.7 2015-09-30 13:01:11 -06:00
Jacob Hammons
a9dcb23a13 regenerated man pages for 2015.8.1 2015-09-30 12:58:34 -06:00
Justin Findlay
3727d79bad edit mine doc for style and markup 2015-09-30 11:40:22 -06:00
Justin Findlay
7e037a4666 add doc motivating mine vs grains
Fixes #27518.
2015-09-30 11:40:22 -06:00
Mike Place
1f7ea7c764 Merge pull request #27517 from jacobhammons/install-docs
Updated install docs
2015-09-30 09:19:51 -06:00
Colton Myers
73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/cloud/gce.rst
    doc/topics/windows/windows-package-manager.rst
    salt/client/ssh/state.py
    salt/cloud/clouds/ec2.py
    salt/modules/defaults.py
    salt/modules/file.py
    salt/utils/cloud.py
2015-09-29 14:56:41 -06:00
Jacob Hammons
167fd2304e Fixed a duplicated link ID 2015-09-29 14:08:48 -06:00
Jacob Hammons
c05fa71f91 Updated install docs
Refs #27281
Refs #27179
2015-09-29 12:07:50 -06:00
Mike Place
931f593b51 Merge pull request #27483 from rallytime/fix-17103
Outputters should sync to output, not outputters, on the minion.
2015-09-29 09:33:08 -06:00
Mike Place
9c2c028953 Merge pull request #27484 from rallytime/bp-27434-and-27470
Back-port #27434 and #27470 to 2015.5
2015-09-29 09:32:03 -06:00
Mike Place
5de2ee35ab Minor doc fixup.
Language and grammar changes.
2015-09-28 17:19:21 -06:00
ZhiFeng Hu
af656c7e87 Doc: copy key to server via ssh-copy-id
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
2015-09-28 17:19:09 -06:00
rallytime
105528720b Outputters should sync to output, not outputters, on the minion.
Otherwise, the loader won't pick them up.

Fixes #17103
2015-09-28 16:53:53 -06:00
Seth House
64b54e668a Add fake pymongo version attribute for the docs
This bypasses the following traceback when building the docs.

File "/Users/shouse/src/salt/salt/salt/returners/mongo_future_return.py", line 72, in <module>
    version = '.'.join(version.split('.')[:2])
TypeError: 'Mock' object has no attribute '__getitem__'
2015-09-28 13:51:31 -06:00
twangboy
a996ea46e2 Added quotes to version numbers example
Fixes #27433
2015-09-28 12:52:59 -06:00
Joseph Hall
5dd1b70475 Merge pull request #27408 from rallytime/fix-27406-for-2015.5
Fix avail_locations function for the softlayer_hw driver in 2015.5
2015-09-25 17:34:50 -06:00
rallytime
39a4ae5a6c Remove hdd: 19 refs from SL docs - no longer available from SoftLayer. 2015-09-25 12:54:25 -06:00
Jonathan Ballet
97e69ebb97 doc: fix state's top documentation typo 2015-09-25 12:16:48 -06:00
Jonathan Ballet
33db0c27f8 doc: fix RAET links 2015-09-25 12:16:47 -06:00
Jacob Hammons
a9fdecada1 Fix css layout Refs #27389
sample typo fix in linux_acl
additional module folders listed in dynamic-modules
2015-09-25 11:25:14 -06:00
Meggie Woodfield
1c779700f6 Adding stretch label definition 2015-09-25 10:59:07 -06:00
rallytime
08c04da48b Document tty: True usage in salt-ssh roster file
Fixes #27354
2015-09-24 16:25:22 -06:00
Nicole Thomas
12a021da11 Merge pull request #27361 from cro/pxm_doc
Correct some issues with proxy minions
2015-09-24 10:03:38 -06:00
C. R. Oldham
928ef59a8a Merge pull request #27349 from jfindlay/doc_typos
add freebsd install docs to release notes
2015-09-24 07:51:02 -06:00