Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25

[linux-2.6] / security / selinux / Kconfig

diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig
index d62b0984312791bd4dcfd6e66f95b6ca13c82dd2..2b517d6186729c05608d56dd1123926a242c61d2 100644 (file)
--- a/security/selinux/Kconfig
+++ b/security/selinux/Kconfig
@@ -122,7 +122,7 @@ config SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT
          well as any conntrack helpers for protocols which you
          wish to control.
 
          well as any conntrack helpers for protocols which you
          wish to control.
 

-         If you are unsure what do do here, select N.
+         If you are unsure what to do here, select N.

 
 config SECURITY_SELINUX_POLICYDB_VERSION_MAX
        bool "NSA SELinux maximum supported policy format version"
 
 config SECURITY_SELINUX_POLICYDB_VERSION_MAX
        bool "NSA SELinux maximum supported policy format version"


@@ -137,7 +137,7 @@ config SECURITY_SELINUX_POLICYDB_VERSION_MAX
 
          Examples:
          For the Fedora Core 3 or 4 Linux distributions, enable this option
 
          Examples:
          For the Fedora Core 3 or 4 Linux distributions, enable this option

-         and set the value via the next option. For Fedore Core 5 and later,
+         and set the value via the next option. For Fedora Core 5 and later,

          do not enable this option.
 
          If you are unsure how to answer this question, answer N.
          do not enable this option.
 
          If you are unsure how to answer this question, answer N.


@@ -145,7 +145,7 @@ config SECURITY_SELINUX_POLICYDB_VERSION_MAX
 config SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE
        int "NSA SELinux maximum supported policy format version value"
        depends on SECURITY_SELINUX_POLICYDB_VERSION_MAX
 config SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE
        int "NSA SELinux maximum supported policy format version value"
        depends on SECURITY_SELINUX_POLICYDB_VERSION_MAX

-       range 15 21
+       range 15 22

        default 19
        help
          This option sets the value for the maximum policy format version
        default 19
        help
          This option sets the value for the maximum policy format version