chef 11.14.0.alpha.4 → 11.14.0.rc.2

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

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KNIFE-XARGS" "1" "Chef 11.12.0" "" "knife xargs"
+.TH "KNIFE-XARGS" "1" "Chef 11.14" "" "knife xargs"
 .SH NAME
 knife-xargs \- The man page for the knife xargs subcommand.
 .
@@ -101,10 +101,10 @@ The configuration file to use.
 The port on which chef\-zero will listen.
 .TP
 .B \fB\-d\fP, \fB\-\-disable\-editing\fP
-Indicates that $EDITOR will not be opened; data will be accepted as\-is.
+Use to prevent the $EDITOR from being opened and to accept data as\-is.
 .TP
 .B \fB\-\-defaults\fP
-Indicates that Knife will use the default value, instead of asking a user to provide one.
+Use to have Knife use the default value instead of asking a user to provide one.
 .TP
 .B \fB\-e EDITOR\fP, \fB\-\-editor EDITOR\fP
 The $EDITOR that is used for all interactive commands.
@@ -122,10 +122,10 @@ Shows help for the command.
 The private key that Knife will use to sign requests made by the API client to the Chef server\&.
 .TP
 .B \fB\-\-[no\-]color\fP
-Indicates whether colored output will be used.
+Use to view colored output.
 .TP
 .B \fB\-\-print\-after\fP
-Indicates that data will be shown after a destructive operation.
+Use to show data after a destructive operation.
 .TP
 .B \fB\-\-server\-url URL\fP
 The URL for the Chef server\&.
@@ -140,10 +140,10 @@ The version of the chef\-client\&.
 Set for more verbose outputs. Use \fB\-VV\fP for maximum verbosity.
 .TP
 .B \fB\-y\fP, \fB\-\-yes\fP
-Indicates that the response to all confirmation prompts will be "Yes" (and that Knife will not ask for confirmation).
+Use to respond to all confirmation prompts with "Yes". Knife will not ask for confirmation.
 .TP
 .B \fB\-z\fP, \fB\-\-local\-mode\fP
-Indicates that the chef\-client will be run in local mode, which allows all commands that work against the Chef server to also work against the local chef\-repo\&.
+Use to run the chef\-client in local mode. This allows all commands that work against the Chef server to also work against the local chef\-repo\&.
 .UNINDENT
 .sp
 \fBExamples\fP

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

@@ -1,4 +1,6 @@
-.TH "KNIFE" "1" "Chef 11.8.0" "" "knife"
+.\" Man page generated from reStructuredText.
+.
+.TH "KNIFE" "1" "Chef 11.14" "" "knife"
 .SH NAME
 knife \- The man page for the knife command line tool.
 .
@@ -28,10 +30,8 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.\" Man page generated from reStructuredText.
-.
 .sp
-Knife is a command\-line tool that provides an interface between a local chef\-repo and the server. Knife helps users to manage:
+Knife is a command\-line tool that provides an interface between a local chef\-repo and the Chef server\&. Knife helps users to manage:
 .INDENT 0.0
 .IP \(bu 2
 Nodes
@@ -48,7 +48,7 @@ Cloud resources, including provisioning
 .IP \(bu 2
 The installation of the chef\-client on management workstations
 .IP \(bu 2
-Searching of indexed data on the server
+Searching of indexed data on the Chef server
 .UNINDENT
 .sp
 Knife subcommands:
@@ -108,21 +108,83 @@ knife xargs
 .UNINDENT
 .SH WORKING WITH KNIFE
 .sp
-Knife runs from a management workstation and sits in\-between a server and an organization\(aqs infrastructure. Knife interacts with a server by using the same REST API that is used by a chef\-client. Role\-based authentication controls (RBAC) can be used to authorize changes when Knife is run with Hosted Chef or Private Chef. Knife is configured during workstation setup, but subsequent modifications can be made using the knife.rb configuration file.
+Knife runs from a management workstation and sits in\-between a Chef server and an organization\(aqs infrastructure. Knife interacts with a Chef server by using the same REST API that is used by a chef\-client\&. Role\-based authentication controls (RBAC) can be used to authorize changes when Knife is run with Enterprise Chef\&. Knife is configured during workstation setup, but subsequent modifications can be made using the knife.rb configuration file.
+.SS Common Options
+.sp
+The following options can be run with all Knife sub\-commands and plug\-ins:
+.INDENT 0.0
+.TP
+.B \fB\-c CONFIG_FILE\fP, \fB\-\-config CONFIG_FILE\fP
+The configuration file to use. For example, when Knife is run from a node that is configured to be managed by the Chef server, this option is used to allow Knife to use the same credentials as the chef\-client when communicating with the Chef server\&.
+.TP
+.B \fB\-\-chef\-zero\-port PORT\fP
+The port on which chef\-zero will listen.
+.TP
+.B \fB\-d\fP, \fB\-\-disable\-editing\fP
+Use to prevent the $EDITOR from being opened and to accept data as\-is.
+.TP
+.B \fB\-\-defaults\fP
+Use to have Knife use the default value instead of asking a user to provide one.
+.TP
+.B \fB\-e EDITOR\fP, \fB\-\-editor EDITOR\fP
+The $EDITOR that is used for all interactive commands.
+.TP
+.B \fB\-E ENVIRONMENT\fP, \fB\-\-environment ENVIRONMENT\fP
+The name of the environment. When this option is added to a command, the command will run only against the named environment. This option is ignored during search queries made using the \fBknife search\fP subcommand.
+.TP
+.B \fB\-F FORMAT\fP, \fB\-\-format FORMAT\fP
+The output format: \fBsummary\fP (default), \fBtext\fP, \fBjson\fP, \fByaml\fP, and \fBpp\fP\&.
+.TP
+.B \fB\-h\fP, \fB\-\-help\fP
+Shows help for the command.
+.TP
+.B \fB\-k KEY\fP, \fB\-\-key KEY\fP
+The private key that Knife will use to sign requests made by the API client to the Chef server\&.
+.TP
+.B \fB\-\-[no\-]color\fP
+Use to view colored output.
+.TP
+.B \fB\-\-print\-after\fP
+Use to show data after a destructive operation.
+.TP
+.B \fB\-s URL\fP, \fB\-\-server\-url URL\fP
+The URL for the Chef server\&.
+.TP
+.B \fB\-u USER\fP, \fB\-\-user USER\fP
+The user name used by Knife to sign requests made by the API client to the Chef server\&. Authentication will fail if the user name does not match the private key.
+.TP
+.B \fB\-v\fP, \fB\-\-version\fP
+The version of the chef\-client\&.
+.TP
+.B \fB\-V\fP, \fB\-\-verbose\fP
+Set for more verbose outputs. Use \fB\-VV\fP for maximum verbosity.
+.TP
+.B \fB\-y\fP, \fB\-\-yes\fP
+Use to respond to all confirmation prompts with "Yes". Knife will not ask for confirmation.
+.TP
+.B \fB\-z\fP, \fB\-\-local\-mode\fP
+Use to run the chef\-client in local mode. This allows all commands that work against the Chef server to also work against the local chef\-repo\&.
+.UNINDENT
 .SS JSON Data Format
 .sp
-Most data is entered using a text editor in JSON format, unless the \fB\-\-disable\-editing\fP option is entered as part of a command. (Encrypted data bags use YAML, which is a superset of JSON.) JSON is a common, language\-independent data format that provides a simple text representation of arbitrary data structures. For more information about JSON, see \fI\%http://www.json.org/\fP or \fI\%http://en.wikipedia.org/wiki/JSON\fP.
+Most data is entered using a text editor in JSON format, unless the \fB\-\-disable\-editing\fP option is entered as part of a command. (Encrypted data bags use YAML, which is a superset of JSON\&.) JSON is a common, language\-independent data format that provides a simple text representation of arbitrary data structures. For more information about JSON, see \fI\%http://www.json.org/\fP or \fI\%http://en.wikipedia.org/wiki/JSON\fP\&.
 .SS Set the Text Editor
 .sp
 Some Knife commands, such as \fBknife data bag edit\fP, require that information be edited as JSON data using a text editor. For example, the following command:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
 $ knife data bag edit admins admin_name
 .ft P
 .fi
+.UNINDENT
+.UNINDENT
 .sp
 will open up the text editor with data similar to:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
@@ -131,8 +193,12 @@ will open up the text editor with data similar to:
 }
 .ft P
 .fi
+.UNINDENT
+.UNINDENT
 .sp
 Changes to that file can then be made:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
@@ -142,62 +208,92 @@ Changes to that file can then be made:
 }
 .ft P
 .fi
+.UNINDENT
+.UNINDENT
 .sp
 The type of text editor that is used by Knife can be configured by adding an entry to the knife.rb file or by setting an \fBEDITOR\fP environment variable. For example, to configure the text editor to always open with vim, add the following to the knife.rb file:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
 knife[:editor] = "/usr/bin/vim"
 .ft P
 .fi
+.UNINDENT
+.UNINDENT
 .sp
 When a Microsoft Windows file path is enclosed in a double\-quoted string (" "), the same backslash character (\fB\e\fP) that is used to define the file path separator is also used in Ruby to define an escape character. The knife.rb file is a Ruby file; therefore, file path separators must be escaped. In addition, spaces in the file path must be replaced with \fB~1\fP so that the length of each section within the file path is not more than 8 characters. For example, if EditPad Pro is the text editor of choice and is located at the following path:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
 C:\e\eProgram Files (x86)\eEditPad Pro\eEditPad.exe
 .ft P
 .fi
+.UNINDENT
+.UNINDENT
 .sp
 the setting in the knife.rb file would be similar to:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
 knife[:editor] = "C:\e\eProgra~1\e\eEditPa~1\e\eEditPad.exe"
 .ft P
 .fi
+.UNINDENT
+.UNINDENT
 .sp
 One approach to working around the double\- vs. single\-quote issue is to put the single\-quotes outside of the double\-quotes. For example, for Notepad++:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
 knife[:editor] = \(aq"C:\eProgram Files (x86)\eNotepad++\enotepad++.exe \-nosession \-multiInst"\(aq
 .ft P
 .fi
+.UNINDENT
+.UNINDENT
 .sp
 for Sublime Text:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
 knife[:editor] = \(aq"C:\eProgram Files\eSublime Text 2\esublime_text.exe \-\-wait"\(aq
 .ft P
 .fi
+.UNINDENT
+.UNINDENT
 .sp
 for TextPad:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
 knife[:editor] = \(aq"C:\eProgram Files (x86)\eTextPad 7\eTextPad.exe"\(aq
 .ft P
 .fi
+.UNINDENT
+.UNINDENT
 .sp
 and for vim:
+.INDENT 0.0
+.INDENT 3.5
 .sp
 .nf
 .ft C
 knife[:editor] = \(aq"C:\eProgram Files (x86)\evim\evim74\egvim.exe"\(aq
 .ft P
 .fi
+.UNINDENT
+.UNINDENT
 .SS Using Quotes
 .sp
 Values can be entered with double quotes (" ") or single quotes (\(aq \(aq), but this should be done consistently.
@@ -205,10 +301,14 @@ Values can be entered with double quotes (" ") or single quotes (\(aq \(aq), but
 .sp
 Knife comes with a collection of built in subcommands that work together to provide all of the functionality required to take specific actions against any object in an organization, including cookbooks, nodes, roles, data bags, environments, and users. A Knife plugin extends the functionality beyond built\-in subcommands.
 .sp
-Knife has the following subcommands: \fBbootstrap\fP, \fBclient\fP, \fBconfigure\fP, \fBcookbook\fP, \fBcookbook site\fP, \fBdata bag\fP, \fBdelete\fP, \fBdeps\fP, \fBdiff\fP, \fBdownload\fP, \fBedit\fP, \fBenvironment\fP, \fBexec\fP, \fBindex rebuild\fP, \fBlist\fP, \fBnode\fP, \fBrecipe list\fP, \fBrole\fP, \fBsearch\fP, \fBshow\fP, \fBssh\fP, \fBstatus\fP, \fBtag\fP, \fBupload\fP, \fBuser\fP, and \fBxargs\fP.
-.IP Note
-The following subcommands run only against the open source server: \fBindex rebuild\fP and \fBuser\fP.
-.RE
+Knife has the following subcommands: \fBbootstrap\fP, \fBclient\fP, \fBconfigure\fP, \fBcookbook\fP, \fBcookbook site\fP, \fBdata bag\fP, \fBdelete\fP, \fBdeps\fP, \fBdiff\fP, \fBdownload\fP, \fBedit\fP, \fBenvironment\fP, \fBexec\fP, \fBindex rebuild\fP, \fBlist\fP, \fBnode\fP, \fBrecipe list\fP, \fBrole\fP, \fBsearch\fP, \fBshow\fP, \fBssh\fP, \fBstatus\fP, \fBtag\fP, \fBupload\fP, \fBuser\fP, and \fBxargs\fP\&.
+.sp
+\fBNOTE:\fP
+.INDENT 0.0
+.INDENT 3.5
+The following subcommands run only against the open source Chef server: \fBindex rebuild\fP and \fBuser\fP\&.
+.UNINDENT
+.UNINDENT
 .SS Syntax
 .sp
 All Knife subcommands have the following syntax:
@@ -219,10 +319,14 @@ knife subcommand [ARGUMENT] (options)
 .UNINDENT
 .sp
 Each subcommand has its own set of arguments and options.
-.IP Note
+.sp
+\fBNOTE:\fP
+.INDENT 0.0
+.INDENT 3.5
 All syntax examples in this document show variables in ALL_CAPS. For example \fB\-u PORT_LIST\fP (where PORT_LIST is a comma\-separated list of local and public UDP ports) or \fB\-F FORMAT\fP (where FORMAT determines the output format, either \fBsummary\fP, \fBtext\fP, \fBjson\fP, \fByaml\fP, or \fBpp\fP). These variables often require specific values that are unique to each organization.
-.RE
+.UNINDENT
+.UNINDENT
 .SH AUTHOR
-Opscode
+Chef
 .\" Generated by docutils manpage writer.
 .

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

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "CHEF-CLIENT" "8" "Chef 11.12.0" "" "chef-client"
+.TH "CHEF-CLIENT" "8" "Chef 11.14" "" "chef-client"
 .SH NAME
 chef-client \- The man page for the chef-client command line tool.
 .
@@ -92,9 +92,6 @@ This command has the following options:
 .B \fB\-A\fP, \fB\-\-fatal\-windows\-admin\-check\fP
 Use to cause a chef\-client run to fail when the chef\-client does not have administrator privileges in Microsoft Windows\&.
 .TP
-.B \fB\-c CONFIG\fP, \fB\-\-config CONFIG\fP
-The configuration file to use.
-.TP
 .B \fB\-\-chef\-zero\-port PORT\fP
 The port on which chef\-zero will listen.
 .TP
@@ -108,10 +105,10 @@ Use \fBmin\fP to print the progress of the chef\-client run using single charact
 Other formatting options are available when those formatters are configured in the client.rb file using the \fBadd_formatter\fP option.
 .TP
 .B \fB\-\-force\-formatter\fP
-Indicates that formatter output will be used instead of logger output.
+Use to show formatter output instead of logger output.
 .TP
 .B \fB\-\-force\-logger\fP
-Indicates that logger output will be used instead of formatter output.
+Use to show logger output instead of formatter output.
 .TP
 .B \fB\-g GROUP\fP, \fB\-\-group GROUP\fP
 The name of the group that owns a process. This is required when starting any executable as a daemon.
@@ -138,7 +135,7 @@ The level of logging that will be stored in a log file.
 The location in which log file output files will be saved. If this location is set to something other than \fBSTDOUT\fP, standard output logging will still be performed (otherwise there would be no output other than to a file). This is recommended when starting any executable as a daemon. Default value: \fBSTDOUT\fP\&.
 .TP
 .B \fB\-\-[no\-]color\fP
-Indicates whether colored output will be used. Default setting: \fB\-\-color\fP\&.
+Use to view colored output. Default setting: \fB\-\-color\fP\&.
 .TP
 .B \fB\-N NODE_NAME\fP, \fB\-\-node\-name NODE_NAME\fP
 The name of the node.
@@ -147,17 +144,23 @@ The name of the node.
 Replace the current run list with the specified items.
 .TP
 .B \fB\-\-once\fP
-Indicates that the chef\-client is run once and that interval and splay options are cancelled.
+Use to run the chef\-client only once and to cancel \fBinterval\fP and \fBsplay\fP options.
 .TP
 .B \fB\-P PID_FILE\fP, \fB\-\-pid PID_FILE\fP
 The location in which a process identification number (pid) is saved. An executable, when started as a daemon, will write the pid to the specified file. Default value: \fB/tmp/name\-of\-executable.pid\fP\&.
 .TP
+.B \fB\-r RUN_LIST_ITEM\fP, \fB\-\-runlist RUN_LIST_ITEM\fP
+Use to permanently replace the current run\-list with the specified run\-list items.
+.TP
 .B \fB\-R\fP, \fB\-\-enable\-reporting\fP
 Use to enable data collection reporting during a chef\-client run.
 .TP
 .B \fBRECIPE_FILE\fP
 The path to a recipe. For example, if a recipe file is in the current directory, use \fBrecipe_file.rb\fP\&. This is typically used with the \fB\-\-local\-mode\fP option.
 .TP
+.B \fB\-\-run\-lock\-timeout SECONDS\fP
+The amount of time (in seconds) to wait for a chef\-client run to finish. Default value: not set (indefinite). Set to \fB0\fP to cause a second chef\-client to exit immediately.
+.TP
 .B \fB\-s SECONDS\fP, \fB\-\-splay SECONDS\fP
 A number (in seconds) to add to the \fBinterval\fP that is used to determine the frequency of chef\-client runs. This number can help prevent server load when there are many clients running at the same time.
 .TP
@@ -171,10 +174,10 @@ The user that owns a process. This is required when starting any executable as a
 The version of the chef\-client\&.
 .TP
 .B \fB\-W\fP, \fB\-\-why\-run\fP
-Indicates that the executable will be run in why\-run mode, which is a type of chef\-client run that does everything except modify the system. Use why\-run mode to understand why the chef\-client makes the decisions that it makes and to learn more about the current and proposed state of the system.
+Use to run the executable in why\-run mode, which is a type of chef\-client run that does everything except modify the system. Use why\-run mode to understand why the chef\-client makes the decisions that it makes and to learn more about the current and proposed state of the system.
 .TP
 .B \fB\-z\fP, \fB\-\-local\-mode\fP
-Indicates that the chef\-client will be run in local mode, which allows all commands that work against the Chef server to also work against the local chef\-repo\&.
+Use to run the chef\-client in local mode. This allows all commands that work against the Chef server to also work against the local chef\-repo\&.
 .UNINDENT
 .SH RUN WITH ELEVATED PRIVILEGES
 .sp

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

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "CHEF-SOLO" "8" "Chef 11.12.0" "" "chef-solo"
+.TH "CHEF-SOLO" "8" "Chef 11.14" "" "chef-solo"
 .SH NAME
 chef-solo \- The man page for the chef-solo command line tool.
 .
@@ -55,7 +55,8 @@ chef\-solo can be run as a daemon.
 .UNINDENT
 .sp
 The chef\-solo executable is run as a command\-line tool.
-.SH OPTIONS
+.sp
+\fBOptions\fP
 .sp
 This command has the following syntax:
 .INDENT 0.0
@@ -76,13 +77,13 @@ This command has the following options:
 The configuration file to use.
 .TP
 .B \fB\-d\fP, \fB\-\-daemonize\fP
-Indicates that the executable will be run as a daemon. This option is only available on machines that run in UNIX or Linux environments. For machines that are running Microsoft Windows that require similar functionality, use the \fBchef\-client::service\fP recipe in the \fBchef\-client\fP cookbook: \fI\%http://community.opscode.com/cookbooks/chef\-client\fP\&. This will install a chef\-client service under Microsoft Windows using the Windows Service Wrapper\&.
+Use to run the executable as a daemon. This option is only available on machines that run in UNIX or Linux environments. For machines that are running Microsoft Windows that require similar functionality, use the \fBchef\-client::service\fP recipe in the \fBchef\-client\fP cookbook: \fI\%http://community.opscode.com/cookbooks/chef\-client\fP\&. This will install a chef\-client service under Microsoft Windows using the Windows Service Wrapper\&.
 .TP
 .B \fB\-E ENVIRONMENT_NAME\fP, \fB\-\-environment ENVIRONMENT_NAME\fP
 The name of the environment.
 .TP
 .B \fB\-f\fP, \fB\-\-[no\-]fork\fP
-Indicates that a chef\-client run will be contained in a secondary process with dedicated RAM. When the chef\-client run is complete the RAM will be returned to the master process. This option helps ensure that a chef\-client will use a steady amount of RAM over time because the master process will not run recipes. This option will also help prevent memory leaks (such as those that can be introduced by the code contained within a poorly designed cookbook). Use \fB\-\-no\-fork\fP to disable running the chef\-client in fork node. Default value: \fB\-\-fork\fP\&.
+Use to contain the chef\-client run in a secondary process with dedicated RAM. When the chef\-client run is complete the RAM will be returned to the master process. This option helps ensure that a chef\-client will use a steady amount of RAM over time because the master process will not run recipes. This option will also help prevent memory leaks (such as those that can be introduced by the code contained within a poorly designed cookbook). Use \fB\-\-no\-fork\fP to disable running the chef\-client in fork node. Default value: \fB\-\-fork\fP\&.
 .TP
 .B \fB\-F FORMAT\fP, \fB\-\-format FORMAT\fP
 The output format: \fBdoc\fP (default) or \fBmin\fP\&.
@@ -94,10 +95,10 @@ Use \fBmin\fP to print the progress of the chef\-client run using single charact
 Other formatting options are available when those formatters are configured in the client.rb file using the \fBadd_formatter\fP option.
 .TP
 .B \fB\-\-force\-formatter\fP
-Indicates that formatter output will be used instead of logger output.
+Use to show formatter output instead of logger output.
 .TP
 .B \fB\-\-force\-logger\fP
-Indicates that logger output will be used instead of formatter output.
+Use to show logger output instead of formatter output.
 .TP
 .B \fB\-g GROUP\fP, \fB\-\-group GROUP\fP
 The name of the group that owns a process. This is required when starting any executable as a daemon.
@@ -118,7 +119,7 @@ The level of logging that will be stored in a log file.
 The location in which log file output files will be saved. If this location is set to something other than \fBSTDOUT\fP, standard output logging will still be performed (otherwise there would be no output other than to a file). This is recommended when starting any executable as a daemon.
 .TP
 .B \fB\-\-[no\-]color\fP
-Indicates whether colored output will be used. Default setting: \fB\-\-color\fP\&.
+Use to view colored output. Default setting: \fB\-\-color\fP\&.
 .TP
 .B \fB\-N NODE_NAME\fP, \fB\-\-node\-name NODE_NAME\fP
 The name of the node.
@@ -129,6 +130,9 @@ Replace the current run list with the specified items.
 .B \fB\-r RECIPE_URL\fP, \fB\-\-recipe\-url RECIPE_URL\fP
 The URL location from which a remote cookbook tar.gz will be downloaded.
 .TP
+.B \fB\-\-run\-lock\-timeout SECONDS\fP
+The amount of time (in seconds) to wait for a chef\-client run to finish. Default value: not set (indefinite). Set to \fB0\fP to cause a second chef\-client to exit immediately.
+.TP
 .B \fB\-s SECONDS\fP, \fB\-\-splay SECONDS\fP
 A number (in seconds) to add to the \fBinterval\fP that is used to determine the frequency of chef\-client runs. This number can help prevent server load when there are many clients running at the same time.
 .TP
@@ -139,11 +143,10 @@ The user that owns a process. This is required when starting any executable as a
 The version of the chef\-client\&.
 .TP
 .B \fB\-W\fP, \fB\-\-why\-run\fP
-Indicates that the executable will be run in why\-run mode, which is a type of chef\-client run that does everything except modify the system. Use why\-run mode to understand why the chef\-client makes the decisions that it makes and to learn more about the current and proposed state of the system.
+Use to run the executable in why\-run mode, which is a type of chef\-client run that does everything except modify the system. Use why\-run mode to understand why the chef\-client makes the decisions that it makes and to learn more about the current and proposed state of the system.
 .UNINDENT
-.SH EXAMPLES
 .sp
-\fBUse a URL\fP
+\fBExamples\fP
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -156,8 +159,6 @@ $ chef\-solo \-c ~/solo.rb \-j ~/node.json \-r http://www.example.com/chef\-solo
 .UNINDENT
 .sp
 The tar.gz archived into the \fBfile_cache_path\fP, and then extracted to \fBcookbooks_path\fP\&.
-.sp
-\fBUse a directory\fP
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -170,8 +171,6 @@ $ chef\-solo \-c ~/solo.rb \-j ~/node.json
 .UNINDENT
 .sp
 chef\-solo will look in the solo.rb file to determine the directory in which cookbooks are located.
-.sp
-\fBUse a URL for cookbook and JSON data\fP
 .INDENT 0.0
 .INDENT 3.5
 .sp