Fix trac #282 (Change URL to configref, mention --genconfig)

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1630 980ebf18-57e1-0310-9a29-db15c13687c0

5 files changed, 23 insertions, 7 deletions

diff --git a/bin/puppet b/bin/puppet
index fa54b5ebd..025522417 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -22,7 +22,11 @@
 # is also a valid long argument.  For example, 'ssldir' is a valid configuration
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
-# See the configuration file for the full list of acceptable parameters.
+# See the configuration file documentation at
+# http://reductivelabs.com/projects/puppet/documentation/configref.html for
+# the full list of acceptable parameters. A commented list of all
+# configuration options can also be generated by running puppet with
+# '--genconfig'.
 #
 # debug::
 #   Enable full debugging.
diff --git a/bin/puppetca b/bin/puppetca
index 4bde92a11..34286f853 100755
--- a/bin/puppetca
+++ b/bin/puppetca
@@ -25,7 +25,11 @@
 # is also a valid long argument.  For example, 'ssldir' is a valid configuration
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
-# See the configuration file for the full list of acceptable parameters.
+# See the configuration file documentation at
+# http://reductivelabs.com/projects/puppet/documentation/configref.html for
+# the full list of acceptable parameters. A commented list of all
+# configuration options can also be generated by running puppetca with
+# '--genconfig'.
 #
 # all::
 #   Operate on all outstanding requests.  Only makes sense with '--sign'.
diff --git a/bin/puppetd b/bin/puppetd
index 24e3877e3..e0f7d2e1e 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -57,8 +57,10 @@
 # parameter, so you can specify '--server <servername>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/documentation/puppet-executable-reference
-# for the full list of acceptable parameters.
+# http://reductivelabs.com/projects/puppet/documentation/configref.html for
+# the full list of acceptable parameters. A commented list of all
+# configuration options can also be generated by running puppetd with
+# '--genconfig'.
 #
 # daemonize::
 #   Send the process into the background.  This is the default unless
diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index 7e2cf815d..b38773ad9 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -22,8 +22,10 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/documentation/puppet-executable-reference
-# for the full list of acceptable parameters.
+# http://reductivelabs.com/projects/puppet/documentation/configref.html for
+# the full list of acceptable parameters. A commented list of all
+# configuration options can also be generated by running puppetmasterdd with
+# '--genconfig'.
 #
 # daemonize::
 #   Send the process into the background.  This is the default unless
diff --git a/documentation/documentation/configref.page b/documentation/documentation/configref.page
index 93b93f64f..909f50afe 100644
--- a/documentation/documentation/configref.page
+++ b/documentation/documentation/configref.page
@@ -29,7 +29,7 @@ argument is approprite or not.
 
 * **ca_days** (*ca*)
 
-  How long a certificate should be valid.
+  How long a certificate should be valid. *Deprecated. Use ``ca_ttl'' instead*
 
 * **ca_md** (*ca*)
 
@@ -63,6 +63,10 @@ argument is approprite or not.
 
   The CA public key.
 
+* **ca_ttl** (*ca*)
+
+  How long newly issued certificates should be valid
+
 * **certdir** (*certificates*)
 
   The certificate directory.