Thomas S Hatch
1cd95aa0c8
Revert "Sign the masters pub-key"
2014-06-30 15:04:53 -06:00
Thomas S Hatch
eda36a01a3
Merge pull request #13570 from felskrone/sign_master_keys
...
Sign the masters pub-key
2014-06-30 15:04:23 -06:00
Colton Myers
e1445e5cf7
Merge pull request #13852 from basepi/2014.1.6releasenotes
...
Add two fixes to release notes for 2014.1.6
2014-06-30 14:50:55 -06:00
Colton Myers
30efb97b30
Add two fixes to release notes
2014-06-30 14:50:24 -06:00
Seth House
918f12a376
Added roster modules to the documentation
2014-06-30 14:01:48 -06:00
Erik Johnson
06abbb02c7
Add rh_service bugfixes to 2014.1.6 release notes
2014-06-30 13:50:53 -05:00
Forrest Alvarez
55916e8a7b
Update best_practices doc for code block issues.
2014-06-29 00:37:29 +00:00
Erik Johnson
b4a5f7c1bb
Use code-block instead of double-colon + indent
...
The new sphinx style assumes that indented examples preceded by a
double-colon are python. This changes he main walkthrough page so it
uses a bash code-block in these areas, to be more accurate.
2014-06-28 14:35:21 -05:00
Seth House
afde747f46
Merge pull request #13817 from rallytime/cloud_extends_docs
...
Clarify cloud configuration extends behaviors
2014-06-27 19:03:26 -06:00
rallytime
0636f2cb77
Clarify list merging and non-recursive behaviors of extends in cloud.config
2014-06-27 18:55:52 -06:00
Seth House
7725350416
Merge pull request #13811 from lyft/doc-additions
...
Add docs for boto_elasticache and apache_module
2014-06-27 17:10:10 -06:00
Thomas S Hatch
0a611598e6
Merge pull request #13803 from claytron/version-numbers
...
Clarify version numbering scheme
2014-06-27 13:23:07 -06:00
Clayton Parker
dfec35fe47
fix error on make clean with no translations
2014-06-27 13:45:39 -04:00
Clayton Parker
33e6cd6191
clarify the version numbering scheme
2014-06-27 13:45:13 -04:00
Joseph Hall
9b5a6d575e
Merge pull request #13790 from danielrowles-wf/ec2-secondary-ip-addresses
...
Add support for adding secondary IP addresses to network interfaces
2014-06-27 07:26:15 -06:00
vs
cfa163d4fb
Merge remote-tracking branch 'upstream/develop' into sign_master_keys
2014-06-27 03:52:30 -07:00
Mike Place
c255b4ad13
Update glossary.rst
...
Re-word external pillar
2014-06-26 16:41:33 -06:00
Mike Place
0a42bf0678
External pillar glossary entry
2014-06-26 16:20:11 -06:00
Mike Place
126e84a081
Glossary entry for master tops
2014-06-26 16:13:57 -06:00
Mike Place
2c27cc1a34
Add __virtual__ to glossary
2014-06-26 16:07:30 -06:00
Dan Rowles
329351313a
Add support for adding secondary IP addresses to network interfaces
...
when provisioning EC2 instances with salt-cloud.
2014-06-26 20:29:15 +00:00
rallytime
7778a6e24d
clarifications to gce cloud docs
2014-06-26 11:31:52 -06:00
Mike Place
22d2e812ef
Merge pull request #13751 from claytron/doc-fixes
...
fix errors in docs
2014-06-25 21:28:35 -06:00
Clayton Parker
23c494c8ce
fix errors in docs
2014-06-25 22:54:37 -04:00
Colton Myers
f53e3b4a54
Add 2014.1.6 release notes
2014-06-25 15:05:44 -06:00
Joseph Hall
337f03bb3d
Merge pull request #13737 from christabor/syntax-labels
...
Add a fix for long lines.
2014-06-25 14:03:51 -06:00
Christobot
a7d62f5b8f
Add a fix for long lines. Fixes #13724
2014-06-25 12:57:09 -07:00
vs
f54b90b07c
pylinting, better log messages, docstrings, no logic changes
2014-06-25 06:26:01 -07:00
Thomas S Hatch
d5504945e8
Merge pull request #13718 from christabor/syntax-labels
...
Add new styles for code blocks
2014-06-25 00:08:48 -06:00
christobot
9786fe45d6
Add new styles for code blocks - addresses #13215
2014-06-24 22:30:09 -07:00
Thomas S Hatch
caf8c4094a
Merge pull request #13701 from cachedout/pillar_doc_brushup
...
Improve initial pillar doc
2014-06-24 21:30:49 -06:00
Thomas S Hatch
22c3588c24
Merge pull request #13689 from rallytime/digital_ocean_docs
...
Update Digital Ocean docs to include ssh_key_file requirements
2014-06-24 21:24:23 -06:00
Mike Place
915570f045
Formalize a policy for initializing dictionaries.
2014-06-24 18:35:13 -06:00
Mike Place
e01becc217
Improve initial pillar doc
...
I think the pillar intro was too light on details. Hopefully this makes
it easier to follow.
2014-06-24 16:47:45 -06:00
rallytime
c482bf2e6c
Update "Getting Started with Digital Ocean" docs to include ssh requirements
2014-06-24 14:47:00 -06:00
Daniel Wallace
4d8d2fa377
Document match for overstates
...
Uses compound matching. Closes #13659
2014-06-23 19:19:47 -05:00
Henrik Holmboe
e0a6a5a13e
Reflect the latest released version
...
I did this exact PR in #12695 the last time around. Luckily #12720 seems to take a stab at automating this. :)
2014-06-23 19:56:39 +02:00
Pedro Algarvio
1f0e0d4465
Remove doc/man/salt-api.7
2014-06-21 19:00:55 +01:00
Pedro Algarvio
99dfb00805
Update 'doc/.tx/config' - Build #88
...
http://cookingwithsalt.org/job/salt/job/transifex/88/
Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-06-21 13:36:03 +01:00
Thomas Jackson
c721d9d664
Seperate saltnado_websockets from the rest of the implementation.
2014-06-20 15:10:56 -07:00
Seth House
d2f82c8bba
Removed incorrect TOC syntax from netapi index
2014-06-20 10:21:18 -06:00
Seth House
acb203c735
Added salt-api to CLI TOC
2014-06-20 10:20:58 -06:00
Seth House
c9579866e4
Make mention of salt-api in the netapi modules links
...
People will be searching for this term.
2014-06-20 10:17:15 -06:00
Joseph Hall
2fad262ced
Merge pull request #13581 from basepi/releasecherrypick
...
Add some notes about cherry-picking
2014-06-20 06:33:48 -06:00
Colton Myers
df7ef6f504
Fix typo
2014-06-19 16:19:20 -06:00
Colton Myers
a41b4107ea
Add some notes about cherry-picking
2014-06-19 16:17:46 -06:00
Seth House
8f5e336a16
Added link to the writing netapi modules doc
2014-06-19 13:22:57 -06:00
Seth House
14f663f37e
Added link to legacy salt-api release notes
2014-06-19 13:20:05 -06:00
Seth House
9f93aaf016
Renamed old autodoc-generated salt-api netapi module filenames
2014-06-19 13:19:24 -06:00
Seth House
d4f64e8d5d
Disable the 'routing table' index from the httpdomain
...
While very cool and quite handy, it doesn't make sense for how we use
netapi modules in Salt.
2014-06-19 13:13:09 -06:00
