Blame SOURCES/0043-Ticket-48245-Man-pages-and-help-for-remove-ds.pl-doe.patch

a2f18f
From 0cb8a7e2f797b4d48a20e650cf8510b8495a35e6 Mon Sep 17 00:00:00 2001
a2f18f
From: Noriko Hosoi <nhosoi@redhat.com>
a2f18f
Date: Tue, 11 Aug 2015 10:23:21 -0700
a2f18f
Subject: [PATCH 43/45] Ticket #48245 - Man pages and help for remove-ds.pl
a2f18f
 doesn't display "-a" option
a2f18f
a2f18f
Description: Adding the description for "-a" to the man page and the help usage.
a2f18f
a2f18f
https://fedorahosted.org/389/ticket/48245
a2f18f
a2f18f
Reviewed by rmeggins@redhat.com (Thank you, Rich!!)
a2f18f
a2f18f
(cherry picked from commit a2dbb56ec5ad468972a41a500e1cdbb4ced01cb0)
a2f18f
(cherry picked from commit 06dafdfed1528ea6724f61492f4c93977a3ce809)
a2f18f
---
a2f18f
 ldap/admin/src/scripts/remove-ds.pl.in | 5 +++--
a2f18f
 man/man8/remove-ds.pl.8                | 5 ++++-
a2f18f
 2 files changed, 7 insertions(+), 3 deletions(-)
a2f18f
a2f18f
diff --git a/ldap/admin/src/scripts/remove-ds.pl.in b/ldap/admin/src/scripts/remove-ds.pl.in
a2f18f
index e7eb591..b35ae32 100755
a2f18f
--- a/ldap/admin/src/scripts/remove-ds.pl.in
a2f18f
+++ b/ldap/admin/src/scripts/remove-ds.pl.in
a2f18f
@@ -21,8 +21,9 @@ Getopt::Long::Configure(qw(bundling)); # bundling allows -ddddd
a2f18f
 my $res = new Resource("@propertydir@/setup-ds.res");
a2f18f
 
a2f18f
 sub usage {
a2f18f
-        print(STDERR "Usage: $0 [-f] [-d -d ... -d] -i instance\n\n");
a2f18f
-        print(STDERR " Opts: -f            - force removal\n");
a2f18f
+        print(STDERR "Usage: $0 [-a] [-f] [-d -d ... -d] -i instance\n\n");
a2f18f
+        print(STDERR " Opts: -a            - remove all\n");
a2f18f
+        print(STDERR "       -f            - force removal\n");
a2f18f
         print(STDERR "       -i instance   - instance name to remove (e.g. - slapd-example)\n");
a2f18f
         print(STDERR "       -d            - turn on debugging output\n");
a2f18f
 }
a2f18f
diff --git a/man/man8/remove-ds.pl.8 b/man/man8/remove-ds.pl.8
a2f18f
index 8c7c118..0568ff8 100644
a2f18f
--- a/man/man8/remove-ds.pl.8
a2f18f
+++ b/man/man8/remove-ds.pl.8
a2f18f
@@ -19,7 +19,7 @@
a2f18f
 remove\-ds.pl \- Remove an instance of Directory Server
a2f18f
 .SH SYNOPSIS
a2f18f
 .B remove-ds.pl
a2f18f
-[\-f] [\-d \-d ... \-d] \-i \fIinstance\fR
a2f18f
+[\-a] [\-f] [\-d \-d ... \-d] \-i \fIinstance\fR
a2f18f
 .SH DESCRIPTION
a2f18f
 Removes a Directory Server instance from the system.  The instance
a2f18f
 will be shutdown and the files will be removed.  The certificate
a2f18f
@@ -33,6 +33,9 @@ will contain the retained certificate database files.
a2f18f
 .SH OPTIONS
a2f18f
 A summary of options is included below:
a2f18f
 .TP
a2f18f
+.B \fB\-a\fR
a2f18f
+Removes all files and directories belonging to the instance
a2f18f
+.TP
a2f18f
 .B \fB\-f\fR
a2f18f
 Force removal
a2f18f
 .TP
a2f18f
-- 
a2f18f
1.9.3
a2f18f