summaryrefslogtreecommitdiffstats
path: root/doc/admin/conf_files/kadm5_acl.rst
diff options
context:
space:
mode:
authorBen Kaduk <kaduk@mit.edu>2012-11-28 14:19:43 -0500
committerBen Kaduk <kaduk@mit.edu>2012-12-10 13:01:07 -0500
commit8bff1e50c28b6f11b771add7bd7d4a57419a567b (patch)
treed61dd973acd51feb628120172de6882bcb34289d /doc/admin/conf_files/kadm5_acl.rst
parent4e0d270faad7fabd773cb159b8cb8e03adb19462 (diff)
downloadkrb5-8bff1e50c28b6f11b771add7bd7d4a57419a567b.tar.gz
krb5-8bff1e50c28b6f11b771add7bd7d4a57419a567b.tar.xz
krb5-8bff1e50c28b6f11b771add7bd7d4a57419a567b.zip
Reformat RST to avoid sphinx warnings
Old versions of docutils will see inline markup (e.g., :ref:`foo`) at the beginning of a line in the content of a directive block and attempt to interpret that markup as options or arguments to the directive. RST intended as inline markup (as opposed to modifying the behavior of the directive) will not be interpretable in this context, and causes Sphinx to emit a warning. Work around this behavior by always leaving a blank line before the content of a directive block, forcing it to be interpreted as content and not options or arguments. The buggy behavior was only encountered in note environments, but for consistency of style, also reformat warning and error blocks. Note the new style constraint in doc/README. ticket: 7469 (new) title: doc buildslave generates sphinx warnings tags: pullup target_version: 1.11
Diffstat (limited to 'doc/admin/conf_files/kadm5_acl.rst')
-rw-r--r--doc/admin/conf_files/kadm5_acl.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/admin/conf_files/kadm5_acl.rst b/doc/admin/conf_files/kadm5_acl.rst
index 4a8e0741e0..ffebe90bb7 100644
--- a/doc/admin/conf_files/kadm5_acl.rst
+++ b/doc/admin/conf_files/kadm5_acl.rst
@@ -25,7 +25,9 @@ ignored. Lines containing ACL entries have the format:
principal permissions [target_principal [restrictions] ]
-.. note:: Line order in the ACL file is important. The first matching entry
+.. note::
+
+ Line order in the ACL file is important. The first matching entry
will control access for an actor principal on a target principal.
*principal*
@@ -88,6 +90,7 @@ ignored. Lines containing ACL entries have the format:
which is allowed due to that ACL line.
.. warning::
+
If the kadmind ACL file is modified, the kadmind daemon needs to be
restarted for changes to take effect.