Commit Graph

35 Commits

Author SHA1 Message Date
rallytime
9227c3dd26 Merge branch '2015.8' into '2016.3'
Conflicts:
  -   -   -   -   -   -   -   -   - conf/master
2016-07-21 13:39:21 -06:00
Thomas S Hatch
6c35d88268 Fix #34648 (#34828) 2016-07-20 14:49:52 -06:00
rallytime
a5e0141eda Merge branch '2015.8' into '2106.3'
Conflicts:
  - salt/beacons/__init__.py
  - salt/modules/saltutil.py
  - salt/modules/zypper.py
  - salt/states/grains.py
  - salt/states/pkgrepo.py
  - salt/states/service.py
2016-05-25 13:44:21 -06:00
Nicole Thomas
00f9090928 Add docs about PyYAML's 1024 character limitations for simple keys (#33459)
Fixes #33389
2016-05-24 08:12:21 -07:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop'
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
2016-01-26 16:19:39 -07:00
Jonathan Ballet
4062c63b9f Fix doc formatting for yaml_idiosyncrasies 2016-01-25 12:26:30 +01:00
Zach Malone
2bc17047b2 Adding double quote notes
false and no or true and yes values need to be wrapped in double quotes (' and " together), which was not previously noted in the docs.
2015-10-22 12:39:14 -06:00
Erik Johnson
728488e90b Tweak section header 2015-02-10 15:06:43 -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
Colton Myers
92742f7e08 No second person 2014-08-13 17:33:06 -06:00
Colton Myers
ff8d8df1d2 Add additional example for datetime YAML idiosyncrasy
Fixes #14860
2014-08-12 16:25:43 -06:00
Colton Myers
3c3bc18068 Clarify yaml indentation issues, and add another example 2014-06-05 17:20:53 -06:00
Colton Myers
cdf039163e Add YAML datetime idiosyncrasy to docs
Refs #11630
2014-03-31 11:46:21 -06:00
regilero
3784c2f80d Add documentation on yaml_utf8 setting on yaml troubleshooting documentation 2014-01-23 15:09:03 +01:00
Erik Johnson
759969985c Improve documentation regarding nested dict YAML indentation 2013-11-01 23:02:29 -05:00
Pedro Algarvio
e23d1febee The dot does not belong on the linked text. 2013-07-23 21:42:15 +01:00
Pedro Algarvio
4cf488e983 Link to dictionaries and integers on the python documentation. 2013-07-23 18:43:23 +01:00
Colton Myers
57bd942725 Remove trailing whitespace 2013-07-09 10:12:38 -06:00
Colton Myers
1b9f3ff21c Add underscore stripping to YAML idiosyncrasies 2013-07-09 10:11:43 -06:00
Gary Wilson Jr
bd499e5640 Fixed several minor misspellings and acronym capitalizations. 2013-03-18 16:42:57 -05:00
Erik Johnson
eb1f3a50ca Add notes on true/false, yes/no, on/off 2013-02-22 12:09:32 -08:00
Jack Kuan
a284732328 Update docs about troubleshooting YAML. 2012-11-18 20:22:41 -05:00
David Pravec
956b89013e fix wrong rst syntax in yaml_idiosyncrasies.rst
and this time i also verified the builded documentation to be ok.
Sorry i didnt do it last time.
2012-08-29 19:06:19 +02:00
Thomas S Hatch
f510dcbc2f Take out the first person speak 2012-08-29 10:41:39 -06:00
David Pravec
7df0764bcb explained how to (not) use UTF8 with YAML
yaml is really pain sometimes... It does support ASCII characters only.
This little text explains how to write extra characters if its needed.
2012-08-29 15:56:12 +02:00
Thomas S Hatch
ab9cdcf60e Merge branch 'develop' of github.com:saltstack/salt into develop 2012-08-20 15:38:53 -06:00
Thomas S Hatch
480837d344 there was no 0.9.10 2012-08-20 15:38:38 -06:00
Jack Kuan
1e75b6b56a Small doc fix. 2012-08-20 16:15:04 -04:00
Thomas S Hatch
11d481260a Comment on yaml issue that is now resolved 2012-06-04 13:40:35 -06:00
L.C. Rees
3315dad9e7 documentation updates 2012-05-22 22:43:12 -06:00
Thomas S Hatch
acab40e68f Add a comma to make example valid 2012-05-01 12:04:41 -06:00
Thomas S Hatch
1984d335c8 Add doc for double short decs 2012-04-23 00:33:57 -06:00
Jeff Schroeder
b312ced8a9 Update the troubleshooting documentation 2012-03-18 17:41:21 -07:00
Gordon McAllister
72c2014767 War on typos
Also cleanup whitespace and break some long lines
2012-03-14 17:09:19 -07:00
Thomas S Hatch
222976b691 Started on #757
Documented some YAML issues we run into when making sls files
2012-03-02 23:12:53 -07:00