From 31a57bdfa9f63782df74e99209b1f61ff11f9839 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Thu, 16 Oct 2014 20:26:45 +0200 Subject: [PATCH] update the aa-mergeprof manpage to match the new commandline syntax introduced with the aa-mergeprof patch collection. Acked-by: Steve Beattie --- utils/aa-mergeprof.pod | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/utils/aa-mergeprof.pod b/utils/aa-mergeprof.pod index 272c04688..43124371f 100644 --- a/utils/aa-mergeprof.pod +++ b/utils/aa-mergeprof.pod @@ -6,13 +6,17 @@ aa-mergeprof - merge AppArmor security profiles. =head1 SYNOPSIS -BmineE> IuserE> IotherE> [I<-d /path/to/profiles>]> +B [I ...] [I<-d /path/to/profiles>]> =head1 OPTIONS +B + + One or more files containing profiles to merge into the profile directory (see -d). + B<-d --dir /path/to/profiles> - Specifies where to look for the AppArmor security profile set. + Specifies the target directory for the merged AppArmor security profile set. Defaults to /etc/apparmor.d. =head1 DESCRIPTION