2 files changed, 18 insertions, 1 deletions

diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 083258f0eab5..d3290c46af51 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -340,7 +340,7 @@ X!Earch/x86/kernel/mca_32.c
 
   <chapter id="security">
      <title>Security Framework</title>
-!Esecurity/security.c
+!Isecurity/security.c
   </chapter>
 
   <chapter id="audit">
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index a0ed205e5351..63bda3637085 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -75,10 +75,12 @@ parameter is applicable:
         PPT     Parallel port support is enabled.
         PS2     Appropriate PS/2 support is enabled.
         RAM     RAM disk support is enabled.
+        ROOTPLUG The example Root Plug LSM is enabled.
         S390    S390 architecture is enabled.
         SCSI    Appropriate SCSI support is enabled.
                         A lot of drivers has their options described inside of
                         Documentation/scsi/.
+        SECURITY Different security models are enabled.
         SELINUX SELinux support is enabled.
         SERIAL  Serial support is enabled.
         SH      SuperH architecture is enabled.
@@ -373,6 +375,12 @@ and is between 256 and 4096 characters. It is defined in the file
                         possible to determine what the correct size should be.
                         This option provides an override for these situations.
 
+        capability.disable=
+                        [SECURITY] Disable capabilities.  This would normally
+                        be used only if an alternative security model is to be
+                        configured.  Potentially dangerous and should only be
+                        used if you are entirely sure of the consequences.
+
         chandev=        [HW,NET] Generic channel device initialisation
 
         checkreqprot    [SELINUX] Set initial checkreqprot flag value.
@@ -1539,6 +1547,15 @@ and is between 256 and 4096 characters. It is defined in the file
                         Useful for devices that are detected asynchronously
                         (e.g. USB and MMC devices).
 
+        root_plug.vendor_id=
+                        [ROOTPLUG] Override the default vendor ID
+
+        root_plug.product_id=
+                        [ROOTPLUG] Override the default product ID
+
+        root_plug.debug=
+                        [ROOTPLUG] Enable debugging output
+
         rw              [KNL] Mount root device read-write on boot
 
         S               [KNL] Run init in single mode