Updating the config generation stuff a bit, mostly just cleanup, but also changing the servername fact to be the fqdn of the server.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/bin/puppetd b/bin/puppetd
index fac30f345..be8af2287 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -34,19 +34,19 @@
 # configuration every 30 minutes.
 #
 # Some flags are meant specifically for interactive use -- in particular,
-# +test+ and +tag+ are useful.  +test+ enables verobse logging, causes
+# +test+ and +tags+ are useful.  +test+ enables verobse logging, causes
 # the daemon to stay in the foreground, exits if the server's configuration is
 # invalid (this happens if, for instance, you've left a syntax error on the
 # server), and exits after running the configuration once (rather than hanging
 # around as a long-running process).
 #
-# +tag+ allows you to specify what portions of a configuration you want to apply.
+# +tags+ allows you to specify what portions of a configuration you want to apply.
 # Puppet elements are tagged with all of the class or definition names that
-# contain them, and you can use the +tag+ flag to specify one of these names,
+# contain them, and you can use the +tags+ flag to specify one of these names,
 # causing only configuration elements contained within that class or definition
 # to be applied.  This is very useful when you are testing new configurations --
 # for instance, if you are just starting to manage +ntpd+, you would put all of
-# the new elements into an +ntpd+ class, and call puppet with +--tag ntpd+,
+# the new elements into an +ntpd+ class, and call puppet with +--tags ntpd+,
 # which would only apply that small portion of the configuration during your
 # testing, rather than applying the whole thing.
 #