Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

READY FOR REVIEW - Various spelling/grammar fixes #1022

Merged
merged 1 commit into from
Dec 14, 2016
Merged

READY FOR REVIEW - Various spelling/grammar fixes #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion circus/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def __call__(self, watchers, controller=None,
- **hooks**: callback functions for hooking into the watcher
startup and shutdown process. **hooks** is a dict where each key
is the hook name and each value is a 2-tuple with the name of the
callable or the callabled itself and a boolean flag indicating if
callable or the callable itself and a boolean flag indicating if
an exception occuring in the hook should not be ignored.
Possible values for the hook name: *before_start*, *after_start*,
*before_spawn*, *after_spawn*, *before_stop*, *after_stop*,
Expand Down
2 changes: 1 addition & 1 deletion circus/watcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ class Watcher(object):
- **hooks**: callback functions for hooking into the watcher startup
and shutdown process. **hooks** is a dict where each key is the hook
name and each value is a 2-tuple with the name of the callable
or the callabled itself and a boolean flag indicating if an
or the callable itself and a boolean flag indicating if an
exception occuring in the hook should not be ignored.
Possible values for the hook name: *before_start*, *after_start*,
*before_spawn*, *after_spawn*, *before_stop*, *after_stop*.,
Expand Down
4 changes: 2 additions & 2 deletions docs/source/for-devs/library.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The get_arbiter function
========================

:func:`get_arbiter` is just a convenience on top of the various
circus classes. It creates a :term:`arbiter` (class :class:`Arbiter`) instance
circus classes. It creates an :term:`arbiter` (class :class:`Arbiter`) instance
with the provided options, which in turn runs a single :class:`Watcher` with a
single :class:`Process`.

Expand Down Expand Up @@ -48,7 +48,7 @@ manager:
- :class:`Watcher`: run several instances of :class:`Process` against the same
command. Manage the death and life of processes.

- :class:`Arbiter`: manages several :class:`Watcher`.
- :class:`Arbiter`: manages several :class:`Watcher` instances.


.. autoclass:: circus.process.Process
Expand Down