Colton Myers
|
fd09cdae6f
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
doc/topics/ssh/roster.rst
salt/client/ssh/__init__.py
salt/client/ssh/wrapper/__init__.py
salt/config.py
salt/modules/file.py
salt/runners/lxc.py
|
2015-05-05 16:26:39 -06:00 |
|
Colton Myers
|
a0b6b760c3
|
Add minion_opts to roster docs
|
2015-05-04 14:46:16 -06:00 |
|
Thomas Jackson
|
498a612078
|
Whitespace cleanup
Conflicts:
doc/topics/cloud/linode.rst
doc/topics/cloud/misc.rst
doc/topics/cloud/parallels.rst
doc/topics/cloud/proxmox.rst
Conflicts:
doc/topics/development/architecture.rst
doc/topics/development/translating.rst
|
2014-12-11 07:53:19 -08:00 |
|
Mike Place
|
36288eef7f
|
Clarify doc
|
2014-10-16 16:09:57 -06:00 |
|
Seth House
|
918f12a376
|
Added roster modules to the documentation
|
2014-06-30 14:01:48 -06:00 |
|
Chris Rebert
|
8af229253f
|
more copyediting
|
2014-04-30 13:55:48 -07:00 |
|
Alexey Ivanov
|
d23ff3821e
|
codespell: grammar nazi
Run codespell[1] against sources.
[1] https://github.com/lucasdemarchi/codespell
|
2014-01-26 18:41:28 -08:00 |
|
Dan Garthwaite
|
a48a8deec2
|
Added undocumented ssh roster configuration options
|
2013-10-11 10:21:52 -04:00 |
|
Forrest Alvarez
|
1c043c3d45
|
Updated the salt-ssh.rst to add the new options that are available via the command line. Modified the ssh index.rst to include a link to the salt-ssh cli commands page. Updated parsers.py to fix the default value that is present in the documentation from 5 to 25 (as 25 is the actual default). Updated roster.rst to note that the default file location is /etc/salt/roster since it was absent, and might be confusing if you head to the roster documentation before reading the rest of the salt-ssh documentation.
|
2013-09-29 05:16:13 +00: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 |
|
Henrik Holmboe
|
4cb197c04a
|
Align comments
|
2013-09-10 13:45:00 +02:00 |
|
Henrik Holmboe
|
9591465b32
|
Fix mid-sentence stop, no reference
In addition to some other minor changes.
|
2013-09-10 13:41:53 +02:00 |
|
Thomas S Hatch
|
8f588a0881
|
Add initial bare bones roster docs
|
2013-09-08 23:00:45 -06:00 |
|