Skip to content
This repository has been archived by the owner on Mar 29, 2019. It is now read-only.

Commit

Permalink
Merge pull request #41 from marumari/master
Browse files Browse the repository at this point in the history
Minor documentation fixes
  • Loading branch information
april committed Sep 17, 2015
2 parents c8af011 + 9650fa9 commit 1afeec0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docs/source/configure_minion.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ To configure the frontend, place your configuration in a file called ``frontend.

- ``login``

- ``type``: the type of authentication to use; support types are currently ``persona``, which requires no configuration, and ``ldap``
- ``type``: the type of authentication to use; currently supported types are ``persona``, which requires no configuration, and ``ldap``

- ``ldap``: the configuration for LDAP, if ``ldap`` is the chosen authentication method in ``login -> ``type``

Expand Down Expand Up @@ -85,7 +85,7 @@ Here is the `default configuration <https://github.com/mozilla/minion-backend/bl
'email': {
'host': '127.0.0.1',
'port': 25,
'max_time_allowed': 604800 * 24 * 7 # 60 * 60 * 24 * 7 seconds
'max_time_allowed': 604800 # 7 * 24 * 60 * 60 (7 days)
}
}

Expand Down
3 changes: 2 additions & 1 deletion docs/source/inside_minion.rst
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ Two base classes for plugins are provided in the Minion backend to get developer
several other extensions, especially those that wrap existing security tools.

Besides the primitive basic plugins, Mozilla developers have created several
plugins. See :ref:`community_plugins_label`.
plugins:

.. include:: include/plugin_repos.rst

Task Engine
-----------
Expand Down

0 comments on commit 1afeec0

Please sign in to comment.