From 233a011db05f1df8275d21381b8b236125ea6729 Mon Sep 17 00:00:00 2001
From: Christian Boltz <apparmor@cboltz.de>
Date: Sun, 23 Jul 2017 21:29:53 +0200
Subject: [PATCH] Add --no-reload to various utils manpages

This option exists in several aa-* tools since 2.9, but isn't mentioned
in the manpage.

Also drop some trailing whitespace in the manpages.


Acked-by: John Johansen <john.johansen@canonical.com>
for 2.9, 2.10, 2.11 and trunk.
---
 utils/aa-audit.pod     | 7 +++++--
 utils/aa-cleanprof.pod | 7 +++++--
 utils/aa-complain.pod  | 5 ++++-
 utils/aa-disable.pod   | 9 ++++++---
 utils/aa-enforce.pod   | 7 +++++--
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/utils/aa-audit.pod b/utils/aa-audit.pod
index 9898782fc..8b47f306e 100644
--- a/utils/aa-audit.pod
+++ b/utils/aa-audit.pod
@@ -6,7 +6,7 @@ aa-audit - set an AppArmor security profile to I<audit> mode.
 
 =head1 SYNOPSIS
 
-B<aa-audit I<E<lt>executableE<gt>> [I<E<lt>executableE<gt>> ...] [I<-d /path/to/profiles>] [I<-r>]>
+B<aa-audit I<E<lt>executableE<gt>> [I<E<lt>executableE<gt>> ...] [I<-d /path/to/profiles>] [I<--no-reload>] [I<-r>]>
 
 =head1 OPTIONS
 
@@ -15,9 +15,12 @@ B<-d --dir  /path/to/profiles>
    Specifies where to look for the AppArmor security profile set.
    Defaults to /etc/apparmor.d.
 
+B<--no-reload>
+   Do not reload the profile after modifying it.
+
 B<-r --remove>
 
-   Removes the audit mode for the profile.  
+   Removes the audit mode for the profile.
 
 =head1 DESCRIPTION
 
diff --git a/utils/aa-cleanprof.pod b/utils/aa-cleanprof.pod
index 95ab12951..acd4c7afd 100644
--- a/utils/aa-cleanprof.pod
+++ b/utils/aa-cleanprof.pod
@@ -6,7 +6,7 @@ aa-cleanprof - clean an existing AppArmor security profile.
 
 =head1 SYNOPSIS
 
-B<aa-cleanprof I<E<lt>executableE<gt>> [I<E<lt>executableE<gt>> ...] [I<-d /path/to/profiles>] [I<-s>]>
+B<aa-cleanprof I<E<lt>executableE<gt>> [I<E<lt>executableE<gt>> ...] [I<-d /path/to/profiles>] [I<--no-reload]> [I<-s>]>
 
 =head1 OPTIONS
 
@@ -15,6 +15,9 @@ B<-d --dir  /path/to/profiles>
    Specifies where to look for the AppArmor security profile set.
    Defaults to /etc/apparmor.d.
 
+B<--no-reload>
+   Do not reload the profile after modifying it.
+
 B<-s --silent>
 
    Silently overwrites the profile without user prompt.
@@ -22,7 +25,7 @@ B<-s --silent>
 =head1 DESCRIPTION
 
 B<aa-cleanprof> is used to perform a cleanup on one or more profiles.
-The tool removes any existing superfluous rules (rules that are covered 
+The tool removes any existing superfluous rules (rules that are covered
 under an include or another rule), reorders the rules to group similar rules
 together and removes all comments from the file.
 
diff --git a/utils/aa-complain.pod b/utils/aa-complain.pod
index 764afa697..5e1058803 100644
--- a/utils/aa-complain.pod
+++ b/utils/aa-complain.pod
@@ -26,7 +26,7 @@ aa-complain - set an AppArmor security profile to I<complain> mode.
 
 =head1 SYNOPSIS
 
-B<< aa-complain I<E<lt>executableE<gt>> [I<E<lt>executableE<gt>> ...] [I<-d /path/to/profiles>] >>
+B<aa-complain I<E<lt>executableE<gt>> [I<E<lt>executableE<gt>> ...] [I<-d /path/to/profiles>] [I<--no-reload>]>
 
 =head1 OPTIONS
 
@@ -35,6 +35,9 @@ B<-d --dir  /path/to/profiles>
    Specifies where to look for the AppArmor security profile set.
    Defaults to /etc/apparmor.d.
 
+B<--no-reload>
+   Do not reload the profile after modifying it.
+
 =head1 DESCRIPTION
 
 B<aa-complain> is used to set the enforcement mode for one or more profiles to I<complain> mode.
diff --git a/utils/aa-disable.pod b/utils/aa-disable.pod
index f36d7ad05..a8f6d744a 100644
--- a/utils/aa-disable.pod
+++ b/utils/aa-disable.pod
@@ -26,7 +26,7 @@ aa-disable - disable an AppArmor security profile
 
 =head1 SYNOPSIS
 
-B<aa-disable I<E<lt>executableE<gt>> [I<E<lt>executableE<gt>> ...] [I<-d /path/to/profiles>] [I<-r>]>
+B<aa-disable I<E<lt>executableE<gt>> [I<E<lt>executableE<gt>> ...] [I<-d /path/to/profiles>] [I<--no-reload>] [I<-r>]>
 
 =head1 OPTIONS
 
@@ -35,11 +35,14 @@ B<-d --dir  /path/to/profiles>
    Specifies where to look for the AppArmor security profile set.
    Defaults to /etc/apparmor.d.
 
+B<--no-reload>
+   Do not unreload the profile after modifying it.
+
 =head1 DESCRIPTION
 
-B<aa-disable> is used to I<disable> one or more profiles. 
+B<aa-disable> is used to I<disable> one or more profiles.
 This command will unload the profile from the kernel and prevent the
-profile from being loaded on AppArmor startup. 
+profile from being loaded on AppArmor startup.
 The I<aa-enforce> and I<aa-complain> utilities may be used to to change
 this behavior.
 
diff --git a/utils/aa-enforce.pod b/utils/aa-enforce.pod
index 464b8a8b4..236acf22f 100644
--- a/utils/aa-enforce.pod
+++ b/utils/aa-enforce.pod
@@ -27,7 +27,7 @@ being disabled or I<complain> mode.
 
 =head1 SYNOPSIS
 
-B<< aa-enforce I<E<lt>executableE<gt>> [I<E<lt>executableE<gt>> ...] [I<-d /path/to/profiles>] >>
+B<aa-enforce I<E<lt>executableE<gt>> [I<E<lt>executableE<gt>> ...] [I<-d /path/to/profiles>] [I<--no-reload>]>
 
 =head1 OPTIONS
 
@@ -36,12 +36,15 @@ B<-d --dir / path/to/profiles>
    Specifies where to look for the AppArmor security profile set.
    Defaults to /etc/apparmor.d.
 
+B<--no-reload>
+   Do not reload the profile after modifying it.
+
 =head1 DESCRIPTION
 
 B<aa-enforce> is used to set one or more profiles to I<enforce> mode.
 This command is only relevant in conjunction 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. 
+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.