590d18
From b3173293d8b580beb4ffd8c3e05561f670387c04 Mon Sep 17 00:00:00 2001
99b6f7
From: Martin Kosek <mkosek@redhat.com>
99b6f7
Date: Wed, 22 May 2013 09:59:12 +0200
e3ffab
Subject: [PATCH] Remove pkinit references from tool man pages
99b6f7
99b6f7
---
e3ffab
 install/tools/man/ipa-replica-install.1 |  3 ---
e3ffab
 install/tools/man/ipa-replica-prepare.1 | 12 ------------
e3ffab
 install/tools/man/ipa-server-install.1  | 12 ------------
e3ffab
 3 files changed, 27 deletions(-)
99b6f7
99b6f7
diff --git a/install/tools/man/ipa-replica-install.1 b/install/tools/man/ipa-replica-install.1
590d18
index 780febf9d597d7d36b6104c0fc1be8f3d1f8fdee..ab8a428da4047db4655dbe8b3c5488f1292f8982 100644
99b6f7
--- a/install/tools/man/ipa-replica-install.1
99b6f7
+++ b/install/tools/man/ipa-replica-install.1
590d18
@@ -77,9 +77,6 @@ An unattended installation that will never prompt for user input
99b6f7
 
99b6f7
 .SS "CERTIFICATE SYSTEM OPTIONS"
99b6f7
 .TP
99b6f7
-\fB\-\-no\-pkinit\fR
99b6f7
-Disables pkinit setup steps
99b6f7
-.TP
99b6f7
 \fB\-\-skip\-schema\-check\fR
99b6f7
 Skip check for updated CA DS schema on the remote master
99b6f7
 
99b6f7
diff --git a/install/tools/man/ipa-replica-prepare.1 b/install/tools/man/ipa-replica-prepare.1
590d18
index 2063657f8eb4e97fc11b1abb95a892e26b4344e6..afc5408ef87ec5cf967d00dd21aa848584c7eb1e 100644
99b6f7
--- a/install/tools/man/ipa-replica-prepare.1
99b6f7
+++ b/install/tools/man/ipa-replica-prepare.1
590d18
@@ -43,27 +43,18 @@ File containing the Directory Server SSL certificate and private key. The files
e3ffab
 \fB\-\-http\-cert\-file\fR=\fIFILE\fR
e3ffab
 File containing the Apache Server SSL certificate and private key. The files are accepted in PEM and DER certificate, PKCS#7 certificate chain, PKCS#8 and raw private key and PKCS#12 formats. This option may be used multiple times.
99b6f7
 .TP
e3ffab
-\fB\-\-pkinit\-cert\-file\fR=\fIFILE\fR
e3ffab
-File containing the Kerberos KDC SSL certificate and private key. The files are accepted in PEM and DER certificate, PKCS#7 certificate chain, PKCS#8 and raw private key and PKCS#12 formats. This option may be used multiple times.
99b6f7
-.TP
e3ffab
 \fB\-\-dirsrv\-pin\fR=\fIPIN\fR
e3ffab
 The password to unlock the Directory Server private key
99b6f7
 .TP
e3ffab
 \fB\-\-http\-pin\fR=\fIPIN\fR
e3ffab
 The password to unlock the Apache Server private key
99b6f7
 .TP
e3ffab
-\fB\-\-pkinit\-pin\fR=\fIPIN\fR
e3ffab
-The password to unlock the Kerberos KDC private key
e3ffab
-.TP
e3ffab
 \fB\-\-dirsrv\-cert\-name\fR=\fINAME\fR
e3ffab
 Name of the Directory Server SSL certificate to install
e3ffab
 .TP
e3ffab
 \fB\-\-http\-cert\-name\fR=\fINAME\fR
e3ffab
 Name of the Apache Server SSL certificate to install
e3ffab
 .TP
e3ffab
-\fB\-\-pkinit\-cert\-name\fR=\fINAME\fR
e3ffab
-Name of the Kerberos KDC SSL certificate to install
99b6f7
-.TP
99b6f7
 \fB\-p\fR \fIDM_PASSWORD\fR, \fB\-\-password\fR=\fIDM_PASSWORD\fR
99b6f7
 Directory Manager (existing master) password
99b6f7
 .TP
590d18
@@ -81,9 +72,6 @@ Do not create reverse DNS zone
99b6f7
 \fB\-\-ca\fR=\fICA_FILE\fR
99b6f7
 Location of CA PKCS#12 file, default /root/cacert.p12
99b6f7
 .TP
99b6f7
-\fB\-\-no\-pkinit\fR
99b6f7
-Disables pkinit setup steps
99b6f7
-.TP
99b6f7
 \fB\-\-debug\fR
99b6f7
 Prints info log messages to the output
99b6f7
 .SH "EXIT STATUS"
99b6f7
diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1
590d18
index 1eaed72119a9cd2f9876d3dc3c4a662782c18a36..3cea9fd66c133a25a611fa72a00d60a279da1b2a 100644
99b6f7
--- a/install/tools/man/ipa-server-install.1
99b6f7
+++ b/install/tools/man/ipa-server-install.1
590d18
@@ -91,36 +91,24 @@ Type of the external CA. Possible values are "generic", "ms-cs". Default value i
e3ffab
 \fB\-\-external\-cert\-file\fR=\fIFILE\fR
e3ffab
 File containing the IPA CA certificate and the external CA certificate chain. The file is accepted in PEM and DER certificate and PKCS#7 certificate chain formats. This option may be used multiple times.
99b6f7
 .TP
99b6f7
-\fB\-\-no\-pkinit\fR
99b6f7
-Disables pkinit setup steps
99b6f7
-.TP
e3ffab
 \fB\-\-dirsrv\-cert\-file\fR=\fIFILE\fR
e3ffab
 File containing the Directory Server SSL certificate and private key. The files are accepted in PEM and DER certificate, PKCS#7 certificate chain, PKCS#8 and raw private key and PKCS#12 formats. This option may be used multiple times.
99b6f7
 .TP
e3ffab
 \fB\-\-http\-cert\-file\fR=\fIFILE\fR
e3ffab
 File containing the Apache Server SSL certificate and private key. The files are accepted in PEM and DER certificate, PKCS#7 certificate chain, PKCS#8 and raw private key and PKCS#12 formats. This option may be used multiple times.
99b6f7
 .TP
e3ffab
-\fB\-\-pkinit\-cert\-file\fR=\fIFILE\fR
e3ffab
-File containing the Kerberos KDC SSL certificate and private key. The files are accepted in PEM and DER certificate, PKCS#7 certificate chain, PKCS#8 and raw private key and PKCS#12 formats. This option may be used multiple times.
99b6f7
-.TP
e3ffab
 \fB\-\-dirsrv\-pin\fR=\fIPIN\fR
e3ffab
 The password to unlock the Directory Server private key
99b6f7
 .TP
e3ffab
 \fB\-\-http\-pin\fR=\fIPIN\fR
e3ffab
 The password to unlock the Apache Server private key
99b6f7
 .TP
e3ffab
-\fB\-\-pkinit\-pin\fR=\fIPIN\fR
e3ffab
-The password to unlock the Kerberos KDC private key
99b6f7
-.TP
e3ffab
 \fB\-\-dirsrv\-cert\-name\fR=\fINAME\fR
e3ffab
 Name of the Directory Server SSL certificate to install
e3ffab
 .TP
e3ffab
 \fB\-\-http\-cert\-name\fR=\fINAME\fR
e3ffab
 Name of the Apache Server SSL certificate to install
e3ffab
 .TP
e3ffab
-\fB\-\-pkinit\-cert\-name\fR=\fINAME\fR
e3ffab
-Name of the Kerberos KDC SSL certificate to install
e3ffab
-.TP
e3ffab
 \fB\-\-ca\-cert\-file\fR=\fIFILE\fR
e3ffab
 File containing the CA certificate of the CA which issued the Directory Server, Apache Server and Kerberos KDC certificates. The file is accepted in PEM and DER certificate and PKCS#7 certificate chain formats. This option may be used multiple times. Use this option if the CA certificate is not present in the certificate files.
e3ffab
 .TP
99b6f7
-- 
590d18
2.1.0
99b6f7