Benjamin Drung
50eea287f3
Fix typo an managment -> management
2015-11-04 10:59:22 +01:00
Benjamin Drung
cb01da81c6
Fix typos of parameter
2015-11-04 10:59:22 +01:00
Benjamin Drung
45fcc7d339
Fix typo an dont -> don't
2015-11-04 10:59:22 +01:00
Benjamin Drung
3624935d32
Fix typo an other -> another
2015-11-04 10:59:22 +01:00
Benjamin Drung
d16afe2607
Fix typo sofwares -> software
2015-11-04 10:59:22 +01:00
Benjamin Drung
b9b7cbe525
Fix typo sofware -> software
2015-11-04 10:59:22 +01:00
TheBigBear
2e5684a1e4
Update windows-package-manager.rst
2015-11-02 19:25:12 -06:00
Colton Myers
238411c8ce
Merge pull request #28464 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-02 13:18:21 -07:00
Mike Place
e31ef51053
Merge pull request #28493 from rallytime/bp-28492
...
Back-port #28492 to 2015.8
2015-11-02 10:54:09 -07:00
Mike Place
d19affd44d
Merge pull request #28491 from rallytime/bp-28388
...
Back-port #28388 to 2015.8
2015-11-02 10:13:22 -07:00
Christer Edwards
ffc77259c9
Updated FreeBSD installation docs:
...
- fixed URL in description
- set https in all URLs
2015-11-02 11:31:23 -05:00
Mike Place
04585a2878
Documentation for disable_during_state_run
2015-11-02 11:00:33 -05:00
Colton Myers
3286a5250f
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/pillar.rst
pkg/windows/installer/Salt-Minion-Setup.nsi
salt/modules/file.py
salt/modules/schedule.py
salt/pillar/git_pillar.py
salt/states/boto_route53.py
salt/states/pkg.py
tests/integration/modules/pillar.py
2015-10-30 16:05:26 -06:00
Sam Michel
b968581eb1
Fixed nodegroup doc formatting to correctly link to pillar_opts in the master config
...
See #28453
2015-10-30 12:41:00 -07:00
Gary Waters
e70990704a
added a note to the tutorial for those that redhat so they can use the state file too.
2015-10-30 09:47:46 -07:00
rallytime
8e3a2ba7e7
Add note about azure sdk version to getting started docs
2015-10-29 15:30:37 -04:00
twangboy
f65e3e5275
Updated documentation to reflect the new parameter
2015-10-27 15:56:53 -06:00
Gary Waters
b15285c0b4
adding a working example of setting pillar data on the cli
2015-10-26 14:22:38 -07:00
sdm24
02cac9d8c0
Update nodegroups.rst
...
cleaned up text lines that were too long
2015-10-26 11:31:57 -07:00
sdm24
b2c3307c2e
Update nodegroups.rst
...
fixed more formatting
2015-10-26 11:20:34 -07:00
sdm24
e79a930f57
updated nodegroups.rst
...
fixed formatting issues
2015-10-26 11:19:48 -07:00
Sam Michel
f2a6bc94df
Updated the Nodegroup docs to include how to target nodegroups in SLS Jinja
...
See issue #28268
2015-10-26 11:11:01 -07:00
Mike Place
499ed8519b
Minor grammar changes to #28271
2015-10-26 06:15:19 -06:00
Mike Place
e178af0b90
Merge pull request #28271 from gwaters/update-tutorial-documentation
...
Update tutorial documentation
2015-10-26 06:12:37 -06:00
Florian Ermisch
6d4316b0ac
Correct Jinja function load_* to import_*
...
Fixes #28248 .
Also added a YAML example because really, who wants to write json by hand? ;)
Don't know if this is mentioned in the pillar docs but would be very useful there, too.
2015-10-24 12:13:37 +02:00
Gary Waters
f96d39483d
updated the tutorial with gravyboat's suggestions
2015-10-23 17:09:49 -07:00
Gary Waters
b1f4a2bdf4
i think i changed the wrong header, updated to fix
2015-10-23 15:45:17 -07:00
Gary Waters
846b3aece1
I found you can not run the cp.push commands until after enabling the feature in the conf, so I wanted to update the docs so others who try these commands wont bump into the same issue I had.
2015-10-23 15:34:31 -07:00
rallytime
8b06ab4335
Add documentation to supply the ssh_username: freebsd config to DO docs
...
Fixes #28230
2015-10-22 15:24:39 -06:00
Jacob Hammons
cfadda0c0c
Added note regarding missing spm exe on Debian/Ubuntu
...
Minor fixes to spm docs
2015-10-21 22:34:45 -06:00
Colton Myers
c4c889f97b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
salt/daemons/masterapi.py
salt/minion.py
2015-10-20 14:47:49 -06:00
Nicole Thomas
53dd01fc24
Merge pull request #28149 from pass-by-value/proxmox_profile_doc_change
...
Add clarification to cloud profile doc about host
2015-10-20 13:46:05 -06:00
Aditya Kulkarni
bc371c55cd
Add clarification to cloud profile doc about host
2015-10-20 15:17:47 -04:00
Mike Place
572487073c
Merge pull request #28096 from rallytime/bp-28061
...
Back-port #28061 to 2015.8
2015-10-20 10:15:34 -06:00
rallytime
458a544d83
Add OpenBSD installation documentation to 2015.5 branch
2015-10-20 09:13:28 -06:00
Antoine Jacoutot
bc9159a126
OpenBSD salt package: update list of dependencies.
2015-10-20 09:07:43 -06:00
Aditya Kulkarni
7c8f236115
Add documentation for proxy minion ssh
2015-10-19 13:30:35 -04:00
Michael Vogel
cb8a72d580
Fix #28060
...
Correct the `pip` command. install should be getting `global-options` not `pip` itself.
2015-10-19 09:54:12 -06:00
Mike Place
26b3e01dda
Merge pull request #28018 from rallytime/fix-27938
...
Add example to Writing Grains of how grains can be loaded twice
2015-10-19 06:47:10 -06:00
Justin Findlay
ae92a8a1dc
fix repo path in ubuntu installation documentation
...
Fixes #28038 .
2015-10-16 13:29:18 -06:00
Jacob Hammons
05927bb6f0
Updated release notes with additional CVE information
2015-10-16 10:18:42 -06:00
Jacob Hammons
0d1b691549
Updated release notes with additional CVE information
2015-10-16 10:12:12 -06:00
Jacob Hammons
e4d7df8695
Updated Debian and Ubuntu repo paths with new structure for 2015.8.1
2015-10-16 09:22:48 -06:00
rallytime
c23af0d8e2
Clarify loading vs rendering the final grains data structure
2015-10-16 06:43:24 -06:00
rallytime
a4d7fb7e60
Add example to Writing Grains of how grains can be loaded twice
...
Fixes #27938
2015-10-16 06:26:59 -06:00
Jacob Hammons
2870af2ba3
added link to grains security FAQ to targeting and pillar topics.
2015-10-15 15:05:35 -06:00
Jacob Hammons
bb61c68c11
Changed current release to 5.6 and added CVE to release notes
2015-10-15 11:19:11 -06:00
Jacob Hammons
236992b2be
Changed current release to 8.1 and added CVEs to release notes
2015-10-15 11:14:50 -06:00
rallytime
13a9bc9053
Use eipalloc instead of eni in EC2 interface properties example
...
Fixes #27815
2015-10-13 14:46:01 -06:00
Mike Place
dd92b8a2e3
Merge pull request #27874 from rallytime/deprecation-docs
...
Add mention of Periodic Table naming scheme to deprecation docs
2015-10-13 08:51:45 -06:00
