summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-05-05 09:35:17 +1000
committerJames Turnbull <james@lovedthanlost.net>2008-05-05 09:35:17 +1000
commit69fc802fde27f1de09d6e0d68e1d79ff1c08acdd (patch)
treec803d12222c6069524b4b5468be23ec74e7738e7
parentc57e194418b658ddcd82610c3c273bfa17ba5f8b (diff)
downloadpuppet-69fc802fde27f1de09d6e0d68e1d79ff1c08acdd.tar.gz
puppet-69fc802fde27f1de09d6e0d68e1d79ff1c08acdd.tar.xz
puppet-69fc802fde27f1de09d6e0d68e1d79ff1c08acdd.zip
Update to man pages, fix to ralsh help text and fix for #1211
-rwxr-xr-xbin/ralsh2
-rwxr-xr-xinstall.rb2
-rw-r--r--man/man8/filebucket.82
-rw-r--r--man/man8/pi.82
-rw-r--r--man/man8/puppet.82
-rw-r--r--man/man8/puppet.conf.88
-rw-r--r--man/man8/puppetca.810
-rw-r--r--man/man8/puppetd.82
-rw-r--r--man/man8/puppetdoc.82
-rw-r--r--man/man8/puppetmasterd.82
-rw-r--r--man/man8/puppetrun.82
-rw-r--r--man/man8/ralsh.833
12 files changed, 29 insertions, 40 deletions
diff --git a/bin/ralsh b/bin/ralsh
index 1d0036717..3cbfcad41 100755
--- a/bin/ralsh
+++ b/bin/ralsh
@@ -65,7 +65,7 @@
#
# This example uses ``ralsh`` to return Puppet configuration for the user ``luke``::
#
-# $ ralsh user luke
+# $ ralsh user luke
# user { 'luke':
# home => '/home/luke',
# uid => '100',
diff --git a/install.rb b/install.rb
index 70922cc98..207f74a0b 100755
--- a/install.rb
+++ b/install.rb
@@ -106,7 +106,7 @@ def do_man(man, strip = 'man/')
File.install(mf, omf, 0644, true)
gzip = %x{which gzip}
gzip.chomp!
- %x{#{gzip} #{omf}}
+ %x{#{gzip} -f #{omf}}
end
end
diff --git a/man/man8/filebucket.8 b/man/man8/filebucket.8
index fdaca9f31..0ef4c3842 100644
--- a/man/man8/filebucket.8
+++ b/man/man8/filebucket.8
@@ -112,5 +112,5 @@ Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
License
-.\" Generated by docutils manpage writer on 2008-03-22 17:46.
+.\" Generated by docutils manpage writer on 2008-05-05 09:33.
.\"
diff --git a/man/man8/pi.8 b/man/man8/pi.8
index da13d8e52..ba685797a 100644
--- a/man/man8/pi.8
+++ b/man/man8/pi.8
@@ -30,5 +30,5 @@ Only list parameters without detail
Include metaparams
-.\" Generated by docutils manpage writer on 2008-03-22 17:46.
+.\" Generated by docutils manpage writer on 2008-05-05 09:33.
.\"
diff --git a/man/man8/puppet.8 b/man/man8/puppet.8
index 190aab2f8..990b7cee9 100644
--- a/man/man8/puppet.8
+++ b/man/man8/puppet.8
@@ -74,5 +74,5 @@ Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
License
-.\" Generated by docutils manpage writer on 2008-03-22 17:46.
+.\" Generated by docutils manpage writer on 2008-05-05 09:33.
.\"
diff --git a/man/man8/puppet.conf.8 b/man/man8/puppet.conf.8
index e8040fb8e..1bc1eb65a 100644
--- a/man/man8/puppet.conf.8
+++ b/man/man8/puppet.conf.8
@@ -4,7 +4,7 @@ Configuration Reference \-
.\" Man page generated from reStructeredText.
This page is autogenerated; any changes will get overwritten
-.I (last generated on Sat Mar 22 17:46:15 +1100 2008)
+.I (last generated on Mon May 05 09:33:01 +1000 2008)
@@ -691,7 +691,7 @@ puppetmasterd
.TP 2
\(bu
-Default: development
+Default: production
.SS environments
@@ -1739,9 +1739,9 @@ Default: $vardir/yaml
.ce 0
.sp
-.I This page autogenerated on Sat Mar 22 17:46:15 +1100 2008
+.I This page autogenerated on Mon May 05 09:33:01 +1000 2008
-.\" Generated by docutils manpage writer on 2008-03-22 17:46.
+.\" Generated by docutils manpage writer on 2008-05-05 09:33.
.\"
diff --git a/man/man8/puppetca.8 b/man/man8/puppetca.8
index 42d6c1f1f..f9f89a95f 100644
--- a/man/man8/puppetca.8
+++ b/man/man8/puppetca.8
@@ -42,8 +42,8 @@ configuration options can also be generated by running puppetca with
.TP
-.B all: Operate on all outstanding requests. Only makes sense with
-\'\-\-sign\', or \'\-\-list\'.
+.B all: Operate on all items. Currently only makes sense with
+\'\-\-sign\', \'\-\-clean\', or \'\-\-list\'.
.TP
@@ -51,7 +51,9 @@ configuration options can also be generated by running puppetca with
This is useful when rebuilding hosts, since new certificate
signing requests will only be honored if puppetca does not
have a copy of a signed certificate for that host. The
-certificate of the host remains valid.
+certificate of the host remains valid. If \'\-\-all\' is specified
+then all host certificates, both signed and unsigned, will be
+removed.
debug: Enable full debugging.
@@ -112,5 +114,5 @@ Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
License
-.\" Generated by docutils manpage writer on 2008-03-22 17:46.
+.\" Generated by docutils manpage writer on 2008-05-05 09:33.
.\"
diff --git a/man/man8/puppetd.8 b/man/man8/puppetd.8
index 83b172809..9cadcd4e3 100644
--- a/man/man8/puppetd.8
+++ b/man/man8/puppetd.8
@@ -180,5 +180,5 @@ Copyright (c) 2005, 2006 Reductive Labs, LLC Licensed under the GNU
Public License
-.\" Generated by docutils manpage writer on 2008-03-22 17:46.
+.\" Generated by docutils manpage writer on 2008-05-05 09:33.
.\"
diff --git a/man/man8/puppetdoc.8 b/man/man8/puppetdoc.8
index d7aacee75..8303b7ae0 100644
--- a/man/man8/puppetdoc.8
+++ b/man/man8/puppetdoc.8
@@ -58,5 +58,5 @@ Copyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU
Public License
-.\" Generated by docutils manpage writer on 2008-03-22 17:46.
+.\" Generated by docutils manpage writer on 2008-05-05 09:33.
.\"
diff --git a/man/man8/puppetmasterd.8 b/man/man8/puppetmasterd.8
index 5a8f02751..c14da72d3 100644
--- a/man/man8/puppetmasterd.8
+++ b/man/man8/puppetmasterd.8
@@ -83,5 +83,5 @@ Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
License
-.\" Generated by docutils manpage writer on 2008-03-22 17:46.
+.\" Generated by docutils manpage writer on 2008-05-05 09:33.
.\"
diff --git a/man/man8/puppetrun.8 b/man/man8/puppetrun.8
index 753be1ca0..6b4048170 100644
--- a/man/man8/puppetrun.8
+++ b/man/man8/puppetrun.8
@@ -147,5 +147,5 @@ Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
License
-.\" Generated by docutils manpage writer on 2008-03-22 17:46.
+.\" Generated by docutils manpage writer on 2008-05-05 09:33.
.\"
diff --git a/man/man8/ralsh.8 b/man/man8/ralsh.8
index fc84fe0df..89c99c982 100644
--- a/man/man8/ralsh.8
+++ b/man/man8/ralsh.8
@@ -111,29 +111,16 @@ luke
.nf
$ ralsh user luke
-.fi
-
-.\" visit_block_quote
-
-.TP
-.B user { \'luke\':
-home => \'/home/luke\',
-uid => \'100\',
-ensure => \'present\',
-comment => \'Luke Kanies,,,\',
-gid => \'1000\',
-shell => \'/bin/bash\',
-groups => [\'sysadmin\',\'audio\',\'video\',\'puppet\']
-
-\.SH system-message
-System Message: WARNING/2 (./ralsh.rst:, line 87)
-Definition list ends without a blank line; unexpected unindent.
-
-
+user { \'luke\':
+ home => \'/home/luke\',
+ uid => \'100\',
+ ensure => \'present\',
+ comment => \'Luke Kanies,,,\',
+ gid => \'1000\',
+ shell => \'/bin/bash\',
+ groups => [\'sysadmin\',\'audio\',\'video\',\'puppet\']
}
-
-
-.\" depart_block_quote
+.fi
.SH AUTHOR
Luke Kanies
@@ -144,5 +131,5 @@ Copyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU
Public License
-.\" Generated by docutils manpage writer on 2008-03-22 17:46.
+.\" Generated by docutils manpage writer on 2008-05-05 09:33.
.\"