chef 10.34.6 → 11.0.0.beta.0

data/distro/common/man/man1/knife-bootstrap.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-BOOTSTRAP" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE\-BOOTSTRAP" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-bootstrap\fR \- Install Chef Client on a remote host

data/distro/common/man/man1/knife-client.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-CLIENT" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE\-CLIENT" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-client\fR \- Manage Chef API Clients

data/distro/common/man/man1/knife-configure.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-CONFIGURE" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE\-CONFIGURE" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-configure\fR \- Generate configuration files for knife or Chef Client

data/distro/common/man/man1/knife-cookbook-site.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-COOKBOOK\-SITE" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE\-COOKBOOK\-SITE" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-cookbook\-site\fR \- Install and update open source cookbooks

data/distro/common/man/man1/knife-cookbook.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-COOKBOOK" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE\-COOKBOOK" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-cookbook\fR \- upload and manage chef cookbooks
@@ -105,7 +105,20 @@ Overrides the frozen flag on a cookbook, allowing you to overwrite a cookbook ve
 Uploads one or more cookbooks from your local cookbook repository(ies) to the Chef Server\. Only files that don\'t yet exist on the server will be uploaded\.
 .
 .P
-As the command parses the name args as 1\.\.n cookbook names: \fBknife cookbook upload COOKBOOK COOKBOOK \.\.\.\fR works for one to many cookbooks\.
+As the command parses the name args as 1\.\.n cookbook names:
+.
+.IP "" 4
+.
+.nf
+
+`knife cookbook upload COOKBOOK COOKBOOK \.\.\.`
+.
+.fi
+.
+.IP "" 0
+.
+.P
+works for one to many cookbooks\.
 .
 .SH "DOWNLOAD"
 \fBknife cookbook download cookbook [version]\fR \fI(options)\fR

data/distro/common/man/man1/knife-data-bag.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-DATA\-BAG" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE\-DATA\-BAG" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-data\-bag\fR \- Store arbitrary data on a Chef Server
@@ -105,7 +105,20 @@ Data Bag Items may be encrypted to keep their contents secret\. This may be desi
 Data Bag Item encryption uses the AES\-256 CBC symmetric key algorithm\.
 .
 .P
-\fBCAVEATS:\fR Keys are not encrypted; only values are encrypted\. The "id" of a Data Bag Item is not encrypted, since it is used by Chef Server to store the item in its database\. For example, given the following data bag item: {"id": "important_passwords", "secret_password": "opensesame"} The key "secret_password" will be visible to an evesdropper, but the value "opensesame" will be protected\. Both the key "id" and its value "important_passwords" will be visible to an evesdropper\.
+\fBCAVEATS:\fR Keys are not encrypted; only values are encrypted\. The "id" of a Data Bag Item is not encrypted, since it is used by Chef Server to store the item in its database\. For example, given the following data bag item:
+.
+.IP "" 4
+.
+.nf
+
+{"id": "important_passwords", "secret_password": "opensesame"}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+The key "secret_password" will be visible to an evesdropper, but the value "opensesame" will be protected\. Both the key "id" and its value "important_passwords" will be visible to an evesdropper\.
 .
 .P
 Chef Server does not provide a secure mechanism for distributing encryption keys\.

data/distro/common/man/man1/knife-environment.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-ENVIRONMENT" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE\-ENVIRONMENT" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-environment\fR \- Define cookbook policies for the environments in your infrastructure
@@ -41,7 +41,17 @@ Fetch \fIenvironment\fR and display it in the text editor for editing\. The envi
 Create or update an environment from the JSON or Ruby format \fIfile\fR\. See \fBformat\fR for the proper format of this file\.
 .
 .SH "LIST"
-\fBknife environment list\fR \fI(options)\fR * \fB\-w\fR, \fB\-\-with\-uri\fR: Show the resource URI for each environment
+\fBknife environment list\fR \fI(options)\fR * \fB\-w\fR, \fB\-\-with\-uri\fR:
+.
+.IP "" 4
+.
+.nf
+
+Show the resource URI for each environment
+.
+.fi
+.
+.IP "" 0
 .
 .SH "SHOW"
 \fBknife environment show\fR \fIenvironment\fR \fI(options)\fR

data/distro/common/man/man1/knife-exec.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-EXEC" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE\-EXEC" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-exec\fR \- Run user scripts using the Chef API DSL
@@ -14,16 +14,13 @@
 Provide a snippet of code to evaluate on the command line
 .
 .SH "DESCRIPTION"
-\fBknife exec\fR runs arbitrary ruby scripts in a context similar to that of the shef(1) DSL\. See the shef documentation for a description of the commands available\.
+\fBknife exec\fR runs arbitrary ruby scripts in a context similar to that of the chef\-shell(1) DSL\. See the chef\-shell documentation for a description of the commands available\.
 .
 .SH "EXAMPLES"
 .
 .TP
 Make an API call against an arbitrary endpoint
-knife exec \-E \'api\.get("nodes/fluke\.localdomain/cookbooks")\'
-.
-.br
-=> list of cookbooks for the node \fIfluke\.localdomain\fR
+knife exec \-E \'api\.get("nodes/fluke\.localdomain/cookbooks")\' => list of cookbooks for the node \fIfluke\.localdomain\fR
 .
 .TP
 Remove the role \fIobsolete\fR from all nodes
@@ -34,7 +31,7 @@ Generate the expanded run list for hosts in the \fBwebserver\fR role
 knife exec \-E \'nodes\.find(:roles => "webserver") {|n| n\.expand!; n[:recipes]}\'
 .
 .SH "SEE ALSO"
-\fBshef(1)\fR
+\fBchef\-shell(1)\fR
 .
 .SH "AUTHOR"
 Chef was written by Adam Jacob \fIadam@opscode\.com\fR with many contributions from the community\.

data/distro/common/man/man1/knife-index.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-INDEX" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE\-INDEX" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-index\fR \- Rebuild the search index on a Chef Server

data/distro/common/man/man1/knife-node.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-NODE" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE\-NODE" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-node\fR \- Manage the hosts in your infrastructure

data/distro/common/man/man1/knife-role.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-ROLE" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE\-ROLE" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-role\fR \- Group common configuration settings

data/distro/common/man/man1/knife-search.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-SEARCH" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE\-SEARCH" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-search\fR \- Find objects on a Chef Server by query

data/distro/common/man/man1/knife-ssh.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-SSH" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE\-SSH" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-ssh\fR \- Run a command or interactive session on multiple remote hosts

data/distro/common/man/man1/knife-status.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-STATUS" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE\-STATUS" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-status\fR \- Display status information for the nodes in your infrastructure

data/distro/common/man/man1/knife-tag.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-TAG" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE\-TAG" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-tag\fR \- Apply tags to nodes on a Chef Server

data/distro/common/man/man1/knife.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE" "1" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "KNIFE" "1" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\fR \- Chef Server API client utility
@@ -163,10 +163,7 @@ If the config file exists, knife uses these settings for \fBGENERAL OPTIONS\fR d
 \fBchef_server_url\fR: URL of the Chef server\. Corresponds to the \fB\-s\fR or \fB\-\-server\-url\fR option\. This is requested from the user when running this sub\-command\.
 .
 .IP "\(bu" 4
-\fBcache_type\fR: The type of cache to use\. Default is BasicFile\. This can be any type of Cache that moneta supports: BasicFile, Berkeley, Couch, DataMapper, File, LMC, Memcache, Memory, MongoDB, Redis, Rufus, S3, SDBM, Tyrant, Xattr, YAML\.
-.
-.IP "\(bu" 4
-\fBcache_options\fR: Specifies various options to use for caching\. These options are dependent on the \fBcache_type\fR\.
+\fBsyntax_check_cache_path\fR: Specifies the path to a directory where knife caches information about files that it has syntax checked\.
 .
 .IP "\(bu" 4
 \fBvalidation_client_name\fR: Specifies the name of the client used to validate new clients\.
@@ -255,7 +252,7 @@ A note about git: Opscode and many folks in the Chef community use git, but it i
 The text editor to use for editing data\. The \-\-editor option takes precedence over this value, and the \-\-disable\-editing option supresses data editing entirely\.
 .
 .SH "SEE ALSO"
-\fBchef\-client(8)\fR \fBchef\-server(8)\fR \fBshef(1)\fR
+\fBchef\-client(8)\fR \fBchef\-server(8)\fR \fBchef\-shell(1)\fR
 .
 .P
 \fBknife\-bootstrap(1)\fR \fBknife\-client(1)\fR \fBknife\-configure(1)\fR \fBknife\-cookbook\-site(1)\fR \fBknife\-cookbook(1)\fR \fBknife\-data\-bag(1)\fR \fBknife\-environment(1)\fR \fBknife\-exec(1)\fR \fBknife\-index(1)\fR \fBknife\-node(1)\fR \fBknife\-recipe(1)\fR \fBknife\-role(1)\fR \fBknife\-search(1)\fR \fBknife\-ssh(1)\fR \fBknife\-tag(1)\fR

data/distro/common/man/man8/chef-client.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-CLIENT" "8" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "CHEF\-CLIENT" "8" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-client\fR \- Runs a client node connecting to a chef\-server\.

data/distro/common/man/man8/chef-expander.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-EXPANDER" "8" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "CHEF\-EXPANDER" "8" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-expander\fR \- fetches messages from RabbitMQ, processes, and loads into chef\-solr

data/distro/common/man/man8/chef-expanderctl.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-EXPANDERCTL" "8" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "CHEF\-EXPANDERCTL" "8" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-expanderctl\fR \- management program for chef\-expander

data/distro/common/man/man8/chef-server-webui.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SERVER\-WEBUI" "8" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "CHEF\-SERVER\-WEBUI" "8" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-server\-webui\fR \- Start the Chef Server merb application slice providing Web User Interface (Management Console)\.

data/distro/common/man/man8/chef-server.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SERVER" "8" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "CHEF\-SERVER" "8" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-server\fR \- Start the Chef Server merb application slice\.

data/distro/common/man/man8/chef-solo.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SOLO" "8" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "CHEF\-SOLO" "8" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-solo\fR \- Runs chef in solo mode against a specified cookbook location\.
@@ -68,7 +68,18 @@ Chef Solo allows you to run Chef Cookbooks in the absence of a Chef Server\. To
 By default Chef Solo will look in /etc/chef/solo\.rb for its configuration\. This configuration file has two required variables: file_cache_path and cookbook_path\.
 .
 .P
-For example: file_cache_path "/var/chef\-solo" cookbook_path "/var/chef\-solo/cookbooks"
+For example:
+.
+.IP "" 4
+.
+.nf
+
+file_cache_path "/var/chef\-solo"
+cookbook_path "/var/chef\-solo/cookbooks"
+.
+.fi
+.
+.IP "" 0
 .
 .P
 For your own systems, you can change this to reflect any directory you like, but you\'ll need to specify absolute paths and the cookbook_path directory should be a subdirectory of the file_cache_path\.
@@ -77,7 +88,18 @@ For your own systems, you can change this to reflect any directory you like, but
 You can also specify cookbook_path as an array, passing multiple locations to search for cookbooks\.
 .
 .P
-For example: file_cache_path "/var/chef\-solo" cookbook_path ["/var/chef\-solo/cookbooks", "/var/chef\-solo/site\-cookbooks"]
+For example:
+.
+.IP "" 4
+.
+.nf
+
+file_cache_path "/var/chef\-solo"
+cookbook_path ["/var/chef\-solo/cookbooks", "/var/chef\-solo/site\-cookbooks"]
+.
+.fi
+.
+.IP "" 0
 .
 .P
 Note that earlier entries are now overridden by later ones\.
@@ -111,7 +133,17 @@ Then you can run chef\-solo with \-j to specify the JSON file\. It will look for
 You can use \-c to specify the path to the configuration file (if you don\'t want chef\-solo to use the default)\. You can also specify \-r for a cookbook tarball\.
 .
 .P
-For example: chef\-solo \-c ~/solo\.rb \-j ~/node\.json \-r http://www\.example\.com/chef\-solo\.tar\.gz
+For example:
+.
+.IP "" 4
+.
+.nf
+
+chef\-solo \-c ~/solo\.rb \-j ~/node\.json  \-r http://www\.example\.com/chef\-solo\.tar\.gz
+.
+.fi
+.
+.IP "" 0
 .
 .P
 In the above case, chef\-solo would extract the tarball to your specified cookbook_path, use ~/solo\.rb as the configuration file, and apply attributes and use the run_list from ~/node\.json\.

data/distro/common/man/man8/chef-solr.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SOLR" "8" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "CHEF\-SOLR" "8" "January 2013" "Chef 11.0.0.beta.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-solr\fR \- Runs as Chef\'s search server

data/distro/common/markdown/man1/{shef.mkd → chef-shell.mkd}

@@ -1,9 +1,9 @@
-shef(1) -- Interactive Chef Console
-========================================
+chef-shell(1) -- Interactive Chef Console
+=========================================
 
 ## SYNOPSIS
 
-__shef__ [_named configuration_] _(options)_
+__chef-shell__ [_named configuration_] _(options)_
 
   * `-S`, `--server CHEF_SERVER_URL`:
     The chef server URL
@@ -16,33 +16,37 @@ __shef__ [_named configuration_] _(options)_
   * `-l`, `--log-level LOG_LEVEL`:
     Set the logging level
   * `-s`, `--solo`:
-    chef-solo shef session
+    chef-solo session
   * `-a`, `--standalone`:
-    standalone shef session
+    standalone session
   * `-v`, `--version`:
     Show chef version
   * `-h`, `--help`:
     Show command options
 
-When no --config option is specified, shef attempts to load a default configuration file:
+When no --config option is specified, chef-shell attempts to load a
+default configuration file:
 
-* If a _named configuration_ is given, shef will load ~/.chef/_named
-  configuration_/shef.rb
-* If no _named configuration_ is given shef will load ~/.chef/shef.rb if it exists
-* Shef falls back to loading /etc/chef/client.rb or /etc/chef/solo.rb if -z or
-  -s options are given and no shef.rb can be found.
+* If a _named configuration_ is given, chef-shell will load ~/.chef/_named
+  configuration_/chef_shell.rb
+* If no _named configuration_ is given chef-shell will load
+  ~/.chef/chef_shell.rb if it exists
+* chef-shell falls back to loading /etc/chef/client.rb or
+/etc/chef/solo.rb if -z or -s options are given and no chef_shell.rb
+can be found.
 * The --config option takes precedence over implicit configuration
   paths.
 
 ## DESCRIPTION
 
-`shef` is an irb(1) (interactive ruby) session customized for Chef.
-`shef` serves two primary functions: it provides a means to
+`chef-shell` is an irb(1) (interactive ruby) session customized for Chef.
+`chef-shell` serves two primary functions: it provides a means to
 interact with a Chef Server interactively using a convenient DSL; it
 allows you to define and run Chef recipes interactively.
 
 ## SYNTAX
-Shef uses irb's subsession feature to provide multiple modes of
+
+chef-shell uses irb's subsession feature to provide multiple modes of
 interaction. In addition to the primary mode which is entered on start,
 `recipe` and `attributes` modes are available.
 
@@ -61,7 +65,7 @@ session:
   * `run_chef`:
     Initiates a chef run
   * `reset`:
-    reinitializes shef
+    reinitializes chef-shell session
   * `echo :on|:off`:
     Turns irb's echo function on or off. Echo is _on_ by default.
   * `tracing :on|:off`:
@@ -73,10 +77,11 @@ session:
   * `ohai`:
     Prints the attributes of _node_
 
-In addition to these commands, shef provides a DSL for accessing data on
-the Chef Server. When working with remote data in shef, you chain method
-calls in the form _object type_._operation_, where _object type_ is in
-plural form. The following object types are available:
+In addition to these commands, chef-shell provides a DSL for accessing
+data on the Chef Server. When working with remote data in chef-shell, you
+chain method calls in the form _object type_._operation_, where
+_object type_ is in plural form. The following object types are
+available:
 
   * `nodes`
   * `roles`
@@ -136,54 +141,55 @@ convergence run via `run_chef`
 
 * A "Hello World" interactive recipe
 
-  chef > recipe  
-  chef:recipe > echo :off  
-  chef:recipe > file "/tmp/hello\_world"  
-  chef:recipe > run\_chef  
-  [Sat, 09 Apr 2011 08:56:56 -0700] INFO: Processing file[/tmp/hello\_world] action create ((irb#1) line 2)  
-  [Sat, 09 Apr 2011 08:56:56 -0700] INFO: file[/tmp/hello\_world] created file /tmp/hello\_world  
-  chef:recipe > pp ls '/tmp'  
-  [".",  
-  "..",  
-  "hello\_world"]  
+  chef > recipe
+  chef:recipe > echo :off
+  chef:recipe > file "/tmp/hello\_world"
+  chef:recipe > run\_chef
+  [Sat, 09 Apr 2011 08:56:56 -0700] INFO: Processing file[/tmp/hello\_world] action create ((irb#1) line 2)
+  [Sat, 09 Apr 2011 08:56:56 -0700] INFO: file[/tmp/hello\_world] created file /tmp/hello\_world
+  chef:recipe > pp ls '/tmp'
+  [".",
+  "..",
+  "hello\_world"]
 
 * Search for _nodes_ by role, and print their IP addresses
 
-  chef > nodes.find(:roles => 'monitoring-server') {|n| n[:ipaddress] }  
-  => ["10.254.199.5"]  
+  chef > nodes.find(:roles => 'monitoring-server') {|n| n[:ipaddress] }
+  => ["10.254.199.5"]
 
 * Remove the role _obsolete_ from every node in the system
 
-  chef > nodes.transform(:all) {|n| n.run\_list.delete('role[obsolete]') }  
-   => [node[chef098b2.opschef.com], node[ree-woot], node[graphite-dev], node[fluke.localdomain], node[ghost.local], node[kallistec]]  
+  chef > nodes.transform(:all) {|n| n.run\_list.delete('role[obsolete]') }
+   => [node[chef098b2.opschef.com], node[ree-woot], node[graphite-dev], node[fluke.localdomain], node[ghost.local], node[kallistec]]
 
 
 ## BUGS
-The name `shef` is clever in print but is confusing when spoken aloud.
-Pronouncing `shef` as `chef console` is an imperfect workaround.
 
-`shef` often does not perfectly replicate the context in which
+`chef-shell` often does not perfectly replicate the context in which
 chef-client(8) configures a host, which may lead to discrepancies in
 observed behavior.
 
-`shef` has to duplicate much code from chef-client's internal libraries
-and may become out of sync with the behavior of those libraries.
+`chef-shell` has to duplicate much code from chef-client's internal
+libraries and may become out of sync with the behavior of those
+libraries.
 
 ## SEE ALSO
+
   chef-client(8) knife(1)
-  <http://wiki.opscode.com/display/chef/Shef>
+  <http://wiki.opscode.com/display/chef/Chef+Shell>
 
 ## AUTHOR
+
    Chef was written by Adam Jacob <adam@opscode.com> with many
-   contributions from the community. Shef was written by Daniel DeLeo.
+   contributions from the community. chef-shell was written by Daniel
+   DeLeo.
 
 ## DOCUMENTATION
+
    This manual page was written by Daniel DeLeo <dan@opscode.com>.
    Permission is granted to copy, distribute and / or modify this
    document under the terms of the Apache 2.0 License.
 
 ## CHEF
-   Shef is distributed with Chef. <http://wiki.opscode.com/display/chef/Home>
-
-
 
+   chef-shell is distributed with Chef. <http://wiki.opscode.com/display/chef/Home>