Commit Graph

120 Commits

Author SHA1 Message Date
Erik Johnson
ed2190b65e Add hgfs config params to docs 2014-02-08 05:25:07 -06:00
Erik Johnson
ffd189cc7b Add info about root_dir and the options to which it is prepended 2014-02-04 15:46:22 -06:00
Mathieu Le Marec - Pasquet
11ff89000b Custom grains directories 2014-01-28 13:40:55 +01:00
Forrest Alvarez
563f99538d Fixed some errors that were getting generated. 2014-01-12 05:33:04 +00:00
Forrest Alvarez
13a7acff03 Updated the master configuration docs to fill out the rest of the items that were missing from the docs, also moved some stuff around so it was in the same order as the actual master conf file. 2014-01-12 05:23:09 +00:00
Forrest Alvarez
afab1e2d63 Updated the master config file with some options, made it down to the color option. Looking at how this is set up, things might need to be moved around. 2014-01-10 05:54:07 +00:00
Erik Johnson
6ab77e5317 Replace references to Hydrogen release in docs
This replaces references to Hydrogen (in versionadded/versionchanged
directives as well as a few other mentions), to reflect the actual
release number of 2014.1.0.
2014-01-07 12:06:53 -06:00
Erik Johnson
5a8faf4810 Add gitfs configuration parameters to master config docs
This commit adds the new gitfs_provider parameter, as well as several
other params for gitfs that were not documented.
2014-01-03 21:06:03 -06:00
Thomas S Hatch
b3b6c0bcee Merge pull request #8734 from terminalmage/autoreject_file
add an autoreject_file parameter to the master config file
2013-12-30 09:24:03 -08:00
Seth House
5ccc3c0b59 rST fix 2013-12-13 22:52:02 -07:00
Seth House
d158fbefd4 Changed conf-log to conf_log to match the other conf_* roles
@s0undt3ch Hope you don't mind.
2013-12-13 17:34:59 -07:00
Thomas S Hatch
167c110f43 Add doc for yaml_utf8 2013-12-13 14:40:47 -07:00
Erik Johnson
3a6274fb3b Remove reference to yumpkg5 in provider override example
yumpkg5 is the default now, so it shouldn't be included in an example of
overriding the provider.
2013-12-09 14:16:19 -06:00
Erik Johnson
e7e84ff305 Add autoreject_file to master config file documentation
Included a versionadded directive to note when this was added, to reduce
confusion.
2013-11-21 17:12:31 -06:00
Sijis Aviles
1f27476fdd removed double colons in master documentation to match existing formatting 2013-11-09 13:54:39 -06:00
Thomas S Hatch
c0f6fd68a3 Merge pull request #8303 from basepi/rmcluster
Remove confusing "computer clusters" reference from docs
2013-11-06 15:11:17 -08:00
Colton Myers
79fe2637bf Remove confusing "computer clusters" reference from docs 2013-11-06 12:11:08 -07:00
Colton Myers
f50ebad1f5 Add publish example for limiting targets 2013-11-06 11:03:31 -07:00
Forrest Alvarez
a1b4848dbc Updated minion.rst with a note on verify env for issue 8281. 2013-11-06 05:41:56 +00:00
Thomas S Hatch
a280c4dfa1 Merge pull request #7621 from cachedout/develop
Documentation changes/updates
2013-10-04 12:09:00 -07:00
Erik Johnson
f6e521a9e3 Add fileserver_backend to master configuration page 2013-10-04 11:04:14 -05:00
Mike Place
bd1da286ac -- Please review for accuracy prior to merge --
While I'm still learning the external pillar system, I suspect that this documentation was written when a smaller number of external pillars were available. I have removed the plain-text reference and instead linked directly to the repository directory which holds all pillars. If my assumption/understanding is incorrect, please feel free to reject. :]
2013-10-03 15:41:37 -06:00
Pedro Algarvio
0b0e82baaa Update include documentation examples to current default values. 2013-10-02 13:36:47 +01:00
Joe Healy
aece0976a6 Fixed pedantic spelling errors picked up by lintian
joe@unstable-builder:~/salt_017rc/salt$ lintian -I ../*.deb
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz softwares software - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz specifed specified - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz Targetting Targeting - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz targetted targeted - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz Dependant Dependent - done
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57301 /var/named/ - not done - example
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57320 /var/named/ - not done - example
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57339 /var/named/ - not done - example
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz recieve receive - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz allows to allows one to - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz allows to allows one to - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz dont don't - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz succesfully successfully - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz softwares software - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz These package This package - not done - legitimate
2013-09-20 22:01:20 +10:00
Pedro Algarvio
48990a4bc2 Don't show the module members, these can be considered internal. 2013-09-18 11:42:50 +01:00
Pedro Algarvio
931e0c4b05 Minor updates to include the external logging handler documentation. 2013-08-30 23:14:40 +01:00
Pedro Algarvio
f99d2a5065 Direct curious developers to the proper document. 2013-08-30 19:33:22 +00:00
Pedro Algarvio
e5a8b46b7e Updated logging documentation on a common place.
* All logging information now resides on it's own document where all the currently documented features are explained.
* The master and minion logging configuration sections are now minimal and direct each option to the right place on the logging doc.
* A link to the logging doc was also added to the configuration document topic to help debugging issues when troubles are found.
* Headers fixed in the minion and master configuration docs
2013-08-30 19:32:40 +00:00
Pedro Algarvio
f5f4caa852 Fix doctring code block syntax. 2013-08-30 19:32:40 +00:00
Pedro Algarvio
680ca716ec Add linkable ref's to the minion and master logging configuration sections. 2013-08-30 19:32:39 +00:00
Erik Johnson
ce9b2728a0 Add documentation on how the minion id is derived 2013-08-15 18:03:38 -05:00
Erik Johnson
8f03781ca9 Add missing master configuration file parameters
This commit adds some recently-added master config options to the online
docs.
2013-08-08 15:10:32 -05:00
Erik Johnson
56fbf9cdbf Formatting fixes + added File Directory Settings
Added the configuration parameters made available with a local
fileclient.
2013-08-03 18:53:39 -05:00
Erik Johnson
f59cbc427f Formatting corrections 2013-08-03 18:53:05 -05:00
Pedro Algarvio
87472875fe Replace issue links with the :issue: extlink extension. 2013-08-02 01:04:57 +01:00
Erik Johnson
70e236d028 Docmentation tweaks in advance of 0.16.2 release 2013-07-31 20:43:37 -05:00
Tomé Duarte
7946bef5f3 Fix typo in pidfile code example. 2013-07-30 06:57:34 +01:00
Thomas L. Kula
54a0746b4e Backoff when minion fails to connect
NOTE: This is a potential change --- I haven't actually gotten a
test environment to try this out.

This adds a configuration option to the minion,
`acceptance_wait_time_max', that if set changes the acceptance
wait loop to add `acceptance_wait_time' seconds to the wait between
each iteration, up to this maximum value.

POTENTIAL FIX: Issue #5813
2013-07-27 16:51:38 -04:00
Pedro Algarvio
e46e81e1f2 Direct link to python's documentation regarding the LogRecord attributes. 2013-07-23 16:59:47 +01:00
Pedro Algarvio
868cfad2d0 Link minion.rst to time.strftime's python documentation. 2013-07-23 16:55:23 +01:00
Pedro Algarvio
70b57bd0a2 Link master.rst to time.strftime's python documentation. 2013-07-23 16:46:05 +01:00
Erik Johnson
a5627b0cc7 Tweak description of "id" minion config param 2013-07-20 21:14:59 -05:00
Mathieu Le Marec - Pasquet
cff1fa6f53 fix/feat: let the syndic be way more configurable
- Fix micmac between configs
- Add options to configure pidfile, logfile, masterofmaster port

This fixes #6024.
2013-07-15 20:30:26 +00:00
Seth House
059b287f65 Fixed two rST mistakes 2013-07-01 13:42:59 -06:00
martin f. krafft
c7053e9adf Reclass master_tops/ext_pillar docs update
Signed-off-by: martin f. krafft <madduck@madduck.net>
2013-07-01 15:01:11 +02:00
ran
38aa906da0 fix mine while caching is disabled 2013-06-25 23:42:09 +03:00
Colton Myers
ef4ba74c10 Add additional clarification for autosign in docs 2013-06-17 16:28:05 -06:00
Jonathan Ballet
69d77d8c1a output: fix typo introduced in 5f473b 2013-06-17 17:31:44 +02:00
Jonathan Ballet
5f473bb17e output: new state output 'changes'
It displays states result in 'full' mode unless nothing changed, in
which case it displays results in 'terse' mode.
2013-06-17 15:22:57 +02:00
Seth House
370dc7881b Removed line numbers from master/minion conf file examples
This change is to lazily side-step Sphinx issues rendering code
alongside line numbers. Aligning the line numbers <td> with the code
<td> is dumb and I'd like to patch the HTMLWriter to output
Bootstrap-compatible <ol>'s instead.
2013-06-12 12:15:40 -06:00