Nitin Madhok
b7f43d34f8
Update instances of install_salt.sh.sh
2014-09-24 12:16:48 -04:00
Colton Myers
99e97320e1
Merge branch '2014.7' into develop
...
Conflicts:
doc/ref/configuration/minion.rst
doc/ref/states/requisites.rst
doc/topics/troubleshooting/master.rst
doc/topics/tutorials/index.rst
doc/topics/tutorials/intro_scale.rst
salt/config.py
salt/key.py
salt/master.py
salt/minion.py
salt/modules/file.py
salt/modules/hashutil.py
salt/modules/lxc.py
salt/modules/oracle.py
salt/modules/tls.py
salt/modules/win_update.py
salt/pillar/pepa.py
salt/pillar/s3.py
salt/states/augeas.py
salt/states/win_update.py
salt/tops/ext_nodes.py
salt/utils/master.py
2014-09-22 14:22:54 -06:00
Erik Johnson
36d59944d1
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Erik Johnson
c094f8bd68
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Erik Johnson
604a131f6f
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Hung Nguyen Viet
d47b8be40f
remove duplicate entry, it was in advanced topics
2014-09-16 14:16:17 +07:00
Nitin Madhok
b7d5b2cde2
Fixing sphinx violations and errors
2014-09-12 13:28:01 -04:00
Thomas S Hatch
d6e3e01c6d
Merge pull request #15392 from ihrwein/f/add-syslog-ng-modules
...
F/add syslog ng modules
2014-09-12 10:37:02 -06:00
Thomas S Hatch
e34e81f41b
Merge branch '2014.7' into develop
...
Conflicts:
salt/minion.py
2014-09-05 11:03:12 -06:00
rallytime
e5a1876462
Update multimaster tutorial
2014-09-04 12:58:19 -06:00
Thomas S Hatch
2f6ae96f37
Merge branch '2014.7' into develop
...
Conflicts:
salt/client/ssh/__init__.py
2014-09-03 14:43:07 -06:00
Erik Johnson
3c800cdd5f
Add pygit2 install link to gitfs walkthrough
2014-09-02 23:33:11 -05:00
Colton Myers
4214f8dc2b
Merge branch '2014.7' into develop
...
Conflicts:
salt/utils/network.py
2014-09-02 16:35:03 -06:00
Erik Johnson
510942d3ec
Remove references to masterless salt from gitfs docs
...
Alternate backends do not yet work with the local fileclient.
2014-09-02 15:59:05 -05:00
Erik Johnson
9b2fc52e93
Fix duplicate word
2014-09-02 15:31:13 -05:00
Erik Johnson
ac944272e0
Fix spelling error
2014-09-02 15:27:44 -05:00
Mike Place
8c737afa1e
Merge branch '2014.7' into develop
...
Conflicts:
salt/utils/cloud.py
2014-09-02 14:20:04 -06:00
Erik Johnson
ba3e0367c6
Remove extraneous word
2014-09-02 15:16:32 -05:00
Mike Place
be60e25574
Merge branch '2014.7' into develop
2014-09-02 13:56:54 -06:00
Erik Johnson
0a5bc21b58
More gitfs documentation clarifications/corrections
2014-09-02 14:37:52 -05:00
Erik Johnson
0ae4a108b7
Clarify outdated information in gitfs walkthrough
...
This paragraph predates the addition of pygit2 and dulwich support, and
seems to suggest that GitPython is required for gitfs, when that is no
longer necessarily true. This commit clarifies the wording here.
2014-09-02 13:22:56 -05:00
Jille Timmermans
4064a8cf4c
Fix some documentation inconsistencies
2014-09-02 11:38:23 +02:00
Simon Schmidt
f4c9ec24de
Fix saltutil.refresh_pillar reference in Pillar tutorial
...
It used to reference `saltutil.pillar_refresh` which gives the error:
'saltutil.pillar_refresh' is not available.
2014-09-01 20:38:50 +02:00
Joseph Hall
4e29954710
Update Esky docs for clarity, and remove 2nd person
2014-08-30 19:50:32 -06:00
btibi
69b0deacf6
syslog_ng: add syslog-ng state and execution modules
2014-08-29 23:20:25 +02:00
Colton Myers
ad89a752f8
Merge branch '2014.7' into develop
...
Conflicts:
salt/cloud/__init__.py
salt/utils/cloud.py
2014-08-25 13:29:29 -06:00
Joseph Hall
0b546aeadd
Merge pull request #15234 from cachedout/pillar_refresh_doc
...
Add info about pillar refresh.
2014-08-25 11:12:54 -06:00
Erik Johnson
41a0753518
Add ssh_config example for GitPython
2014-08-25 12:06:29 -05:00
Mike Place
0d03e31fb7
Add info about pillar refresh.
2014-08-25 10:56:55 -06:00
Chris Rebert
a53ae15d23
copyedits
2014-08-22 11:59:13 -07:00
Thomas S Hatch
f0009be6c2
Merge branch '2014.7' into develop
2014-08-21 17:20:26 -06:00
Erik Johnson
5444c68437
Update docs to reflect pygit2 auth support in 0.20.3
2014-08-20 23:54:48 -05:00
Erik Johnson
c8be676577
Update gitfs documentation
...
This adds all the new authentication options, and also moves most of the
usage examples into the gitfs walkthrough. The walkthrough has also
undergone considerable restructuring.
2014-08-20 21:36:44 -05:00
Joseph Hall
725f2d8969
Typo correction
2014-08-14 14:31:25 -06:00
Joseph Hall
130755c0b1
Adding http libraries and modules
2014-08-14 13:33:12 -06:00
Seth House
b5bf67fdd1
Merge branch 'copyediting' of https://github.com/hulu/salt into develop
...
Conflicts:
salt/states/win_update.py
2014-08-11 18:23:44 -04:00
Chris Rebert
177c168a21
Fix numerous typos found via Lintian
...
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
2014-08-11 10:46:43 -07:00
Nitin Madhok
41712eab04
Fixing more sphinx warnings and errors
2014-08-11 12:33:55 -04:00
Thomas S Hatch
996bae04cd
Add clarity note in the docs
2014-08-07 12:08:14 -06:00
Alfredo Palhares
145670b459
Add missing lines between the code block declaration and the body
2014-08-05 00:40:18 +01:00
Seth House
ab508cb9d3
Fix maxdepth TOC for Salt at Scale tutorials
2014-08-01 12:05:22 -06:00
Hung Nguyen Viet
415623a9c6
fix link scheme, default scheme is HTTPS, as used sample configs
...
provided by the tut
2014-08-01 15:56:58 +07:00
rallytime
8dcedf684d
Change more affected docs from Helium to 2014.7.0
2014-07-15 17:02:19 -06:00
vs
b1142570bc
add note that points to multimaster_pki as an alternative setup
2014-07-15 03:42:39 -07:00
vs
f1a4b30020
add note that points to mulitmaster as an alternative setup
2014-07-15 03:42:21 -07:00
vs
f440b0f111
link in the multimaster_pki_tutorial
2014-07-15 03:41:12 -07:00
Thomas S Hatch
024485fb36
Merge pull request #14204 from terminalmage/docs
...
Fix the rest of the double-colons in docs
2014-07-14 16:01:13 -06:00
Thomas S Hatch
1577bf0fad
Merge pull request #14178 from khrisrichardson/spelling
...
add sphinx spelling extension. enforce en_US
2014-07-14 15:43:33 -06:00
Erik Johnson
57096ca59c
Convert double-colon to code-block
2014-07-14 12:37:13 -05:00
Erik Johnson
cc43b3cf4d
Fix double-colon and remove redundant section
...
There is a section in part 2 that is already covered in-depth in part 1,
this commit removes it.
2014-07-14 12:34:03 -05:00
Thomas S Hatch
d2ca043327
Merge pull request #14195 from felskrone/master_signing_tutorial
...
Master signing tutorial
2014-07-14 11:17:16 -06:00
Volker Schwicking
d7b46395ff
headings increased
2014-07-14 17:32:16 +02:00
Volker Schwicking
0f984aaf26
rewording, re-formatting
2014-07-14 17:21:12 +02:00
Khris Richardson
1acd82f3f1
add sphinx spelling extension. enforce en_us
2014-07-13 13:43:33 -05:00
Erik Johnson
16d59eb135
Fix rst note:: directives
2014-07-13 10:40:53 -05:00
Chris Rebert
a016a30508
fix typos in doc/topics/tutorials/intro_scale.rst
2014-07-11 15:46:54 -07:00
Thomas S Hatch
c2c9ea05e3
Merge pull request #14119 from gravyboat/develop
...
Fixed a few more files with code block issues.
2014-07-10 17:14:04 -06:00
Forrest Alvarez
0a96a4ca09
Updated the salt bootstra, and writing tests docs to fix some code block issues.
2014-07-10 15:47:51 -07:00
Thomas S Hatch
487c5f5a33
Merge pull request #14083 from hvnsweeting/hvn-doc-update
...
Salt virt/cloud doc update
2014-07-10 14:36:35 -06:00
Volker Schwicking
3da7bf5fc9
rewording
2014-07-10 17:27:31 +02:00
Hung Nguyen Viet
fef3b93bec
rewrite some sentences
2014-07-10 11:28:18 +07:00
Hung Nguyen Viet
81d74c1080
avoid confusing with salt-cloud
2014-07-10 11:15:17 +07:00
btibi
f69977d3e5
Add syslog_ng state module.
2014-07-09 22:04:13 +02:00
Thomas Jackson
71f97b9ee7
Update to the salt @ scale doc
2014-07-09 11:06:24 -07:00
vs
79589a2b0c
added \n
2014-07-09 02:05:10 -07:00
Thomas S Hatch
eabd156d67
Merge pull request #13917 from felskrone/salt_at_scale_doc
...
Salt at scale doc
2014-07-07 14:41:37 -06:00
Erik Johnson
1b1eb26587
Add reactor example for updating fileserver on git push
2014-07-02 21:03:09 -05:00
Volker Schwicking
71d3ba021b
more formatting fixes
2014-07-02 19:25:01 +02:00
Volker Schwicking
2b30ab119b
add missing log messages
2014-07-02 18:29:09 +02:00
Volker Schwicking
4c2949a267
formatting improvements, little text rework
2014-07-02 14:32:19 +02:00
Volker Schwicking
4099a9d5fc
formatting improvements, little text rework
2014-07-02 14:31:49 +02:00
Volker Schwicking
14a0441dec
formatting improvements, little text rework
2014-07-02 14:29:35 +02:00
Volker Schwicking
06baca4cf5
formatting codeblocks etc.
2014-07-02 13:51:47 +02:00
Volker Schwicking
e7838c3641
formatting and text reworks
2014-07-02 13:44:50 +02:00
Volker Schwicking
2e8e00f879
fix note to display as note
2014-07-02 12:44:52 +02:00
Volker Schwicking
b086f8d2c7
fixed to 80 chars in width
2014-07-02 12:39:58 +02:00
vs
e9796459fb
first draft of multimaster pki tutorial
2014-07-02 02:52:19 -07:00
rallytime
6caff78b18
Remove random :'s
2014-07-01 15:11:51 -06:00
rallytime
f0d9db2497
Removed the term "Hydrogen" from versionadded notation
2014-07-01 15:01:12 -06:00
Erik Johnson
b4a5f7c1bb
Use code-block instead of double-colon + indent
...
The new sphinx style assumes that indented examples preceded by a
double-colon are python. This changes he main walkthrough page so it
uses a bash code-block in these areas, to be more accurate.
2014-06-28 14:35:21 -05:00
Daniel Wallace
4d8d2fa377
Document match for overstates
...
Uses compound matching. Closes #13659
2014-06-23 19:19:47 -05:00
Erik Johnson
1a4e1c7944
Remove italics
...
These are out-of-place in the context of the other steps in this
particular section, and thus unnecessary.
2014-06-17 14:47:19 -05:00
Erik Johnson
3ca776a167
Add reactor example for syncing custom types on initial highstate
2014-06-07 14:27:26 -05:00
Pedro Algarvio
506cbe4726
Make use of the bootstrap.saltstack.com
URL(s)
2014-06-07 13:59:39 +01:00
vs
db3b5207cb
rewrite a few sentences, re-ordering, etc.
2014-06-06 23:55:25 -07:00
Joseph Hall
03e8ad7f7e
Merge pull request #13283 from Mutantjessica/develop
...
Proofread doc/topics/tutorials/firewall.rst
2014-06-05 21:58:06 -06:00
Jessica Wilson
1c5aac833e
Minor typo fix
2014-06-06 02:20:07 +00:00
vs
d28a4bc9d5
fix link
2014-06-05 06:04:56 -07:00
vs
864262b1a5
remove all you's and rewrite some sentences
2014-06-05 06:02:58 -07:00
vs
0ebaccb996
highlight topics
2014-06-05 04:00:29 -07:00
vs
c864203bc7
put infos into a note box
2014-06-05 03:54:10 -07:00
vs
bf3ba5cf4d
added links to two auth-loop issues
2014-06-05 02:00:31 -07:00
vs
45ab2130f5
link test2
2014-06-05 01:58:01 -07:00
vs
66ac607597
url test2
2014-06-05 01:53:49 -07:00
vs
2c51909d7b
url test
2014-06-05 01:45:34 -07:00
vs
328e6478aa
"using salt at scale" tutorial for the docs
2014-06-05 01:36:46 -07:00
Erik Johnson
dcaf2892f3
Clarify GitPython installation in gitfs tutorial
2014-06-03 10:40:27 -05:00
Michael Lustfield
5eab3db366
minor doc touchups
2014-05-24 23:42:00 -05:00
rallytime
76340a5c62
Documentation for salting the salt master
2014-05-23 13:50:08 -06:00
Erik Johnson
5cd4000862
Add information on gitfs_provider to gitfs walkthrough
2014-05-21 15:00:29 -05:00
Erik Johnson
93245d1e0e
Correct inaccuracies in gitfs walkthrough
...
Also, added some information on upcoming features
2014-05-21 01:35:00 -05:00
Forrest Alvarez
b588393a7b
Updated the quickstart so we can get rid of the standalone minion docs.
2014-05-21 03:33:09 +00:00
Arnold Bechtoldt
04a0133945
updating homebrew installation URL
2014-05-19 20:27:43 +02:00
Aditya Kulkarni
bf6caa304b
Edit cert related instructions in Halite tutorial
2014-05-08 14:19:32 -04:00
Erik Johnson
b3e42245f6
Better documentation for outputters
2014-05-05 17:50:47 -05:00
Chris Rebert
8af229253f
more copyediting
2014-04-30 13:55:48 -07:00
Peter Waller
237b79ccbc
Fix link to AWS credential distribution blog post
...
The existing link left me feeling confused and unfulfilled. I think that's possibly because it accidentally linked to the previous post in the series. I found the "correct" post by googling for it.
2014-04-30 18:03:18 +01:00
Pedro Algarvio
f0dddbbc82
Remove references to the insecure redirect.
2014-04-30 00:25:59 +01:00
David Lindquist
1937eb85af
Update all raw.github.com references to raw.githubusercontent.com
...
Per
https://developer.github.com/changes/2014-04-25-user-content-security/
raw.github.com is now served from raw.githubusercontent.com.
2014-04-29 14:29:34 -07:00
talwai
f6ecd7a710
Fix example salt.minion_config to point to existing file
2014-04-28 19:28:00 -07:00
Pedro Algarvio
23b12283fb
Update the bootstrap script tutorial doc to latest from the project.
...
Also ignore the bootstrap script HTTPS URL.
2014-04-27 11:48:17 +01:00
Pedro Algarvio
a1d446d1e5
Revert "Default to https instead of http"
...
This reverts commit 6fc260be9e
.
2014-04-27 11:46:36 +01:00
Daniel Wallace
6fc260be9e
Default to https instead of http
...
For everything that doesn't use python urllib
2014-04-26 20:20:32 -05:00
Wes Turner
6aa523d9d1
DOC: Update GitFS documentation (syntax, links)
2014-04-22 05:42:10 -05:00
Kieran Spear
20c2583b8e
Fix doc typo
2014-04-17 22:18:20 +10:00
Nicole Thomas
8aeaf24cff
Fixed spelling error in pillar documentation
2014-04-03 09:42:48 -06:00
scottkly
885d55e826
Update writing_tests.rst
...
Fixed a typo in the title
2014-03-26 11:06:40 -06:00
Tarjei Husøy
29ca4293b7
Use fingerprints for key comparison in walkthrough
2014-03-23 16:40:48 +01:00
Jens Rantil
3c5ab353e1
doc(topic/bootstrap): document -i
CLI option
...
It was added in https://github.com/saltstack/salt-bootstrap/pull/348 .
2014-03-23 14:14:40 +01:00
Jens Rantil
1fa78b88d6
doc(bootstrap): avoid using URL
...
It's considered insecure. See
https://github.com/saltstack/salt/pull/11446#issuecomment-38364901 .
2014-03-23 08:31:20 +01:00
Jens Rantil
f5a08fe359
Update bootstrap script CLI options
...
I made them easier to update by simply pasting in the output from the
script. The snippet also included the exact command I used to extract
the command line options.
2014-03-22 21:56:05 +01:00
Erik Johnson
83063c8d68
Fix broken links and other sphinx errors
2014-03-17 17:17:18 -05:00
Mike Place
cfa859c76e
Reconsile docs and fix build warnings.
2014-03-14 14:18:56 -06:00
Erik Johnson
a7a878fea0
Add sub-titles to other states tutorial pages
2014-03-13 21:02:33 -05:00
Erik Johnson
16ba779b7a
Add new page to toctree
2014-03-13 21:01:06 -05:00
Erik Johnson
fc062e5d27
Move OverState and state.sls docs to new location
2014-03-13 20:59:28 -05:00
Aditya Kulkarni
2541f45aca
Remove doc reference to root user
2014-03-13 12:24:24 -04:00
Erik Johnson
ac6648fdfa
Clarify when the new "root" param for git_pillar will be added
2014-03-10 11:45:13 -05:00
Mike Place
d215da9494
Fix wording.
2014-03-07 12:27:05 -07:00
Tim O'Guin
60ebfd6c0e
added versionadded directive for minionfs walkthrough
2014-03-05 16:34:24 -06:00
Wedge Jarrad
b4d49cbc09
Fix typo in walkthrough
2014-03-04 20:21:15 -08:00
Thomas S Hatch
922757a38c
Merge pull request #10864 from JensRantil/custom-pillar-git-root
...
Custom pillar git root
2014-03-03 10:36:01 -08:00
viod
f6bd8415b3
Add the indication that pillar_roots should not be subdirectories of file_roots, as that won't work, everywhere it looks relevant.
2014-03-03 00:15:51 +01:00
Jens Rantil
f02f9ed8d9
doc(pillar/git): drop first person
...
By request of @thath45.
2014-03-02 12:51:20 +01:00
Thomas S Hatch
0e7124acae
Merge pull request #10865 from pass-by-value/halite_doc_updates
...
Halite doc updates
2014-02-28 08:18:19 -07:00
Jens Rantil
ea117cfdf5
doc(pillar/git): document setting custom root
2014-02-28 14:58:44 +01:00
Mike Place
a81562b60a
Merge pull request #10849 from whiteinge/doc-glossary-links
...
Added links from glossary entries
2014-02-27 22:49:38 -07:00
Seth House
86e0075fcf
Updated tutorials, highstate, and PyDSL docs from term links to ref
2014-02-27 19:43:12 -07:00
Thomas S Hatch
9658aaa27b
Clean up pillar walkthrough
2014-02-27 15:43:24 -07:00
Thomas S Hatch
8a3de9154c
Merge pull request #10692 from stevage/pillar-tutorial
...
Improvements to the Pillar Walkthrough as per #10467
2014-02-27 15:30:24 -07:00
Thomas S Hatch
6353e400ed
Merge pull request #10824 from techhat/issue10823
...
Remove outdated ec2 tutorial
2014-02-27 10:17:05 -07:00
jeroen tiebout
39b1831056
fix typos
2014-02-27 16:03:05 +01:00
Joseph Hall
1e674454de
Remove outdated ec2 tutorial
2014-02-27 06:49:20 -07:00
Mike Place
2637fc689f
Docs build cleanly! Yay!
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
Evan Borgstrom
fb98e76fb0
Adding pyobjects documentation to the tutorial
2014-02-26 12:19:00 -05:00
Aditya Kulkarni
b0903ba766
Formatting changes
2014-02-25 11:39:31 -05:00
Aditya Kulkarni
e9499eb8de
Update Halite tutorial
2014-02-25 11:36:20 -05:00
AnneTheAgile
78bc296ec0
#9356 Add cite to IAM for EC2 credential sharing.
2014-02-24 16:28:28 -05:00
Steve Bennett
44632b919b
Improvements to the Pillar Walkthrough as per #10467
2014-02-24 23:03:44 +11:00