Commit Graph

29 Commits

Author SHA1 Message Date
rallytime
62e3c44045 Switch proxy_merge_grains_in_module option default from False to True 2016-11-29 10:51:46 -07:00
rallytime
c722a18468 Update Carbon versionadded tags to 2016.11.0 in doc/* 2016-10-27 15:26:30 -06:00
rallytime
376976a19b Remove add_proxymodule_to_opts from minion.py in Carbon
Also remove relevant documentation references - these config settings
are no longer needed.
2016-08-17 12:22:25 -06:00
C. R. Oldham
8332e6f94e Add default proxy config directories /etc/salt/proxy.d and ability for proxies to be configured by opts in addition to pillar 2016-06-03 10:11:34 -06:00
C. R. Oldham
7abf8becaa Documentation updates that go with PR #32252. 2016-03-31 10:41:24 -06:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3'
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
rallytime
742d0a6b04 Change all relevant Boron references to 2016.3.0
And more Boron deprecation warnings to Carbon
2016-02-10 15:45:28 -07:00
Jacob Hammons
b192a9ba38 Doc restructuring, organization, and cleanup. Updated the doc navigation. 2016-01-31 20:10:02 -07:00
Aditya Kulkarni
b3fdce7b75 Add docs 2015-12-08 15:58:38 -05:00
Aditya Kulkarni
4a3c8cc399 Add doc and test support 2015-11-19 12:51:45 -05:00
Aditya Kulkarni
7c8f236115 Add documentation for proxy minion ssh 2015-10-19 13:30:35 -04:00
C. R. Oldham
5b33df9d19 Add docs for 2015.8.2+ changes 2015-10-12 14:55:19 -06:00
C. R. Oldham
f4944fe68a Fix typo in docs 2015-09-23 14:11:00 -06:00
Jacob Hammons
f7a9e25d52 Fixed sphinx / latex build warnings and errors
Added missing modules to contents
2015-09-17 09:23:24 -06:00
Jacob Hammons
701f47a658 Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py
Added salt-proxy release notes topic
Added note to pip state for Refs #21845
Regenerated and versioned man pages
2015-09-01 17:09:35 -06:00
C. R. Oldham
e2c70ac55d Merge pull request #26433 from cro/pm_20158_2
Add support for default proxy config options, change default location of proxy config and log to /etc/salt/proxy and /var/log/proxy
2015-08-20 11:14:13 -06:00
C. R. Oldham
aace656a37 Fix bad url. 2015-08-19 16:38:30 -06:00
Arthur Lutz
4ce50ad5bf [doc] topology / proxyminions fix typos 2015-08-19 08:44:46 -06:00
C. R. Oldham
7213fbfed4 Add end-to-end walkthrough 2015-08-18 14:43:26 -06:00
C. R. Oldham
b5a4a53062 Update documentation to reflect new pillar structure. 2015-08-18 09:03:23 -06:00
C. R. Oldham
2de9672e95 Doc updates 2015-08-14 11:52:19 -06:00
Mike Place
826bad4cfb Merge conflict and rebase.
Conflicts:
	doc/ref/renderers/index.rst
2014-02-26 13:32:08 -07:00
Erik Johnson
cad5485d9f Fix bad rst link refs 2014-01-26 05:37:16 -06:00
C. R. Oldham
7cc97c3f1c Update docs. 2014-01-16 12:43:40 -07:00
C. R. Oldham
637901e23e Proxy minion support. 2014-01-16 12:43:11 -07:00
C. R. Oldham
552ff8308b Use a better ping example. 2014-01-16 12:43:02 -07:00
C. R. Oldham
a4277964cf Proxy minion documentation 2014-01-16 12:42:09 -07:00
C. R. Oldham
1c96911c1a Add missing proxy-minion script 2014-01-16 12:39:40 -07:00