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.

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

Doc improvements #1316

Merged
merged 3 commits into from Nov 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/firststeps/login.rst
Expand Up @@ -29,8 +29,8 @@ The administrator just logs in with his username.

.. note:: You can configure privacyIDEA to authenticate administrators
against privacyIDEA itself, so that administrators
need to login with a second factor. See SUPERUSER_REALM in
:ref:`inifile_superusers` how to do this.
need to login with a second factor. See
:ref:`faq_admins` how to do this.


Login for normal users
Expand Down
2 changes: 1 addition & 1 deletion doc/policies/index.rst
Expand Up @@ -141,7 +141,7 @@ Each policy can contain the following attributes:
The priority field of policies contains a positive number and defaults to 1.
In case of policy conflicts, policies with a lower priority number take precedence.

It can be used to resolve policy conflicts. An example is the :ref:`passthru-policy`:
It can be used to resolve policy conflicts. An example is the :ref:`passthru_policy`:
Assume there are two passthru policies ``pol1`` and ``pol2`` that
define different action values, e.g. ``pol1`` defines ``passthru=userstore``
and ``pol2`` defines ``passthru=radius1``.
Expand Down
43 changes: 0 additions & 43 deletions doc/policies/ocra.rst

This file was deleted.

52 changes: 0 additions & 52 deletions doc/policies/system.rst

This file was deleted.

3 changes: 1 addition & 2 deletions privacyidea/lib/policy.py
Expand Up @@ -869,8 +869,7 @@ def set_policy(name=None, scope=None, action=None, realm=None, resolver=None,
If the policy with this name already exists, it updates the policy.
It expects a dict of with the following keys:
:param name: The name of the policy
:param scope: The scope of the policy. Something like "admin", "system",
"authentication"
:param scope: The scope of the policy. Something like "admin" or "authentication"
:param action: A scope specific action or a comma separated list of actions
:type active: basestring
:param realm: A realm, for which this policy is valid
Expand Down