Merge "Fix SELinux documentation."
diff --git a/src/security/selinux/validate.jd b/src/security/selinux/validate.jd
index 4458853..3f6dea0 100644
--- a/src/security/selinux/validate.jd
+++ b/src/security/selinux/validate.jd
@@ -31,7 +31,7 @@
 <p>Once applied, make sure SELinux is running in the correct mode on the device by
 issuing the command:getenforce</p>
 
-<p>This will print the global SELinux mode: either Disabled, Enforcing, or
+<p>This will print the global SELinux mode: either Enforcing or
 Permissive. Please note, this command shows only the global SELinux mode. To
 determine the SELinux mode for each domain, you must examine the corresponding
 files or run the latest version of <code>sepolicy-analyze</code> with the appropriate (-p) flag, present in /platform/system/sepolicy/tools/.</p>
@@ -108,29 +108,19 @@
 
 <pre>
 androidboot.selinux=permissive
-androidboot.selinux=disabled
 androidboot.selinux=enforcing
 </pre>
 
 <h2 id=using_audit2allow>Using audit2allow</h2>
 
 <p>The <code>selinux/policycoreutils/audit2allow</code> tool takes <code>dmesg</code> denials and converts them into corresponding SELinux policy statements. As
-such, it can greatly speed SELinux development. To install it, run:</p>
+such, it can greatly speed SELinux development. <code>audit2allow</code> is shipped as part of the Android source tree and
+is compiled automatically when you build Android from source.</p>
+
+<p>To use it, run:</p>
 
 <pre>
-$ sudo apt-get install policycoreutils
-</pre>
-
-<p>To use it on Ubuntu 12.04, run:</p>
-
-<pre>
-$ adb shell su root dmesg | audit2allow
-</pre>
-
-<p>On Ubuntu 14.04 and newer, audit2allow requires you to specify the Android policy
-using the -p option, e.g.
-<pre>
-$ adb shell su root dmesg | audit2allow -p out/target/product/&lt;device&gt;/root/sepolicy
+$ adb shell su root dmesg | audit2allow -p $OUT/root/sepolicy
 </pre>
 
 <p>Nevertheless, care must be taken to examine each potential addition for