Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f3e4af4 authored by Randy Dunlap's avatar Randy Dunlap
Browse files

Merge branch 'docs-security' into docs-move

parents 61516587 d410fa4e
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -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
+2 −2
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ request-key will find the first matching line and corresponding program. In
this case, /some/other/program will handle all uid lookups and
/usr/sbin/nfs.idmap will handle gid, user, and group lookups.

See <file:Documentation/keys-request-keys.txt> for more information about the
request-key function.
See <file:Documentation/security/keys-request-keys.txt> for more information
about the request-key function.


=========
+2 −2
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ the key will be discarded and recreated when the data it holds has expired.
dns_query() returns a copy of the value attached to the key, or an error if
that is indicated instead.

See <file:Documentation/keys-request-key.txt> for further information about
request-key function.
See <file:Documentation/security/keys-request-key.txt> for further
information about request-key function.


=========
+18 −0
Original line number Diff line number Diff line
00-INDEX
	- this file.
SELinux.txt
	- how to get started with the SELinux security enhancement.
Smack.txt
	- documentation on the Smack Linux Security Module.
apparmor.txt
	- documentation on the AppArmor security extension.
credentials.txt
	- documentation about credentials in Linux.
keys-request-key.txt
	- description of the kernel key request service.
keys-trusted-encrypted.txt
	- info on the Trusted and Encrypted keys in the kernel key ring service.
keys.txt
	- description of the kernel key retention service.
tomoyo.txt
	- documentation on the TOMOYO Linux Security Module.
Loading