]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
doc: ReSTify tomoyo.txt
authorKees Cook <keescook@chromium.org>
Sat, 13 May 2017 11:51:46 +0000 (04:51 -0700)
committerJonathan Corbet <corbet@lwn.net>
Thu, 18 May 2017 16:32:57 +0000 (10:32 -0600)
Adjusts for ReST markup and moves under LSM admin guide.

Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Documentation/admin-guide/LSM/index.rst
Documentation/admin-guide/LSM/tomoyo.rst [moved from Documentation/security/tomoyo.txt with 85% similarity]
Documentation/security/00-INDEX

index a4db29410ea0f114159b64e424c12c689256aad0..6aa4e0dc588b4ebaaa55667ead13b62d3889839c 100644 (file)
@@ -35,3 +35,4 @@ the one "major" module (e.g. SELinux) if there is one configured.
 
    apparmor
    SELinux
+   tomoyo
similarity index 85%
rename from Documentation/security/tomoyo.txt
rename to Documentation/admin-guide/LSM/tomoyo.rst
index 200a2d37cbc8970e08ac3f2c2323ba066c4f3bdb..a5947218fa647f4f4e2cb2b032dfec85d34ce709 100644 (file)
@@ -1,21 +1,30 @@
---- What is TOMOYO? ---
+======
+TOMOYO
+======
+
+What is TOMOYO?
+===============
 
 TOMOYO is a name-based MAC extension (LSM module) for the Linux kernel.
 
 LiveCD-based tutorials are available at
+
 http://tomoyo.sourceforge.jp/1.7/1st-step/ubuntu10.04-live/
-http://tomoyo.sourceforge.jp/1.7/1st-step/centos5-live/ .
+http://tomoyo.sourceforge.jp/1.7/1st-step/centos5-live/
+
 Though these tutorials use non-LSM version of TOMOYO, they are useful for you
 to know what TOMOYO is.
 
---- How to enable TOMOYO? ---
+How to enable TOMOYO?
+=====================
 
-Build the kernel with CONFIG_SECURITY_TOMOYO=y and pass "security=tomoyo" on
+Build the kernel with ``CONFIG_SECURITY_TOMOYO=y`` and pass ``security=tomoyo`` on
 kernel's command line.
 
 Please see http://tomoyo.sourceforge.jp/2.3/ for details.
 
---- Where is documentation? ---
+Where is documentation?
+=======================
 
 User <-> Kernel interface documentation is available at
 http://tomoyo.sourceforge.jp/2.3/policy-reference.html .
@@ -42,7 +51,8 @@ History of TOMOYO?
   Realities of Mainlining
     http://sourceforge.jp/projects/tomoyo/docs/lfj2008.pdf
 
---- What is future plan? ---
+What is future plan?
+====================
 
 We believe that inode based security and name based security are complementary
 and both should be used together. But unfortunately, so far, we cannot enable
index 22ebdc02f0dce4928c906d39ff7cbe0f453a4719..04ef62511ea143ff9a7f680ef2a8dd9feffca584 100644 (file)
@@ -12,5 +12,3 @@ 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.