Commit Graph

65 Commits

Author SHA1 Message Date
Jacob Hammons
b192a9ba38 Doc restructuring, organization, and cleanup. Updated the doc navigation. 2016-01-31 20:10:02 -07:00
Adrian Heine né Lang
b765bd46dc Update service manager info for Debian
Debian Jessie switched to `systemd` as default init system.
2015-12-09 08:49:02 +01:00
Colton Myers
2907a64052 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/cli/batch.py
    salt/modules/git.py
    salt/utils/event.py
2015-08-20 13:31:46 -06:00
Jacob Hammons
499bd66378 Minor doc bug fixes
Refs #26403
Refs #26432
Refs #26233
Refs #26264
Refs #26329
2015-08-19 11:31:26 -06:00
Colton Myers
1502a39779 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    conf/minion
    salt/client/__init__.py
    salt/states/dockerio.py
    salt/utils/event.py
    tests/unit/utils/event_test.py
2015-08-11 18:12:21 -06:00
Colton Myers
32f5345d7d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
    conf/minion
    doc/conf.py
    salt/modules/file.py
2015-08-10 10:56:40 -06:00
Jacob Hammons
d220c83f77 master_finger configuration docs
switch a script to use https:// instead of http://
Refs #25751
2015-08-06 20:23:22 -06:00
Colton Myers
a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/topics/releases/version_numbers.rst
    salt/cli/batch.py
    salt/minion.py
    salt/state.py
    setup.py
2015-06-18 11:43:11 -06:00
Jacob Hammons
c7cdd416a2 Doc bug fixes
Refs #24547
Refs #24275
Refs #24375
Refs #24560
Refs #24163
2015-06-12 11:23:52 -06:00
Wes Turner
203f5c3798 DOC: topics/tutorials/walkthrough.rst: then > than 2015-02-03 05:42:50 -06:00
Colton Myers
fc16bd16c0 Merge branch '2014.7' into merge-forward
Conflicts:
	doc/faq.rst
	doc/ref/states/compiler_ordering.rst
	doc/topics/best_practices.rst
	doc/topics/development/conventions/formulas.rst
	salt/config.py
	salt/modules/state.py
	salt/states/mount.py
	salt/utils/event.py
	tests/unit/utils/process_test.py
2014-12-16 14:45:25 -07:00
Seth House
51fa87c446 Change all state examples to use short-dec format for consistency
Closes #12419.

The command used to search the docs for state examples is below. This
generates a file in Vim's quickfix format that can be loaded with the -q
flag.

find . -type f \( -name '*.rst' -o -name '*.py' \) -print0
    | xargs -0 -P10 -n1 awk '
        BEGIN { RS=""; FS="\n" }
        { linenr = linect; linect += (NF + 1) }
        /^\s+[a-zA-Z0-9'\''_-]+:\n\s+[a-zA-Z0-9'\''_-]+:\n\s+- / {
            print FILENAME "|" linenr + 2 "|", $1
        }
    ' > ./salt-states.quickfix
2014-12-12 23:36:40 -07:00
Thomas Jackson
c1860f3dd9 Comma cleanup 2014-12-12 11:32:58 -08:00
Thomas S Hatch
e094b0136f Merge pull request #18902 from jacksontj/develop
More grammar/style cleanup
2014-12-12 09:40:55 -07:00
Steve Groesz
6cb313533b Fix missing text
Found missing colon, causing code blocks not to display.  This fixes issue #18879
2014-12-11 17:29:31 -06:00
Thomas Jackson
c18e834be1 Fix trailing whitespace
Conflicts:
	doc/topics/tutorials/states_pt2.rst
2014-12-11 07:53:19 -08:00
Martyn Smith
a899af7418 Fix example command to one that exists
Fix walkthrough to use disk.usage instead of disk.percent (which doesn't appear to exist any more).
2014-10-21 09:51:54 +13: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
Erik Johnson
b3e42245f6 Better documentation for outputters 2014-05-05 17:50:47 -05:00
Tarjei Husøy
29ca4293b7 Use fingerprints for key comparison in walkthrough 2014-03-23 16:40:48 +01:00
Erik Johnson
83063c8d68 Fix broken links and other sphinx errors 2014-03-17 17:17:18 -05:00
Wedge Jarrad
b4d49cbc09 Fix typo in walkthrough 2014-03-04 20:21:15 -08:00
Mike Place
2637fc689f Docs build cleanly! Yay! 2014-02-26 13:32:33 -07:00
Mike Place
b588e486ff Resolve merge conflict. 2014-02-20 10:18:45 -07:00
Mike Place
f7f28d738c Grammar. 2014-02-20 10:16:08 -07:00
Mike Place
6dd1178cda More changes in walk-through for clarity.
Conflicts:
	doc/topics/tutorials/walkthrough.rst
2014-02-20 10:16:02 -07:00
Thomas S Hatch
0c5af800a1 Fix typo in walkthrough 2014-02-18 12:28:31 -07:00
Zellyn Hunter
8a66cb315c Update walkthrough.rst
"proven ability" and "proven" were distractingly repetitive in this paragraph.
2014-02-17 07:58:38 -08:00
Mike Place
cdd163569c Improvements to clarity and readability. New YAML page, currently unlinked. 2014-02-12 17:15:05 -07:00
Seth House
4f00fa256b Fixed occurances of "Salt Stack" to SaltStack 2013-11-07 10:46:41 -07:00
Colton Myers
920a34fc7d Edit the docs with new id generation process 2013-10-08 11:18:02 -06:00
Erik Johnson
97015a5db4 Add more information about salt-call
This adds additional information both to the walkthrough and the
"troubleshooting" page.
2013-09-12 17:11:10 -05:00
Erik Johnson
e2bf055542 Add FAQ page to docs
This was added per #7024.
2013-09-05 09:10:47 -05:00
Erik Johnson
f15ce62cea Add more information on overriding providers
As noted in IRC, if you are using a custom linux spin or derivative, it
may not be apparent which provider to use when overriding providers in
the minion config file. This commit adds a massive table for the pkg,
service, user, and group providers which explains how they are used, to
help guide the user to the correct decision when specifying a provider
override.
2013-08-21 16:49:25 -06:00
Pedro Algarvio
9353dcafd3 Revert "salt.modules.cmdmod renamed to salt.modules.cmd while enforcing absolute imports."
This reverts commit 3fa341280b.
2013-08-20 23:44:03 +01:00
Pedro Algarvio
3fa341280b salt.modules.cmdmod renamed to salt.modules.cmd while enforcing absolute imports. 2013-08-19 13:45:56 +01:00
Erik Johnson
a59b5149c6 Clarify the minion ID generation docs 2013-08-15 22:23:14 -05:00
Erik Johnson
ce9b2728a0 Add documentation on how the minion id is derived 2013-08-15 18:03:38 -05:00
Erik Johnson
9c63495e04 Formatting fixes
This completes the documentation audit begun in cf365f7, using proper
backticks and :strong: tags to emphasize text, converting groups of
shell commands to bash code-block sections, etc. This also replaces the
use of \* with the easier-to-grok '*', which will hopefully reduce
confusion among new users.
2013-08-11 22:17:47 -05:00
Erik Johnson
c78a06c833 Remove links to nonexistant pages
Would be good to write these eventually, but for now don't try linking
to them since they do not exist.
2013-08-03 19:12:09 -05:00
Forrest
a860e5d002 Fixed a typo in pki minion information.
Modified path to properly reference the key location.
2013-07-29 22:35:28 -07:00
Seth House
24723629be Fixed rST cross-reference syntax in two tutorials 2013-07-22 14:35:49 -06:00
Erik Johnson
60faa582f8 Improve walkthrough
Several formatting changes, including links to function documentation
where appropriate. Also reworded a bit and added some additional
sections, including an example of how to verify a minion's public key
before accepting it, as requested in #6245.
2013-07-20 21:10:17 -05:00
Thomas S Hatch
32fda56f8d Add some comments on yaml arg parsing per #5483 2013-06-11 11:10:08 -06:00
Ulrich Dangel
96b64b9992 Fix spelling errors reported by lintian 2013-05-19 22:31:55 +01:00
Chris Rebert
498d2999db more typo fixes 2013-05-01 16:52:52 -07:00
Tim Hollinger
f13aedfc2b Improved readability, small grammar changes
swapped 'a' for 'an' where appropriate, fixed gramatical errors,
corrected verb agreement
2013-04-03 18:29:05 -06:00
Gary Wilson Jr
bd499e5640 Fixed several minor misspellings and acronym capitalizations. 2013-03-18 16:42:57 -05:00
Gary Wilson Jr
cc72ebb1fb Fixed :doc: uses in the docs that were not rendering due to an extra space. 2013-03-18 16:42:56 -05:00
Thomas S Hatch
a91a12cbfb doc fix for some links 2013-03-14 10:18:26 -06:00