summaryrefslogtreecommitdiffstats
path: root/Documentation/00-INDEX
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2011-05-20 18:10:04 +0200
committerRandy Dunlap <randy.dunlap@oracle.com>2011-05-20 18:10:04 +0200
commit2f3e4af471e38e0658e701973238ae4b5e50fcd6 (patch)
treefbfc99c0d975e38ff80f4ff3239a9fc0567b8a4d /Documentation/00-INDEX
parentCorrect occurrences of (diff)
parentCreate Documentation/security/, (diff)
downloadlinux-2f3e4af471e38e0658e701973238ae4b5e50fcd6.tar.xz
linux-2f3e4af471e38e0658e701973238ae4b5e50fcd6.zip
Merge branch 'docs-security' into docs-move
Diffstat (limited to 'Documentation/00-INDEX')
-rw-r--r--Documentation/00-INDEX6
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 1b777b960492..1f89424c36a6 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -192,10 +192,6 @@ kernel-docs.txt
- listing of various WWW + books that document kernel internals.
kernel-parameters.txt
- summary listing of command line / boot prompt args for the kernel.
-keys-request-key.txt
- - description of the kernel key request service.
-keys.txt
- - description of the kernel key retention service.
kobject.txt
- info of the kobject infrastructure of the Linux kernel.
kprobes.txt
@@ -294,6 +290,8 @@ scheduler/
- directory with info on the scheduler.
scsi/
- directory with info on Linux scsi support.
+security/
+ - directory that contains security-related info
serial/
- directory with info on the low level serial API.
serial-console.txt