Justin Findlay
a5ea39132f
dev docs: add development tutorial
2015-11-30 13:11:13 -07:00
Colton Myers
8d86bc3056
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/states/rabbitmq_user.py
salt/states/user.py
2015-11-23 09:53:11 -07:00
Mike Place
52e650aed9
Add section to style guide
...
A brief discussion of variable naming standards in Salt.
2015-11-20 09:23:39 -07:00
Colton Myers
f1c80ab943
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/utils/schedule.py
2015-11-17 16:18:12 -07:00
rallytime
60e6eddb77
A couple of spelling fixes for doc conventions page.
2015-11-15 14:49:47 -07:00
rallytime
eec9d69387
Merge branch '2015.5' into '2015.8'
...
Conflicts:
salt/modules/virtualenv_mod.py
salt/states/file.py
tests/integration/__init__.py
2015-11-04 15:52:59 -07:00
Benjamin Drung
89dcb66310
Fix the wrong "allow to do" phrase
...
"allow to do" is not a valid English phrase. Either use a gerund (allow
doing) or add a patient/object (allow someone to do).
2015-11-04 12:15:41 +01:00
Benjamin Drung
5f7fc5f94b
Fix typo an edditable -> editable
2015-11-04 11:06:16 +01:00
Benjamin Drung
0b768944c2
Fix typo an deamon -> daemon
2015-11-04 11:06:16 +01:00
rallytime
a959681858
Add link to Sending a GH PR to documentation docs
2015-11-03 14:07:49 -07:00
rallytime
1c612e2772
Update contributing and documentation pages to recommend submitting against branches
...
Fixes #28272
2015-11-03 10:44:29 -07: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
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
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
rallytime
8c056ba501
Add mention of Periodic Table naming scheme to deprecation docs
2015-10-12 13:08:50 -06:00
Meggie Woodfield
1c779700f6
Adding stretch label definition
2015-09-25 10:59:07 -06:00
Arnold Bechtoldt
b9e5095bf5
add GH issue label SPM to docs
2015-09-12 11:14:26 +02:00
Colton Myers
1e1f5f3a95
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/cloud/config.rst
doc/topics/cloud/index.rst
salt/modules/git.py
salt/states/git.py
salt/states/pkgrepo.py
2015-09-01 15:35:21 -06:00
Jacob Hammons
0ec036350d
Updates to salt-ssh and salt-key
...
#24510
2015-08-31 20:00:30 -06:00
Jacob Hammons
992edc3bb8
Doc bug fixes
...
Refs #26192
Refs #26638
Refs #26644
Refs #26108
2015-08-31 16:05:50 -06:00
Colton Myers
d3d0e004d9
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/minion.py
salt/modules/gpg.py
salt/modules/keystone.py
salt/modules/pw_user.py
salt/states/reg.py
setup.py
2015-08-17 16:54:16 -06:00
Pedro Algarvio
e7cb3be2a0
Document the added options
2015-08-17 19:48:48 +01:00
Nitin Madhok
714f9766e7
Correct spelling of integration in docs
2015-08-12 13:30:03 -04:00
Nitin Madhok
264f3bf656
Correct spelling of integration in docs
2015-08-12 13:27:30 -04:00
Jacob Hammons
d8d5045d3b
Updates to cloud docs for the provider > driver change in provider configs.
...
Refs #24797
2015-08-10 09:20:26 -06:00
Colton Myers
e29be766bb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
debian/changelog
doc/man/salt.7
salt/cloud/__init__.py
salt/cloud/clouds/proxmox.py
salt/cloud/clouds/vmware.py
salt/config.py
salt/fileclient.py
salt/minion.py
salt/modules/chocolatey.py
salt/modules/localemod.py
salt/modules/pacman.py
salt/modules/pkgng.py
salt/modules/schedule.py
salt/modules/state.py
salt/modules/win_file.py
salt/modules/win_pkg.py
salt/state.py
salt/states/file.py
salt/utils/args.py
tests/unit/states/file_test.py
2015-07-30 16:54:44 -06:00
Justin Findlay
d377f42c48
rework deprecation documentation for release names
...
Fixes #25827 .
2015-07-29 15:50:33 -06:00
Colton Myers
99fc7ecb4b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt.7
salt/cloud/__init__.py
salt/fileclient.py
salt/modules/file.py
salt/modules/gpg.py
2015-06-29 16:49:40 -06:00
Justin Findlay
8575192cc4
revise label and milestone documentation
2015-06-27 16:17:44 -06:00
Justin Findlay
152a9b2a12
fix some malformed doc links and anchors
2015-06-24 16:56:52 -06:00
Mike Place
7dae045b3c
Remove overstate documentation
2015-06-12 13:00:08 -06:00
Colton Myers
94d6ef1d17
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/salt.modules.ipmi.rst
doc/ref/states/all/salt.states.tls.rst
doc/topics/cloud/index.rst
doc/topics/cloud/vsphere.rst
doc/topics/eauth/index.rst
salt/cli/batch.py
salt/modules/cmdmod.py
salt/modules/ipmi.py
salt/netapi/rest_cherrypy/app.py
salt/runners/http.py
salt/states/boto_elb.py
salt/states/dockerio.py
salt/states/linux_acl.py
salt/states/win_servermanager.py
salt/wheel/config.py
2015-06-09 11:41:07 -06:00
Jacob Hammons
d45c4ed11f
Bug fixes and build errors
...
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
2015-06-05 17:32:35 -06:00
Justin Anderson
a6a1f87cd9
Merge pull request #24380 from rallytime/bp-24357
...
Backport #24357 to 2015.5
2015-06-04 14:13:51 -06:00
rallytime
bf85772042
Make sure the parameters are in the correct order
2015-06-04 11:39:39 -06:00
rallytime
9f53809cde
Add "* Change" label parameters
2015-06-04 11:39:39 -06:00
rallytime
b27a15e774
Remove "workaround" wording
2015-06-04 11:39:39 -06:00
rallytime
9fff35a959
Some small fixes
2015-06-04 11:39:39 -06:00
rallytime
54a7089fd6
Link the new labels doc in contributing and hacking docs
2015-06-04 11:39:39 -06:00
rallytime
375695e696
Add pull request label definitions
2015-06-04 11:39:39 -06:00
rallytime
de945638d3
Add Feature Request label definition
2015-06-04 11:39:39 -06:00
rallytime
684f291bd4
Add issue definition and augment functional areas section
2015-06-04 11:39:39 -06:00
rallytime
2da13dd525
Start a "what are all of these labels for?" doc
2015-06-04 11:39:38 -06:00
zhujinhe
f08c875015
fix invoke issues of Jinja Macros example
...
1.'php_ini' not defined in /srv/pillar/php.sls, {{ salt.pillar.get('php_ini', {}) | json() }} gets empty value.
2.no section defined, should be 'section_name'.
3.remove empty line.
2015-06-03 16:38:16 -06:00
zhujinhe
15cdd58968
fix invoke issues of Jinja Macros example
...
1.'php_ini' not defined in /srv/pillar/php.sls, {{ salt.pillar.get('php_ini', {}) | json() }} gets empty value.
2.no section defined, should be 'section_name'.
3.remove empty line.
2015-06-03 12:16:29 +08:00
Jason Thigpen
beff7c7785
Correct usage of import_yaml in formula documentation
2015-05-31 09:43:15 -06:00
Jason Thigpen
37775a5fa6
Correct usage of import_yaml in formula documentation
2015-05-29 17:12:59 -07:00
Colton Myers
c4f5e231fa
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
...
Conflicts:
doc/_themes/saltstack2/layout.html
doc/conf.py
doc/index.rst
doc/ref/modules/all/salt.modules.hipchat.rst
doc/topics/releases/index.rst
salt/client/ssh/client.py
salt/cloud/clouds/vsphere.py
salt/modules/boto_dynamodb.py
salt/modules/boto_route53.py
salt/modules/data.py
salt/modules/http.py
salt/modules/tls.py
salt/output/compact.py
salt/states/boto_elb.py
salt/states/linux_acl.py
salt/states/rabbitmq_user.py
salt/states/win_servermanager.py
salt/utils/dictupdate.py
salt/wheel/config.py
2015-05-29 15:10:13 -06:00
Jacob Hammons
0689815d0e
Fixes for doc build errors
2015-05-27 11:40:31 -06:00
Colton Myers
60f2e9eefb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/development/contributing.rst
salt/modules/tls.py
2015-05-26 16:38:42 -06:00
