Browse Source

doc: ReSTify tomoyo.txt

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>
Kees Cook 8 years ago
parent
commit
5ea672c752

+ 1 - 0
Documentation/admin-guide/LSM/index.rst

@@ -35,3 +35,4 @@ the one "major" module (e.g. SELinux) if there is one configured.
 
 
    apparmor
    apparmor
    SELinux
    SELinux
+   tomoyo

+ 16 - 6
Documentation/security/tomoyo.txt → Documentation/admin-guide/LSM/tomoyo.rst

@@ -1,21 +1,30 @@
---- What is TOMOYO? ---
+======
+TOMOYO
+======
+
+What is TOMOYO?
+===============
 
 
 TOMOYO is a name-based MAC extension (LSM module) for the Linux kernel.
 TOMOYO is a name-based MAC extension (LSM module) for the Linux kernel.
 
 
 LiveCD-based tutorials are available at
 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/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
 Though these tutorials use non-LSM version of TOMOYO, they are useful for you
 to know what TOMOYO is.
 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.
 kernel's command line.
 
 
 Please see http://tomoyo.sourceforge.jp/2.3/ for details.
 Please see http://tomoyo.sourceforge.jp/2.3/ for details.
 
 
---- Where is documentation? ---
+Where is documentation?
+=======================
 
 
 User <-> Kernel interface documentation is available at
 User <-> Kernel interface documentation is available at
 http://tomoyo.sourceforge.jp/2.3/policy-reference.html .
 http://tomoyo.sourceforge.jp/2.3/policy-reference.html .
@@ -42,7 +51,8 @@ History of TOMOYO?
   Realities of Mainlining
   Realities of Mainlining
     http://sourceforge.jp/projects/tomoyo/docs/lfj2008.pdf
     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
 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
 and both should be used together. But unfortunately, so far, we cannot enable

+ 0 - 2
Documentation/security/00-INDEX

@@ -12,5 +12,3 @@ keys-trusted-encrypted.txt
 	- info on the Trusted and Encrypted keys in the kernel key ring service.
 	- info on the Trusted and Encrypted keys in the kernel key ring service.
 keys.txt
 keys.txt
 	- description of the kernel key retention service.
 	- description of the kernel key retention service.
-tomoyo.txt
-	- documentation on the TOMOYO Linux Security Module.