chef 12.0.0.alpha.2 → 12.0.0.rc.0

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

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KNIFE-CONFIGURE" "1" "Chef 11.14" "" "knife configure"
+.TH "KNIFE-CONFIGURE" "1" "Chef 11.16" "" "knife configure"
 .SH NAME
 knife-configure \- The man page for the knife configure subcommand.
 .
@@ -83,7 +83,7 @@ Use to view colored output.
 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.
+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.
@@ -101,7 +101,7 @@ Shows help for the command.
 Use to create a API client, typically an administrator client on a freshly\-installed Chef server\&.
 .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\&.
+The private key that knife will use to sign requests made by the API client to the Chef server\&.
 .TP
 .B \fB\-\-print\-after\fP
 Use to show data after a destructive operation.
@@ -113,7 +113,7 @@ The path to the chef\-repo\&.
 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.
+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\&.
@@ -128,7 +128,7 @@ The name of the validation client.
 The path to the validation key used by the client, typically a file named \fBvalidation.pem\fP\&.
 .TP
 .B \fB\-y\fP, \fB\-\-yes\fP
-Use to respond to all confirmation prompts with "Yes". 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
 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\&.

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

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KNIFE-COOKBOOK-SITE" "1" "Chef 11.14" "" "knife cookbook site"
+.TH "KNIFE-COOKBOOK-SITE" "1" "Chef 11.16" "" "knife cookbook site"
 .SH NAME
 knife-cookbook-site \- The man page for the knife cookbook site subcommand.
 .
@@ -31,9 +31,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
 .sp
-The Cookbooks Site API is used to provide access to the cookbooks community hosted at \fI\%http://community.opscode.com/cookbooks\fP\&. All of the cookbooks in the community are accessible through a RESTful API located at \fI\%https://cookbooks.opscode.com/api/v1/cookbooks\fP by using any of the supported endpoints. In most cases, using Knife and the \fBknife cookbook site\fP sub\-command (and any of its arguments) is the recommended method of interacting with these cookbooks, but in some cases, using the Cookbooks Site API directly may make sense.
+The Cookbooks Site API is used to provide access to the cookbooks community hosted at \fI\%https://supermarket.getchef.com/cookbooks\fP\&. All of the cookbooks in the community are accessible through a RESTful API located at \fI\%https://supermarket.getchef.com/api/v1/cookbooks\fP by using any of the supported endpoints. In most cases, using knife and the \fBknife cookbook site\fP sub\-command (and any of its arguments) is the recommended method of interacting with these cookbooks, but in some cases, using the Cookbooks Site API directly may make sense.
 .sp
-The \fBknife cookbook site\fP subcommand is used to interact with cookbooks that are located at \fI\%http://community.opscode.com/cookbooks\fP\&. A user account is required for any community actions that write data to this site. The following arguments do not require a user account: \fBdownload\fP, \fBsearch\fP, \fBinstall\fP, and \fBlist\fP\&.
+The \fBknife cookbook site\fP subcommand is used to interact with cookbooks that are located at \fI\%https://supermarket.getchef.com/cookbooks\fP\&. A user account is required for any community actions that write data to this site. The following arguments do not require a user account: \fBdownload\fP, \fBsearch\fP, \fBinstall\fP, and \fBlist\fP\&.
 .SH COMMON OPTIONS
 .sp
 The following options may be used with any of the arguments available to the \fBknife cookbook site\fP subcommand:
@@ -49,7 +49,7 @@ The configuration file to use.
 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.
+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.
@@ -64,7 +64,7 @@ The output format: \fBsummary\fP (default), \fBtext\fP, \fBjson\fP, \fByaml\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\&.
+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.
@@ -76,7 +76,7 @@ Use to show data after a destructive operation.
 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.
+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\-\-verbose\fP
 Set for more verbose outputs. Use \fB\-VV\fP for maximum verbosity.
@@ -85,14 +85,14 @@ Set for more verbose outputs. Use \fB\-VV\fP for maximum verbosity.
 The version of the chef\-client\&.
 .TP
 .B \fB\-y\fP, \fB\-\-yes\fP
-Use to respond to all confirmation prompts with "Yes". 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
 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 DOWNLOAD
 .sp
-The \fBdownload\fP argument is used to download a cookbook from the community website. A cookbook will be downloaded as a tar.gz archive and placed in the current working directory. If a cookbook (or cookbook version) has been deprecated and the \fB\-\-force\fP option is not used, Knife will alert the user that the cookbook is deprecated and then will provide the name of the most recent non\-deprecated version of that cookbook.
+The \fBdownload\fP argument is used to download a cookbook from the community website. A cookbook will be downloaded as a tar.gz archive and placed in the current working directory. If a cookbook (or cookbook version) has been deprecated and the \fB\-\-force\fP option is not used, knife will alert the user that the cookbook is deprecated and then will provide the name of the most recent non\-deprecated version of that cookbook.
 .sp
 \fBSyntax\fP
 .sp
@@ -125,7 +125,7 @@ Use to overwrite an existing directory.
 .sp
 \fBExamples\fP
 .sp
-To download the cookbook "getting\-started", enter:
+To download the cookbook \fBgetting\-started\fP, enter:
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -152,7 +152,7 @@ Cookbook saved: /Users/sdanna/opscodesupport/getting\-started\-0.3.0.tar.gz
 .UNINDENT
 .SH INSTALL
 .sp
-The \fBinstall\fP argument is used to install a cookbook that has been downloaded from the community site to a local git repository . This action uses the git version control system in conjunction with the \fI\%http://community.opscode.com/cookbooks\fP site to install community\-contributed cookbooks to the local chef\-repo\&. Using this argument does the following:
+The \fBinstall\fP argument is used to install a cookbook that has been downloaded from the community site to a local git repository . This action uses the git version control system in conjunction with the \fI\%https://supermarket.getchef.com/cookbooks\fP site to install community\-contributed cookbooks to the local chef\-repo\&. Using this argument does the following:
 .INDENT 0.0
 .INDENT 3.5
 .INDENT 0.0
@@ -161,7 +161,7 @@ A new "pristine copy" branch is created in git for tracking the upstream.
 .IP 2. 3
 All existing versions of a cookbook are removed from the branch.
 .IP 3. 3
-The cookbook is downloaded from \fI\%http://community.opscode.com/cookbooks\fP in the tar.gz format.
+The cookbook is downloaded from \fI\%https://supermarket.getchef.com/cookbooks\fP in the tar.gz format.
 .IP 4. 3
 The downloaded cookbook is untarred and its contents are committed to git and a tag is created.
 .IP 5. 3
@@ -204,12 +204,12 @@ The version of the cookbook to be installed. If a version is not specified, the
 Use to ensure that all cookbooks to which the installed cookbook has a dependency will not be installed.
 .TP
 .B \fB\-o PATH:PATH\fP, \fB\-\-cookbook\-path PATH:PATH\fP
-The directory in which cookbook are created. This can be a colon\-separated path.
+The directory in which cookbooks are created. This can be a colon\-separated path.
 .UNINDENT
 .sp
 \fBExamples\fP
 .sp
-To install the cookbook "getting\-started", enter:
+To install the cookbook \fBgetting\-started\fP, enter:
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -261,7 +261,7 @@ Cookbook getting\-started version 0.3.0 successfully installed
 .UNINDENT
 .SH LIST
 .sp
-The \fBlist\fP argument is used to view a list of cookbooks that are currently available at \fI\%http://community.opscode.com/cookbooks\fP\&.
+The \fBlist\fP argument is used to view a list of cookbooks that are currently available at \fI\%https://supermarket.getchef.com/cookbooks\fP\&.
 .sp
 \fBSyntax\fP
 .sp
@@ -288,7 +288,7 @@ Use to show the corresponding URIs.
 .sp
 \fBExamples\fP
 .sp
-To view a list of cookbooks at \fI\%http://community.opscode.com/cookbooks\fP server, enter:
+To view a list of cookbooks at \fI\%https://supermarket.getchef.com/cookbooks\fP server, enter:
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -323,7 +323,7 @@ ant                   iis                   redmine
 .UNINDENT
 .SH SEARCH
 .sp
-The \fBsearch\fP argument is used to search for a cookbook at \fI\%http://community.opscode.com/cookbooks\fP\&. A search query is used to return a list of cookbooks at \fI\%http://community.opscode.com/cookbooks\fP and uses the same syntax as the \fBknife search\fP sub\-command.
+The \fBsearch\fP argument is used to search for a cookbook at \fI\%https://supermarket.getchef.com/cookbooks\fP\&. A search query is used to return a list of cookbooks at \fI\%https://supermarket.getchef.com/cookbooks\fP and uses the same syntax as the \fBknife search\fP sub\-command.
 .sp
 \fBSyntax\fP
 .sp
@@ -385,7 +385,7 @@ kickstart:
 .UNINDENT
 .SH SHARE
 .sp
-The \fBshare\fP argument is used to add a cookbook to \fI\%http://community.opscode.com/cookbooks\fP\&. This action will require a user account and a certificate for \fI\%http://community.opscode.com\fP\&. By default, Knife will use the user name and API key that is identified in the configuration file used during the upload; otherwise these values must be specified on the command line or in an alternate configuration file. If a cookbook already exists on \fI\%http://community.opscode.com/cookbooks\fP, then only an owner or maintainer of that cookbook can make updates.
+The \fBshare\fP argument is used to add a cookbook to \fI\%https://supermarket.getchef.com/cookbooks\fP\&. This action will require a user account and a certificate for \fI\%https://supermarket.getchef.com\fP\&. By default, knife will use the user name and API key that is identified in the configuration file used during the upload; otherwise these values must be specified on the command line or in an alternate configuration file. If a cookbook already exists on \fI\%https://supermarket.getchef.com/cookbooks\fP, then only an owner or maintainer of that cookbook can make updates.
 .sp
 \fBSyntax\fP
 .sp
@@ -407,15 +407,15 @@ This argument has the following options:
 .INDENT 0.0
 .TP
 .B \fBCATEGORY\fP
-The cookbook category: \fB"Databases"\fP, \fB"Web Servers"\fP, \fB"Process Management"\fP, \fB"Monitoring & Trending"\fP, \fB"Programming Languages"\fP, \fB"Package Management"\fP, \fB"Applications"\fP, \fB"Networking"\fP, \fB"Operations Systems & Virtualization"\fP, \fB"Utilities"\fP, or \fB"Other"\fP\&.
+The cookbook category: \fB"Databases"\fP, \fB"Web Servers"\fP, \fB"Process Management"\fP, \fB"Monitoring & Trending"\fP, \fB"Programming Languages"\fP, \fB"Package Management"\fP, \fB"Applications"\fP, \fB"Networking"\fP, \fB"Operating Systems & Virtualization"\fP, \fB"Utilities"\fP, or \fB"Other"\fP\&.
 .TP
 .B \fB\-o PATH:PATH\fP, \fB\-\-cookbook\-path PATH:PATH\fP
-The directory in which cookbook are created. This can be a colon\-separated path.
+The directory in which cookbooks are created. This can be a colon\-separated path.
 .UNINDENT
 .sp
 \fBExamples\fP
 .sp
-To share a cookbook named "apache2":
+To share a cookbook named \fBapache2\fP:
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -428,7 +428,7 @@ $ knife cookbook site share "apache2" "Web Servers"
 .UNINDENT
 .SH SHOW
 .sp
-The \fBshow\fP argument is used to view information about a cookbook on \fI\%http://community.opscode.com/cookbooks\fP\&.
+The \fBshow\fP argument is used to view information about a cookbook on \fI\%https://supermarket.getchef.com/cookbooks\fP\&.
 .sp
 \fBSyntax\fP
 .sp
@@ -455,7 +455,7 @@ The version of a cookbook to be shown. If a cookbook has only one version, this
 .sp
 \fBExamples\fP
 .sp
-To show the details for a cookbook named "haproxy":
+To show the details for a cookbook named \fBhaproxy\fP:
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -510,7 +510,7 @@ $ knife role show devops \-F json
 Other formats available include \fBtext\fP, \fByaml\fP, and \fBpp\fP\&.
 .SH UNSHARE
 .sp
-The \fBunshare\fP argument is used to stop the sharing of a cookbook at \fI\%http://community.opscode.com/cookbooks\fP\&. Only the maintainer of a cookbook may perform this action.
+The \fBunshare\fP argument is used to stop the sharing of a cookbook at \fI\%https://supermarket.getchef.com/cookbooks\fP\&. Only the maintainer of a cookbook may perform this action.
 .sp
 \fBSyntax\fP
 .sp
@@ -532,7 +532,7 @@ This command does not have any specific options.
 .sp
 \fBExamples\fP
 .sp
-To unshare a cookbook named "getting\-started", enter:
+To unshare a cookbook named \fBgetting\-started\fP, enter:
 .INDENT 0.0
 .INDENT 3.5
 .sp

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

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KNIFE-COOKBOOK" "1" "Chef 11.14" "" "knife cookbook"
+.TH "KNIFE-COOKBOOK" "1" "Chef 11.16" "" "knife cookbook"
 .SH NAME
 knife-cookbook \- The man page for the knife cookbook subcommand.
 .
@@ -69,7 +69,7 @@ The configuration file to use.
 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.
+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.
@@ -84,7 +84,7 @@ The output format: \fBsummary\fP (default), \fBtext\fP, \fBjson\fP, \fByaml\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\&.
+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.
@@ -96,7 +96,7 @@ Use to show data after a destructive operation.
 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.
+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\-\-verbose\fP
 Set for more verbose outputs. Use \fB\-VV\fP for maximum verbosity.
@@ -105,7 +105,7 @@ Set for more verbose outputs. Use \fB\-VV\fP for maximum verbosity.
 The version of the chef\-client\&.
 .TP
 .B \fB\-y\fP, \fB\-\-yes\fP
-Use to respond to all confirmation prompts with "Yes". 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
 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\&.
@@ -213,7 +213,7 @@ The type of license under which a cookbook is distributed: \fBapachev2\fP, \fBgp
 The email address for the individual who maintains the cookbook. This option will place an email address in each of the pre\-created files. If this option is not specified, an email name of "your_email" will be used instead; it can be easily modified later.
 .TP
 .B \fB\-o PATH\fP, \fB\-\-cookbook\-path PATH\fP
-The directory in which cookbook are created. This can be a colon\-separated path.
+The directory in which cookbooks are created. This can be a colon\-separated path.
 .TP
 .B \fB\-r FORMAT\fP, \fB\-\-readme\-format FORMAT\fP
 The document format of the readme file: \fBmd\fP (markdown) and \fBrdoc\fP (Ruby docs).
@@ -273,7 +273,7 @@ This argument has the following options:
 Use to delete all cookbooks (and cookbook versions).
 .TP
 .B \fBCOOKBOOK_VERSION\fP
-The version of a cookbook to be deleted. If a cookbook has only one version, this option does not need to be specified. If a cookbook has more than one version and this option is not specified, Knife will prompt for a version.
+The version of a cookbook to be deleted. If a cookbook has only one version, this option does not need to be specified. If a cookbook has more than one version and this option is not specified, knife will prompt for a version.
 .TP
 .B \fB\-p\fP, \fB\-\-purge\fP
 Use to entirely remove a cookbook (or cookbook version) from the Chef server\&. This action should be used carefully because only one copy of any single file is stored on the Chef server\&. Consequently, purging a cookbook will disable any other cookbook that references one or more files from a cookbook that has been purged.
@@ -328,7 +328,7 @@ This argument has the following options:
 .INDENT 0.0
 .TP
 .B \fB\-d DOWNLOAD_DIRECTORY\fP, \fB\-\-dir DOWNLOAD_DIRECTORY\fP
-The directory into which a cookbook will be downloaded.
+The directory in which cookbooks are located.
 .TP
 .B \fB\-f\fP, \fB\-\-force\fP
 Use to overwrite an existing directory.
@@ -420,7 +420,7 @@ This argument has the following options:
 Use to generate metadata for all cookbooks.
 .TP
 .B \fB\-o PATH:PATH\fP, \fB\-\-cookbook\-path PATH:PATH\fP
-The directory in which cookbook are created. This can be a colon\-separated path.
+The directory in which cookbooks are created. This can be a colon\-separated path.
 .UNINDENT
 .sp
 \fBExamples\fP
@@ -642,7 +642,7 @@ This argument has the following options:
 Use to test all cookbooks.
 .TP
 .B \fB\-o PATH:PATH\fP, \fB\-\-cookbook\-path PATH:PATH\fP
-The directory in which cookbook are created. This can be a colon\-separated path.
+The directory in which cookbooks are created. This can be a colon\-separated path.
 .UNINDENT
 .sp
 \fBExamples\fP
@@ -712,7 +712,7 @@ Use to update a cookbook even if the \fB\-\-freeze\fP flag has been set.
 Use to require changes to a cookbook be included as a new version. Only the \fB\-\-force\fP option can override this setting.
 .TP
 .B \fB\-o PATH:PATH\fP, \fB\-\-cookbook\-path PATH:PATH\fP
-The directory in which cookbook are created. This can be a colon\-separated path.
+The directory in which cookbooks are created. This can be a colon\-separated path.
 .UNINDENT
 .sp
 \fBExamples\fP
@@ -752,7 +752,7 @@ Upload completed
 .UNINDENT
 .UNINDENT
 .sp
-If a cookbook is frozen and the \fB\-\-force\fP option is not specified, Knife will return an error message similar to the following:
+If a cookbook is frozen and the \fB\-\-force\fP option is not specified, knife will return an error message similar to the following:
 .INDENT 0.0
 .INDENT 3.5
 .sp

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

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KNIFE-DATA-BAG" "1" "Chef 11.14" "" "knife data bag"
+.TH "KNIFE-DATA-BAG" "1" "Chef 11.16" "" "knife data bag"
 .SH NAME
 knife-data-bag \- The man page for the knife data bag subcommand.
 .
@@ -51,7 +51,7 @@ The configuration file to use.
 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.
+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.
@@ -66,7 +66,7 @@ The output format: \fBsummary\fP (default), \fBtext\fP, \fBjson\fP, \fByaml\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\&.
+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.
@@ -78,7 +78,7 @@ Use to show data after a destructive operation.
 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.
+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\-\-verbose\fP
 Set for more verbose outputs. Use \fB\-VV\fP for maximum verbosity.
@@ -87,7 +87,7 @@ Set for more verbose outputs. Use \fB\-VV\fP for maximum verbosity.
 The version of the chef\-client\&.
 .TP
 .B \fB\-y\fP, \fB\-\-yes\fP
-Use to respond to all confirmation prompts with "Yes". 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
 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\&.
@@ -257,12 +257,36 @@ To edit the contents of a data bag, enter:
 .sp
 .nf
 .ft C
-$ knife data bag edit admins
+$ knife data bag edit dogs tibetanspaniel
 .ft P
 .fi
 .UNINDENT
 .UNINDENT
 .sp
+where \fBdogs\fP is the name of the data bag and \fBtibetanspaniel\fP is the name of the data bag item. This will return something similar to the following in the knife editor:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+{
+  "name":"data_bag_item_dogs_tibetanspaniel",
+  "json_class":"Chef::DataBagItem",
+  "chef_type":"data_bag_item",
+  "data_bag":"dogs",
+  "raw_data":
+    {
+      "description":"small dog that likes to sit in windows",
+      "id":"tibetanspaniel"
+    }
+}
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+Make the necessary changes to the key\-value pairs under \fBraw_data\fP and save them.
+.sp
 To edit an item named "charlie" that is contained in a data bag named "admins", enter:
 .INDENT 0.0
 .INDENT 3.5
@@ -516,7 +540,7 @@ uid:      1005
 .UNINDENT
 .UNINDENT
 .sp
-To show the contents of a data bag named "passwords" with an item that contains encrypted data named "mysql", enter:
+To show the contents of a data bag named \fBpasswords\fP with an item that contains encrypted data named \fBmysql\fP, enter:
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -565,9 +589,9 @@ to return:
 .ft C
 ## sample:
 {
-   "id": "mysql",
-   "pass": "thesecret123",
-   "user": "fred"
+  "id": "mysql",
+  "pass": "thesecret123",
+  "user": "fred"
 }
 .ft P
 .fi

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

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KNIFE-DELETE" "1" "Chef 11.14" "" "knife delete"
+.TH "KNIFE-DELETE" "1" "Chef 11.16" "" "knife delete"
 .SH NAME
 knife-delete \- The man page for the knife delete subcommand.
 .
@@ -74,7 +74,7 @@ The number of allowed concurrent connections. Default: \fB10\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.
+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.
@@ -89,7 +89,7 @@ The output format: \fBsummary\fP (default), \fBtext\fP, \fBjson\fP, \fByaml\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\&.
+The private key that knife will use to sign requests made by the API client to the Chef server\&.
 .TP
 .B \fB\-\-local\fP
 Use to delete only the local copy of an object. (A remote copy will not be deleted.) Default: \fBfalse\fP\&.
@@ -107,7 +107,7 @@ The layout of the local chef\-repo\&. Possible values: \fBstatic\fP, \fBeverythi
 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.
+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\&.
@@ -116,7 +116,7 @@ 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
-Use to respond to all confirmation prompts with "Yes". 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
 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\&.