From adf31eebd75e9e7c2eda222695637398b3872a68 Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Sat, 19 Aug 2017 16:21:06 +0100 Subject: docs: Fix paths in security/keys Several paths in the security/keys documentation were incorrect. Signed-off-by: Josh Holland Signed-off-by: Jonathan Corbet --- Documentation/security/keys/core.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/security/keys/core.rst') diff --git a/Documentation/security/keys/core.rst b/Documentation/security/keys/core.rst index 1648fa80b3bf..312f981fa4a0 100644 --- a/Documentation/security/keys/core.rst +++ b/Documentation/security/keys/core.rst @@ -443,7 +443,7 @@ The main syscalls are: /sbin/request-key will be invoked in an attempt to obtain a key. The callout_info string will be passed as an argument to the program. - See also Documentation/security/keys-request-key.txt. + See also Documentation/security/keys/request-key.rst. The keyctl syscall functions are: @@ -973,7 +973,7 @@ payload contents" for more information. If successful, the key will have been attached to the default keyring for implicitly obtained request-key keys, as set by KEYCTL_SET_REQKEY_KEYRING. - See also Documentation/security/keys-request-key.txt. + See also Documentation/security/keys/request-key.rst. * To search for a key, passing auxiliary data to the upcaller, call:: -- cgit v1.2.3-55-g7522 From 33c2f4ec984d8a78f15b9d989968733606512bb2 Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Wed, 23 Aug 2017 21:42:32 +0100 Subject: docs: ReSTify table of contents in core.rst Sphinx will now generate the table of contents automatically, which avoids having the ToC getting out of sync with the rest of the document. Signed-off-by: Josh Holland Signed-off-by: Jonathan Corbet --- Documentation/security/keys/core.rst | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'Documentation/security/keys/core.rst') diff --git a/Documentation/security/keys/core.rst b/Documentation/security/keys/core.rst index 312f981fa4a0..1266eeae45f6 100644 --- a/Documentation/security/keys/core.rst +++ b/Documentation/security/keys/core.rst @@ -16,17 +16,7 @@ The key service can be configured on by enabling: This document has the following sections: - - Key overview - - Key service overview - - Key access permissions - - SELinux support - - New procfs files - - Userspace system call interface - - Kernel services - - Notes on accessing payload contents - - Defining a key type - - Request-key callback service - - Garbage collection +.. contents:: :local: Key Overview -- cgit v1.2.3-55-g7522