mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
Fixed all typos I can find
This commit is contained in:
parent
185daa3218
commit
d2094f8b60
10 changed files with 22 additions and 22 deletions
4
AUTHORS
4
AUTHORS
|
@ -2,8 +2,8 @@
|
|||
Salt-API Authors
|
||||
================
|
||||
|
||||
Whos Who in Salt-API
|
||||
====================
|
||||
Who's Who in Salt-API
|
||||
=====================
|
||||
|
||||
The Man With the Plan
|
||||
---------------------
|
||||
|
|
|
@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|||
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
||||
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
||||
..
|
||||
.\" Man page generated from reStructeredText.
|
||||
.\" Man page generated from reStructuredText.
|
||||
.
|
||||
.sp
|
||||
Start interfaces used to remotely connect to the salt master
|
||||
|
@ -41,7 +41,7 @@ salt\-api
|
|||
.fi
|
||||
.SH DESCRIPTION
|
||||
.sp
|
||||
The Salt API system manages network api connectors for the Salt Matser
|
||||
The Salt API system manages network api connectors for the Salt Master
|
||||
.SH OPTIONS
|
||||
.INDENT 0.0
|
||||
.TP
|
||||
|
|
|
@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|||
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
||||
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
||||
..
|
||||
.\" Man page generated from reStructeredText.
|
||||
.\" Man page generated from reStructuredText.
|
||||
.
|
||||
.sp
|
||||
\fBsalt\-api\fP is a modular interface on top of \fI\%Salt\fP that can provide a
|
||||
|
@ -52,7 +52,7 @@ netapi modules simply bind to a port and start a service. They are enabled by
|
|||
specifying the name of a netapi module and the port to bind in the master
|
||||
config file.
|
||||
.sp
|
||||
Communication with Salt and Salt satelite projects is done by passing a list of
|
||||
Communication with Salt and Salt satellite projects is done by passing a list of
|
||||
low\-data dictionaries to a client interface. Low\-data is a dictionary that
|
||||
specifies the client, the function inside that client to execute, and any
|
||||
additional arguments or parameters.
|
||||
|
@ -130,7 +130,7 @@ documentation in the form of a module docstring and docstrings on any classes,
|
|||
methods, and functions in your \fBnetapi\fP module.
|
||||
.SS Loader “magic” methods
|
||||
.sp
|
||||
The loader makes the \fB__opts__\fP datastructure available to any function in
|
||||
The loader makes the \fB__opts__\fP data structure available to any function in
|
||||
a \fBnetapi\fP module.
|
||||
.SS Full list of netapi modules
|
||||
.SS Full list of netapi modules
|
||||
|
@ -266,7 +266,7 @@ The primary execution vector for the rest of the API
|
|||
.INDENT 7.0
|
||||
.TP
|
||||
.B POST /
|
||||
You must pass low\-data in the requst body either from an HTML form
|
||||
You must pass low\-data in the request body either from an HTML form
|
||||
or as JSON or YAML.
|
||||
.sp
|
||||
\fBExample request\fP:
|
||||
|
@ -522,7 +522,7 @@ Start an execution command and immediately return the job id
|
|||
.INDENT 7.0
|
||||
.TP
|
||||
.B POST /minions
|
||||
You must pass low\-data in the requst body either from an HTML form
|
||||
You must pass low\-data in the request body either from an HTML form
|
||||
or as JSON or YAML. The \fBclient\fP option is pre\-set to
|
||||
\fBlocal_async\fP.
|
||||
.sp
|
||||
|
|
|
@ -14,7 +14,7 @@ Synopsis
|
|||
Description
|
||||
===========
|
||||
|
||||
The Salt API system manages network api connectors for the Salt Matser
|
||||
The Salt API system manages network api connectors for the Salt Master
|
||||
|
||||
Options
|
||||
=======
|
||||
|
|
|
@ -13,7 +13,7 @@ netapi modules are enabled by adding configuration to your master config file.
|
|||
Check the docs for each module to see external requirements and configuration
|
||||
settings.
|
||||
|
||||
Communication with Salt and Salt satelite projects is done by passing a list of
|
||||
Communication with Salt and Salt satellite projects is done by passing a list of
|
||||
lowstate dictionaries to a client interface. A list of available client
|
||||
interfaces is below. The lowstate dictionary items map to keyword arguments on
|
||||
the client interface.
|
||||
|
|
|
@ -50,5 +50,5 @@ methods, and functions in your :py:mod:`~saltapi.netapi` module.
|
|||
Loader “magic” methods
|
||||
======================
|
||||
|
||||
The loader makes the ``__opts__`` datastructure available to any function in
|
||||
The loader makes the ``__opts__`` data structure available to any function in
|
||||
a :py:mod:`~saltapi.netapi` module.
|
||||
|
|
|
@ -4,7 +4,7 @@ salt-api 0.8.0
|
|||
|
||||
We are happy to announce the release of :program:`salt-api` 0.8.0.
|
||||
|
||||
This release encompases bugfixes and new features for the
|
||||
This release encompasses bugfixes and new features for the
|
||||
:py:mod:`rest_cherrypy <saltapi.netapi.rest_cherrypy.app>` netapi module that
|
||||
provides a RESTful interface for a running Salt system.
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ provides=('salt-api')
|
|||
source=("git://github.com/saltstack/salt-api.git")
|
||||
|
||||
# makepkg knows it's a git repo because the url starts with 'git'
|
||||
# it then knows to checkout the branch 'pacman41' upon cloning, expediating versioning.
|
||||
# it then knows to checkout the branch 'pacman41' upon cloning, expediting versioning.
|
||||
# branch="develop"
|
||||
# source=("git://github.com/saltstack/salt-api.git#branch=$branch")
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
Fri Aug 9 20:24:28 UTC 2013 - aboe76@gmail.com
|
||||
|
||||
- Updated salt-api init file:
|
||||
Same file as the salt-api package for Rhel/Fedora
|
||||
Same file as the salt-api package for RHEL/Fedora
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 18 04:46:39 UTC 2013 - aboe76@gmail.com
|
||||
|
|
|
@ -46,7 +46,7 @@ A REST API for Salt
|
|||
|
||||
.. versionadded:: 0.8.2
|
||||
app_path : ``/app``
|
||||
The URL prefix to use for serving the HTML file specifed in the ``app``
|
||||
The URL prefix to use for serving the HTML file specified in the ``app``
|
||||
setting. This should be a simple name containing no slashes.
|
||||
|
||||
Any path information after the specified path is ignored; this is
|
||||
|
@ -111,7 +111,7 @@ dictionaries. This allows you to specify multiple commands in a single request.
|
|||
lowstate
|
||||
A dictionary containing various keys that instruct Salt which command
|
||||
to run, where that command lives, any parameters for that command, any
|
||||
authentication credientials, what returner to use, etc.
|
||||
authentication credentials, what returner to use, etc.
|
||||
|
||||
Salt uses the lowstate data format internally in many places to pass
|
||||
command data between functions. Salt also uses lowstate for the
|
||||
|
@ -309,7 +309,7 @@ def process_request_body(fn):
|
|||
def urlencoded_processor(entity):
|
||||
'''
|
||||
Accept x-www-form-urlencoded data (run through CherryPy's formatter)
|
||||
and reformat it into a Low State datastructure.
|
||||
and reformat it into a Low State data structure.
|
||||
|
||||
Since we can't easily represent complicated data structures with
|
||||
key-value pairs, any more complicated requirements (e.g. compound
|
||||
|
@ -337,7 +337,7 @@ def urlencoded_processor(entity):
|
|||
@process_request_body
|
||||
def json_processor(entity):
|
||||
'''
|
||||
Unserialize raw POST data in JSON format to a Python datastructure.
|
||||
Unserialize raw POST data in JSON format to a Python data structure.
|
||||
|
||||
:param entity: raw POST data
|
||||
'''
|
||||
|
@ -351,7 +351,7 @@ def json_processor(entity):
|
|||
@process_request_body
|
||||
def yaml_processor(entity):
|
||||
'''
|
||||
Unserialize raw POST data in YAML format to a Python datastructure.
|
||||
Unserialize raw POST data in YAML format to a Python data structure.
|
||||
|
||||
:param entity: raw POST data
|
||||
'''
|
||||
|
@ -367,7 +367,7 @@ def hypermedia_in():
|
|||
Unserialize POST/PUT data of a specified Content-Type.
|
||||
|
||||
The following custom processors all are intended to format Low State data
|
||||
and will place that datastructure into the request object.
|
||||
and will place that data structure into the request object.
|
||||
|
||||
:raises HTTPError: if the request contains a Content-Type that we do not
|
||||
have a processor for
|
||||
|
@ -420,7 +420,7 @@ class LowDataAdapter(object):
|
|||
|
||||
def exec_lowstate(self):
|
||||
'''
|
||||
Pull a Low State datastructure from request and execute the low-data
|
||||
Pull a Low State data structure from request and execute the low-data
|
||||
chunks through Salt. The low-data chunks will be updated to include the
|
||||
authorization token for the current session.
|
||||
'''
|
||||
|
|
Loading…
Add table
Reference in a new issue