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
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
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
Seth House
6d09e554e4
Fixed two straggling occurances of APIClient -> NetapiClient
2014-06-19 13:02:16 -06:00
Seth House
cbc3775fbc
Remove the sphinxcontrib from the import path
...
I swear I fixed this during the merge. Must have undone the change
somehow.
2014-06-19 12:27:31 -06:00
Thomas S Hatch
b6cc31e8af
Merge pull request #13554 from whiteinge/saltapi-merge
...
salt-api merge!
2014-06-19 11:44:52 -06:00
Pedro Algarvio
1a9a7fb87e
Merge branch 'develop' of github.com:saltstack/salt into hotfix/saltapi-merge-tests
2014-06-19 12:01:33 +01:00
Ronan Amicel
77dfa9eff4
Docs: fix list formatting on the Installation page
2014-06-19 11:56:28 +02:00
Thomas S Hatch
060f34f746
Merge pull request #13526 from s0undt3ch/hotfix/setup-raet
...
simpler requirements setup
2014-06-18 23:55:01 -06:00
Nitin Madhok
2e27b9d1df
Fixed typo
2014-06-19 01:40:39 -04:00
Seth House
295e0b9060
Temporarily commented out docs Mock decorator conditional
...
This worked in the smaller salt-api project but is choking somewhere in
the larger Salt project. We do need this but we need the salt-api merge
sooner. Commented out for now.
2014-06-18 23:20:27 -06:00
Seth House
061a43b6f3
Added netapi docs to TOC
2014-06-18 23:19:45 -06:00
Seth House
8df1bbf1d1
Added missing functools import
2014-06-18 23:05:26 -06:00
Seth House
ae413133f3
Added netapi modules to the module index
2014-06-18 23:04:45 -06:00
Seth House
7b6544c660
Added httpdomain from Sphinx-contrib
2014-06-18 22:14:17 -06:00
Seth House
53bab586f4
Merged salt-api into Salt
...
Woot!
The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.
Conflicts:
debian/changelog
debian/control
doc/conf.py
doc/index.rst
opt_requirements.txt
salt/config.py
salt/loader.py
2014-06-18 22:13:56 -06:00
Seth House
1d4057fadf
Updated all saltapi import paths to salt.netapi
2014-06-18 20:56:16 -06:00
Seth House
6f112d6eef
Updated the netapi modules index to be more clear
2014-06-18 20:19:03 -06:00
Seth House
554a612aa4
Renamed netapis to netapi
2014-06-18 20:05:02 -06:00
Seth House
cf4b684edb
Moved salt-api release notes into saltapi subdir
2014-06-18 20:03:40 -06:00
Seth House
598a1d74a3
Removed redundant docs files with Salt-core docs
2014-06-18 20:02:16 -06:00
Seth House
d01462cb28
Retain docstring if mocked object is used as a decorator
...
This prevents mocked objects that are used as decorators from obscuring
the docstring of the decorated function/method.
2014-06-18 15:28:20 -06:00
Seth House
de3e1d31ce
Removed mocks for unused libraries
...
These mocks were all for legacy code.
2014-06-18 15:28:20 -06:00
Colton Myers
6cb859b6da
Merge pull request #13394 from basepi/2014.1.5release
...
Add release notes for 2014.1.5 and bump docs version
2014-06-18 10:27:59 -06:00
