The actual text was somewhat disarrayed. No ronn fixes in this patch.
Signed-off-by: nfagerlund <[email protected]>
---
Local-branch: ticket/next/1204
lib/puppet/application/filebucket.rb | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/lib/puppet/application/filebucket.rb
b/lib/puppet/application/filebucket.rb
index 77ebbb8..998f006 100644
--- a/lib/puppet/application/filebucket.rb
+++ b/lib/puppet/application/filebucket.rb
@@ -22,20 +22,11 @@ A stand-alone Puppet filebucket client.
USAGE
=====
- puppet filebucket [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
+ puppet filebucket <mode> [-h|--help] [-V|--version] [-d|--debug]
[-v|--verbose]
[-l|--local] [-r|--remote]
[-s|--server <server>] [-b|--bucket <directory>] <file> <file> ...
-
-DESCRIPTION
-===========
-This is a stand-alone filebucket client for sending files to a local or
-central filebucket.
-
-
-USAGE
-=====
-This client can operate in three modes, with only one mode per call:
+Puppet filebucket can operate in three modes, with only one mode per call:
backup: Send one or more files to the specified file bucket. Each sent
file is printed with its resulting md5 sum.
@@ -45,7 +36,13 @@ get: Return the text associated with an md5 sum. The
text is printed
restore: Given a file path and an md5 sum, store the content associated
with the sum into the specified file path. You can specify an
- entirely new path to this argument; you are not restricted to
+ entirely new path to this argument; you are not restricted to
restoring the content to its original location.
+
+
+DESCRIPTION
+===========
+This is a stand-alone filebucket client for sending files to a local or
+central filebucket.
Note that 'filebucket' defaults to using a network-based filebucket
available on the server named 'puppet'. To use this, you'll have to be
@@ -53,14 +50,6 @@ running as a user with valid Puppet certificates.
Alternatively, you can
use your local file bucket by specifying '--local'.
-EXAMPLE
-=======
- $ puppet filebucket backup /etc/passwd
- /etc/passwd: 429b225650b912a2ee067b0a4cf1e949
- $ puppet filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949
- $
-
-
OPTIONS
=======
Note that any configuration parameter that's valid in the configuration
@@ -93,7 +82,9 @@ version: Print version information.
EXAMPLE
=======
- puppet filebucket -b /tmp/filebucket /my/file
+ $ puppet filebucket backup /etc/passwd
+ /etc/passwd: 429b225650b912a2ee067b0a4cf1e949
+ $ puppet filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949
AUTHOR
--
1.7.3.3
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
