saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix some documentation inconsistencies

Browse source
This commit is contained in:
Jille Timmermans 2014-09-02 11:38:23 +02:00
parent 6de9cb9b3c
commit 4064a8cf4c
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/minion
View file

@ -154,9 +154,9 @@
# ping_interval: 90
# restart_on_error: True
#
# Minions wont know master is missing until a ping fails. After the ping fail,
# Minions won't know master is missing until a ping fails. After the ping fail,
# the minion will attempt authentication and likely fails out and cause a restart.
# When the minion restarts it will resolve the Masters IP and attempt to reconnect.
# When the minion restarts it will resolve the masters IP and attempt to reconnect.
# If you don't have any problems with syn-floods, don't bother with the

2
doc/man/salt.7
View file

@ -93960,7 +93960,7 @@ When we are asked to update (regular interval) lets reap the cache
#random_reauth_delay: 60
# If you don\(aqt have any problems with syn\-floods, dont bother with the
# If you don\(aqt have any problems with syn\-floods, don\(aqt bother with the
# three recon_* settings described below, just leave the defaults!
#
# The ZeroMQ pull\-socket that binds to the masters publishing interface tries

2
doc/topics/tutorials/syslog_ng-state-usage.rst
View file

@ -95,7 +95,7 @@ statement) it's purpose is like a mandatory comment.
You can use ``set_binary_path`` to set the directory which contains the
syslog-ng and syslog-ng-ctl binaries. If this directory is in your PATH,
you dont't need to use this function.
you don't need to use this function.
Under ``auto_start_or_reload`` you can see a Jinja template. If
syslog-ng isn't running it will start it, otherwise reload it. It uses