From 74b2fdc52c6c86ce6388bae3f512066532e9da1b Mon Sep 17 00:00:00 2001
From: Jamie Strandboge <jamie@ubuntu.com>
Date: Mon, 7 Feb 2011 17:39:54 -0600
Subject: [PATCH] update documentation for aa-disable

---
 utils/aa-audit.pod     |  4 ++--
 utils/aa-autodep.pod   |  4 ++--
 utils/aa-complain.pod  | 10 +++++-----
 utils/aa-enforce.pod   | 11 ++++++-----
 utils/aa-genprof.pod   |  5 +++--
 utils/aa-logprof.pod   |  4 ++--
 utils/logprof.conf.pod |  4 ++--
 7 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/utils/aa-audit.pod b/utils/aa-audit.pod
index 4541586a4..94b47db95 100644
--- a/utils/aa-audit.pod
+++ b/utils/aa-audit.pod
@@ -20,7 +20,7 @@ L<http://https://bugs.launchpad.net/apparmor/+filebug>.
 
 =head1 SEE ALSO
 
-apparmor(7), apparmor.d(5), aa-enforce(1), aa-complain(1), aa_change_hat(2),
-and L<http://wiki.apparmor.net>.
+apparmor(7), apparmor.d(5), aa-enforce(1), aa-complain(1), aa-disable(1),
+aa_change_hat(2), and L<http://wiki.apparmor.net>.
 
 =cut
diff --git a/utils/aa-autodep.pod b/utils/aa-autodep.pod
index 97980fa6c..2b93c4967 100644
--- a/utils/aa-autodep.pod
+++ b/utils/aa-autodep.pod
@@ -46,7 +46,7 @@ L<http://https://bugs.launchpad.net/apparmor/+filebug>.
 
 =head1 SEE ALSO
 
-apparmor(7), apparmor.d(5), aa-complain(1), aa-enforce(1), aa_change_hat(2),
-and L<http://wiki.apparmor.net>.
+apparmor(7), apparmor.d(5), aa-complain(1), aa-enforce(1), aa-disable(1),
+aa_change_hat(2), and L<http://wiki.apparmor.net>.
 
 =cut
diff --git a/utils/aa-complain.pod b/utils/aa-complain.pod
index 8dc895139..ddbea1d2b 100644
--- a/utils/aa-complain.pod
+++ b/utils/aa-complain.pod
@@ -30,9 +30,9 @@ B<aa-complain I<E<lt>executableE<gt>> [I<E<lt>executableE<gt>> ...]>
 
 =head1 DESCRIPTION
 
-B<aa-complain> is used to set the enforcement mode for one or more profiles to complain.
-In this mode security policy is not enforced but rather access violations are logged
-to the system log.  
+B<aa-complain> is used to set the enforcement mode for one or more profiles to
+complain. In this mode security policy is not enforced but rather access
+violations are logged to the system log.
 
 =head1 BUGS
 
@@ -41,7 +41,7 @@ L<http://https://bugs.launchpad.net/apparmor/+filebug>.
 
 =head1 SEE ALSO
 
-apparmor(7), apparmor.d(5), aa-enforce(1), aa_change_hat(2), and
-L<http://wiki.apparmor.net>.
+apparmor(7), apparmor.d(5), aa-enforce(1), aa-disable(1),
+aa_change_hat(2), and L<http://wiki.apparmor.net>.
 
 =cut
diff --git a/utils/aa-enforce.pod b/utils/aa-enforce.pod
index 56ab7d004..3bc1da38a 100644
--- a/utils/aa-enforce.pod
+++ b/utils/aa-enforce.pod
@@ -23,7 +23,7 @@
 =head1 NAME
 
 aa-enforce - set an AppArmor security profile to I<enforce> mode from
-I<complain> mode.
+being disabled or I<complain> mode.
 
 =head1 SYNOPSIS
 
@@ -32,8 +32,9 @@ B<aa-enforce I<E<lt>executableE<gt>> [I<E<lt>executableE<gt>> ...]>
 =head1 DESCRIPTION
 
 B<aa-enforce> is used to set the enforcement mode for one or more profiles
-to I<enforce>.  This command is only relevant is conjuction with the
-utility I<complain> which sets a profile to complain mode. The default
+to I<enforce>.  This command is only relevant in conjuction with the
+I<aa-complain> utility which sets a profile to complain mode and the
+I<aa-disable> utility which unloads and disables a profile. The default
 mode for a security policy is enforce and the I<aa-complain> utility must
 be run to change this behavior.
 
@@ -44,7 +45,7 @@ L<http://https://bugs.launchpad.net/apparmor/+filebug>.
 
 =head1 SEE ALSO
 
-apparmor(7), apparmor.d(5), aa-complain(1), aa_change_hat(2), and
-L<http://wiki.apparmor.net>.
+apparmor(7), apparmor.d(5), aa-complain(1), aa-disable(1),
+aa_change_hat(2), and L<http://wiki.apparmor.net>.
 
 =cut
diff --git a/utils/aa-genprof.pod b/utils/aa-genprof.pod
index aabd5e469..971794e0d 100644
--- a/utils/aa-genprof.pod
+++ b/utils/aa-genprof.pod
@@ -77,7 +77,8 @@ L<http://https://bugs.launchpad.net/apparmor/+filebug>.
 
 =head1 SEE ALSO
 
-apparmor(7), apparmor.d(5), aa-enforce(1), aa-complain(1), aa_change_hat(2),
-aa-logprof(1), logprof.conf(5), and L<http://wiki.apparmor.net>.
+apparmor(7), apparmor.d(5), aa-enforce(1), aa-complain(1), aa-disable(1),
+aa_change_hat(2), aa-logprof(1), logprof.conf(5), and
+L<http://wiki.apparmor.net>.
 
 =cut
diff --git a/utils/aa-logprof.pod b/utils/aa-logprof.pod
index 294c068b3..c52742c39 100644
--- a/utils/aa-logprof.pod
+++ b/utils/aa-logprof.pod
@@ -160,7 +160,7 @@ L<http://https://bugs.launchpad.net/apparmor/+filebug>.
 =head1 SEE ALSO
 
 klogd(8), auditd(8), apparmor(7), apparmor.d(5), aa_change_hat(2),
-logprof.conf(5), aa-genprof(1), aa-complain(1), aa-enforce(1), and
-L<http://wiki.apparmor.net>.
+logprof.conf(5), aa-genprof(1), aa-enforce(1), aa-complain(1),
+aa-disable(1), and L<http://wiki.apparmor.net>.
 
 =cut
diff --git a/utils/logprof.conf.pod b/utils/logprof.conf.pod
index 002d2f58c..c8dcf5b79 100644
--- a/utils/logprof.conf.pod
+++ b/utils/logprof.conf.pod
@@ -107,8 +107,8 @@ L<http://https://bugs.launchpad.net/apparmor/+filebug>.
 
 =head1 SEE ALSO
 
-apparmor(7), apparmor.d(5), aa-enforce(1), aa_change_hat(2),
-aa-complain(1), aa-logprof(1), aa-genprof(1), and
+apparmor(7), apparmor.d(5), aa-enforce(1), aa-complain(1),
+aa-disable(1), aa_change_hat(2), aa-logprof(1), aa-genprof(1), and
 L<http://wiki.apparmor.net>.
 
 =cut