bcfg2-crypt: added -I option, made --stdout better, updated man page

10 files changed, 19 insertions, 11 deletions

diff --git a/man/bcfg2-admin.8 b/man/bcfg2-admin.8
index bed51ff9a..e5bcc55f3 100644
--- a/man/bcfg2-admin.8
+++ b/man/bcfg2-admin.8
@@ -1,5 +1,5 @@
 .
-.TH "BCFG2\-ADMIN" "8" "August 2012" "" ""
+.TH "BCFG2\-ADMIN" "8" "September 2012" "" ""
 .
 .SH "NAME"
 \fBbcfg2\-admin\fR \- Perform repository administration tasks
diff --git a/man/bcfg2-build-reports.8 b/man/bcfg2-build-reports.8
index 3c61e8356..55aff8b31 100644
--- a/man/bcfg2-build-reports.8
+++ b/man/bcfg2-build-reports.8
@@ -1,5 +1,5 @@
 .
-.TH "BCFG2\-BUILD\-REPORTS" "8" "August 2012" "" ""
+.TH "BCFG2\-BUILD\-REPORTS" "8" "September 2012" "" ""
 .
 .SH "NAME"
 \fBbcfg2\-build\-reports\fR \- Generate state reports for Bcfg2 clients
diff --git a/man/bcfg2-crypt.8 b/man/bcfg2-crypt.8
index a73f3e066..64c10a902 100644
--- a/man/bcfg2-crypt.8
+++ b/man/bcfg2-crypt.8
@@ -1,11 +1,11 @@
 .
-.TH "BCFG2\-CRYPT" "8" "August 2012" "" ""
+.TH "BCFG2\-CRYPT" "8" "September 2012" "" ""
 .
 .SH "NAME"
 \fBbcfg2\-crypt\fR \- Bcfg2 encryption and decryption utility
 .
 .SH "SYNOPSIS"
-\fBbcfg2\-crypt\fR [\fI\-C configfile\fR] [\-\-decrypt|\-\-encrypt] [\-\-cfg|\-\-properties] [\-\-remove] [\-\-xpath \fIxpath\fR] [\-p \fIpassphrase\-or\-name\fR] [\-v] \fIfilename\fR [\fIfilename\fR\.\.\.]
+\fBbcfg2\-crypt\fR [\fI\-C configfile\fR] [\-\-decrypt|\-\-encrypt] [\-\-cfg|\-\-properties] [\-\-stdout] [\-\-remove] [\-\-xpath \fIxpath\fR] [\-p \fIpassphrase\-or\-name\fR] [\-v] [\-I] \fIfilename\fR [\fIfilename\fR\.\.\.]
 .
 .SH "DESCRIPTION"
 \fBbcfg2\-crypt\fR performs encryption and decryption of Cfg and Properties files\. It\'s often sufficient to run \fBbcfg2\-crypt\fR with only the name of the file you wish to encrypt or decrypt; it can usually figure out what to do\.
@@ -29,6 +29,10 @@ Tell \fBbcfg2\-crypt\fR that an XML file should be encrypted in its entirety rat
 Tell \fBbcfg2\-crypt\fR to process a file as an XML Properties file, and encrypt the text of each element separately\. This is necessary if, for example, you\'ve used a different top\-level tag than \fB<Properties>\fR in your Properties files\. See \fIMODES\fR below for details\.
 .
 .TP
+\fB\-\-stdout\fR
+Print the resulting file to stdout instead of writing it to a file\.
+.
+.TP
 \fB\-\-remove\fR
 Remove the plaintext file after it has been encrypted\. Only meaningful for Cfg files\.
 .
@@ -45,6 +49,10 @@ Specify the name of a passphrase specified in the \fB[encryption]\fR section of
 Be verbose\.
 .
 .TP
+\fB\-I\fR
+When encrypting a Properties file, interactively select the elements whose data should be encrypted\.
+.
+.TP
 \fB\-h\fR
 Display help and exit\.
 .
diff --git a/man/bcfg2-info.8 b/man/bcfg2-info.8
index bb515079f..9362776a1 100644
--- a/man/bcfg2-info.8
+++ b/man/bcfg2-info.8
@@ -1,5 +1,5 @@
 .
-.TH "BCFG2\-INFO" "8" "August 2012" "" ""
+.TH "BCFG2\-INFO" "8" "September 2012" "" ""
 .
 .SH "NAME"
 \fBbcfg2\-info\fR \- Creates a local version of the Bcfg2 server core for state observation
diff --git a/man/bcfg2-lint.8 b/man/bcfg2-lint.8
index 7a5a69b7a..a6bfffb8a 100644
--- a/man/bcfg2-lint.8
+++ b/man/bcfg2-lint.8
@@ -1,5 +1,5 @@
 .
-.TH "BCFG2\-LINT" "8" "August 2012" "" ""
+.TH "BCFG2\-LINT" "8" "September 2012" "" ""
 .
 .SH "NAME"
 \fBbcfg2\-lint\fR \- Check Bcfg2 specification for validity, common mistakes, and style
diff --git a/man/bcfg2-lint.conf.5 b/man/bcfg2-lint.conf.5
index d23afa8dc..55dfa5cc2 100644
--- a/man/bcfg2-lint.conf.5
+++ b/man/bcfg2-lint.conf.5
@@ -1,5 +1,5 @@
 .
-.TH "BCFG2\-LINT\.CONF" "5" "August 2012" "" ""
+.TH "BCFG2\-LINT\.CONF" "5" "September 2012" "" ""
 .
 .SH "NAME"
 \fBbcfg2\-lint\.conf\fR \- configuration parameters for bcfg2\-lint
diff --git a/man/bcfg2-reports.8 b/man/bcfg2-reports.8
index b2c0cad43..78b594047 100644
--- a/man/bcfg2-reports.8
+++ b/man/bcfg2-reports.8
@@ -1,5 +1,5 @@
 .
-.TH "BCFG2\-REPORTS" "8" "August 2012" "" ""
+.TH "BCFG2\-REPORTS" "8" "September 2012" "" ""
 .
 .SH "NAME"
 \fBbcfg2\-reports\fR \- Query reporting system for client status
diff --git a/man/bcfg2-server.8 b/man/bcfg2-server.8
index 955f541c9..7bbfb87c3 100644
--- a/man/bcfg2-server.8
+++ b/man/bcfg2-server.8
@@ -1,5 +1,5 @@
 .
-.TH "BCFG2\-SERVER" "8" "August 2012" "" ""
+.TH "BCFG2\-SERVER" "8" "September 2012" "" ""
 .
 .SH "NAME"
 \fBbcfg2\-server\fR \- Server for client configuration specifications
diff --git a/man/bcfg2.1 b/man/bcfg2.1
index 2aa219756..231155797 100644
--- a/man/bcfg2.1
+++ b/man/bcfg2.1
@@ -1,5 +1,5 @@
 .
-.TH "BCFG2" "1" "August 2012" "" ""
+.TH "BCFG2" "1" "September 2012" "" ""
 .
 .SH "NAME"
 \fBbcfg2\fR \- Bcfg2 client tool
diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5
index b62d223c9..c7f8bf4ed 100644
--- a/man/bcfg2.conf.5
+++ b/man/bcfg2.conf.5
@@ -1,5 +1,5 @@
 .
-.TH "BCFG2\.CONF" "5" "August 2012" "" ""
+.TH "BCFG2\.CONF" "5" "September 2012" "" ""
 .
 .SH "NAME"
 \fBbcfg2\.conf\fR \- configuration parameters for Bcfg2