chef 11.10.0.alpha.1-x86-mingw32 → 11.10.0.rc.0-x86-mingw32

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

@@ -44,14 +44,14 @@ $ knife node [ARGUMENT] (options)
 .fi
 .SH COMMON OPTIONS
 .sp
-The following options can be run with all Knife sub\-commands and plug\-ins:
+The following options may be used with any of the arguments available to the \fBknife node\fP subcommand:
 .INDENT 0.0
 .TP
-.B \fB\-c CONFIG\fP, \fB\-\-config CONFIG\fP
-The configuration file to use.
+.B \fB\-\-chef\-zero\-port PORT\fP
+The port on which chef\-zero will listen.
 .TP
-.B \fB\-\-color\fP
-Indicates that colored output will be used.
+.B \fB\-c CONFIG_FILE\fP, \fB\-\-config CONFIG_FILE\fP
+The configuration file to use.
 .TP
 .B \fB\-d\fP, \fB\-\-disable\-editing\fP
 Indicates that $EDITOR will not be opened; data will be accepted as\-is.
@@ -65,9 +65,6 @@ The $EDITOR that is used for all interactive commands.
 .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.
 .TP
-.B \fB\-f FILE_NAME\fP, \fB\-\-file FILE_NAME\fP
-Indicates that the private key will be saved to a specified file name.
-.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
@@ -77,11 +74,8 @@ Shows help for the command.
 .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 server.
 .TP
-.B \fB\-\-no\-color\fP
-Indicates that color will not be used in the output.
-.TP
-.B \fB\-p PASSWORD\fP, \fB\-\-password PASSWORD\fP
-The user password.
+.B \fB\-\-[no\-]color\fP
+Indicates whether colored output will be used.
 .TP
 .B \fB\-\-print\-after\fP
 Indicates that data will be shown after a destructive operation.
@@ -92,14 +86,17 @@ The URL for the server.
 .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 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\-v\fP, \fB\-\-version\fP
+The version of the chef\-client.
+.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).
+.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 server to also work against the local chef\-repo.
 .UNINDENT
 .SH BULK DELETE
 .sp
@@ -343,7 +340,7 @@ rs\-123456
 .fi
 .SH RUN_LIST ADD
 .sp
-The \fBrun_list add\fP argument is used to add run list items (roles or recipes) to a node. A recipe must be in one of the following formats: fully qualified, cookbook, or default. Both roles and recipes must be in quotes, for example: \fB\(aqrole[ROLE_NAME]\(aq\fP or \fB\(aqrecipe[COOKBOOK::RECIPE_NAME]\(aq\fP. Use a comma to separate roles and recipes when adding more than one, like this: \fB\(aqrecipe[COOKBOOK::RECIPE_NAME],COOKBOOK::RECIPE_NAME,role[ROLE_NAME]\(aq\fP.
+The \fBrun_list add\fP argument is used to add run list items (roles or recipes) to a node.
 .sp
 \fBSyntax\fP
 .sp
@@ -573,6 +570,6 @@ knife node show \-l \-\-format=json <node_name>
 .ft P
 .fi
 .SH AUTHOR
-Opscode
+Chef
 .\" Generated by docutils manpage writer.
 .

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

@@ -33,16 +33,29 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .sp
 The \fBknife raw\fP subcommand is used to send a REST request to a specified path using the Chef Server API.
 .sp
-\fBCommon Options\fP
+\fBSyntax\fP
+.sp
+This argument has the following syntax:
+.sp
+.nf
+.ft C
+$ knife raw REQUEST_PATH (options)
+.ft P
+.fi
 .sp
-The following options can be run with all Knife sub\-commands and plug\-ins:
+\fBOptions\fP
+.sp
+This subcommand has the following options:
 .INDENT 0.0
 .TP
-.B \fB\-c CONFIG\fP, \fB\-\-config CONFIG\fP
+.B \fB\-c CONFIG_FILE\fP, \fB\-\-config CONFIG_FILE\fP
 The configuration file to use.
 .TP
-.B \fB\-\-color\fP
-Indicates that colored output will be used.
+.B \fB\-\-chef\-zero\-port PORT\fP
+The port on which chef\-zero will listen.
+.TP
+.B \fB\-\-[no\-]color\fP
+Indicates whether colored output will be used.
 .TP
 .B \fB\-d\fP, \fB\-\-disable\-editing\fP
 Indicates that $EDITOR will not be opened; data will be accepted as\-is.
@@ -56,23 +69,23 @@ The $EDITOR that is used for all interactive commands.
 .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.
 .TP
-.B \fB\-f FILE_NAME\fP, \fB\-\-file FILE_NAME\fP
-Indicates that the private key will be saved to a specified file name.
-.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\-i FILE\fP, \fB\-\-input FILE\fP
+The name of a file to be used with the \fBPUT\fP or a \fBPOST\fP request.
+.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 server.
 .TP
-.B \fB\-\-no\-color\fP
-Indicates that color will not be used in the output.
+.B \fB\-m METHOD\fP, \fB\-\-method METHOD\fP
+The request method: \fBDELETE\fP, \fBGET\fP, \fBPOST\fP, or \fBPUT\fP. Default value: \fBGET\fP.
 .TP
-.B \fB\-p PASSWORD\fP, \fB\-\-password PASSWORD\fP
-The user password.
+.B \fB\-\-[no\-]pretty\fP
+Use \fB\-\-no\-pretty\fP to disable pretty\-print output for JSON. Default: \fB\-\-pretty\fP.
 .TP
 .B \fB\-\-print\-after\fP
 Indicates that data will be shown after a destructive operation.
@@ -91,40 +104,9 @@ 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).
-.UNINDENT
-.sp
-\fBSyntax\fP
-.sp
-This argument has the following syntax:
-.sp
-.nf
-.ft C
-$ knife raw REQUEST_PATH (options)
-.ft P
-.fi
-.sp
-\fBOptions\fP
-.sp
-This subcommand has the following options:
-.INDENT 0.0
-.TP
-.B \fB\-\-chef\-repo\-path PATH\fP
-The path to the chef\-repo. This setting will override the default path to the chef\-repo. Default: same as specified by \fBchef_repo_path\fP in config.rb.
-.TP
-.B \fB\-\-concurrency\fP
-The number of allowed concurrent connections. Default: \fB10\fP.
-.TP
-.B \fB\-i FILE\fP, \fB\-\-input FILE\fP
-The name of a file to be used with the \fBPUT\fP or a \fBPOST\fP request.
-.TP
-.B \fB\-\-[no\-]pretty\fP
-Use \fB\-\-no\-pretty\fP to disable pretty\-print output for JSON. Default: \fB\-\-pretty\fP.
-.TP
-.B \fB\-m METHOD\fP, \fB\-\-method METHOD\fP
-The request method: \fBDELETE\fP, \fBGET\fP, \fBPOST\fP, or \fBPUT\fP. Default value: \fBGET\fP.
 .TP
-.B \fB\-\-repo\-mode MODE\fP
-The layout of the local chef\-repo. Possible values: \fBstatic\fP, \fBeverything\fP, or \fBhosted_everything\fP. Use \fBstatic\fP for just roles, environments, cookbooks, and data bags. By default, \fBeverything\fP and \fBhosted_everything\fP are dynamically selected depending on the server type. Default: \fBeverything\fP / \fBhosted_everything\fP.
+.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 server to also work against the local chef\-repo.
 .UNINDENT
 .sp
 \fBExamples\fP
@@ -165,6 +147,6 @@ to return something similar to:
 .ft P
 .fi
 .SH AUTHOR
-Opscode
+Chef
 .\" Generated by docutils manpage writer.
 .

data/distro/common/man/man1/knife-recipe-list.1

@@ -33,66 +33,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .sp
 The \fBknife recipe list\fP subcommand is used to view all of the recipes that are on a server. A regular expression can be used to limit the results to recipes that match a specific pattern. The regular expression must be within quotes and not be surrounded by forward slashes (/).
 .sp
-\fBCommon Options\fP
-.sp
-The following options can be run with all Knife sub\-commands and plug\-ins:
-.INDENT 0.0
-.TP
-.B \fB\-c CONFIG\fP, \fB\-\-config CONFIG\fP
-The configuration file to use.
-.TP
-.B \fB\-\-color\fP
-Indicates that colored output will be used.
-.TP
-.B \fB\-d\fP, \fB\-\-disable\-editing\fP
-Indicates that $EDITOR will not be opened; data will be accepted as\-is.
-.TP
-.B \fB\-\-defaults\fP
-Indicates that Knife will 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.
-.TP
-.B \fB\-f FILE_NAME\fP, \fB\-\-file FILE_NAME\fP
-Indicates that the private key will be saved to a specified file name.
-.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 server.
-.TP
-.B \fB\-\-no\-color\fP
-Indicates that color will not be used in the output.
-.TP
-.B \fB\-p PASSWORD\fP, \fB\-\-password PASSWORD\fP
-The user password.
-.TP
-.B \fB\-\-print\-after\fP
-Indicates that data will be shown after a destructive operation.
-.TP
-.B \fB\-s URL\fP, \fB\-\-server\-url URL\fP
-The URL for the 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 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
-Indicates that the response to all confirmation prompts will be "Yes" (and that Knife will not ask for confirmation).
-.UNINDENT
-.sp
 \fBSyntax\fP
 .sp
 This argument has the following syntax:
@@ -128,6 +68,6 @@ couchdb::org_cleanu
 .ft P
 .fi
 .SH AUTHOR
-Opscode
+Chef
 .\" Generated by docutils manpage writer.
 .

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

@@ -42,19 +42,16 @@ This subcommand has the following syntax:
 $ knife role [ARGUMENT] (options)
 .ft P
 .fi
-.IP Note
-Use the \fBknife node\fP subcommand (and the \fBrun_list add node\fP argument) to add a role to a node on the server.
-.RE
 .SH COMMON OPTIONS
 .sp
-The following options can be run with all Knife sub\-commands and plug\-ins:
+The following options may be used with any of the arguments available to the \fBknife role\fP subcommand:
 .INDENT 0.0
 .TP
-.B \fB\-c CONFIG\fP, \fB\-\-config CONFIG\fP
-The configuration file to use.
+.B \fB\-\-chef\-zero\-port PORT\fP
+The port on which chef\-zero will listen.
 .TP
-.B \fB\-\-color\fP
-Indicates that colored output will be used.
+.B \fB\-c CONFIG_FILE\fP, \fB\-\-config CONFIG_FILE\fP
+The configuration file to use.
 .TP
 .B \fB\-d\fP, \fB\-\-disable\-editing\fP
 Indicates that $EDITOR will not be opened; data will be accepted as\-is.
@@ -68,9 +65,6 @@ The $EDITOR that is used for all interactive commands.
 .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.
 .TP
-.B \fB\-f FILE_NAME\fP, \fB\-\-file FILE_NAME\fP
-Indicates that the private key will be saved to a specified file name.
-.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
@@ -80,11 +74,8 @@ Shows help for the command.
 .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 server.
 .TP
-.B \fB\-\-no\-color\fP
-Indicates that color will not be used in the output.
-.TP
-.B \fB\-p PASSWORD\fP, \fB\-\-password PASSWORD\fP
-The user password.
+.B \fB\-\-[no\-]color\fP
+Indicates whether colored output will be used.
 .TP
 .B \fB\-\-print\-after\fP
 Indicates that data will be shown after a destructive operation.
@@ -95,14 +86,17 @@ The URL for the server.
 .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 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\-v\fP, \fB\-\-version\fP
+The version of the chef\-client.
+.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).
+.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 server to also work against the local chef\-repo.
 .UNINDENT
 .SH BULK DELETE
 .sp
@@ -133,7 +127,7 @@ $ knife role bulk delete "^[0\-9]{3}$"
 .fi
 .SH CREATE
 .sp
-The \fBcreate\fP argument is used to add a role to the server. To add a role to a node, you must use the \fBnode\fP sub\-command and the \fBrun\-list add\fP argument. Role data is saved as JSON on the server.
+The \fBcreate\fP argument is used to add a role to the server. Role data is saved as JSON on the server.
 .sp
 \fBSyntax\fP
 .sp
@@ -174,8 +168,8 @@ In the $EDITOR enter the role data in JSON:
    "default_attributes": {
    },
    "json_class": "Chef::Role",
-   "run_list": [
-
+   "run_list": [\(aqrecipe[cookbook_name::recipe_name],
+                 role[role_name]\(aq
    ],
    "description": "",
    "chef_type": "role",
@@ -253,8 +247,8 @@ Update the role data in JSON:
    "default_attributes": {
    },
    "json_class": "Chef::Role",
-   "run_list": [
-
+   "run_list": [\(aqrecipe[cookbook_name::recipe_name],
+                 role[role_name]\(aq
    ],
    "description": "This is the description for the role1 role.",
    "chef_type": "role",
@@ -369,6 +363,6 @@ $ knife role show devops \-F json
 .sp
 Other formats available include \fBtext\fP, \fByaml\fP, and \fBpp\fP.
 .SH AUTHOR
-Opscode
+Chef
 .\" Generated by docutils manpage writer.
 .

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

@@ -31,70 +31,10 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" Man page generated from reStructuredText.
 .
 .sp
-Search indexes allow queries to be made for any type of data that is indexed by the server, including data bags (and data bag items), environments, nodes, and roles. A defined query syntax is used to support search patterns like exact, wildcard, range, and fuzzy. A search is a full\-text query that can be done from several locations, including from within a recipe, by using the \fBsearch\fP subcommand in Knife, by using the search functionality in the Management Console, or by using the \fB/search\fP or \fB/search/INDEX\fP endpoints in the Chef Server API. The search engine is based on Apache Solr and is run from the server.
+Search indexes allow queries to be made for any type of data that is indexed by the server, including data bags (and data bag items), environments, nodes, and roles. A defined query syntax is used to support search patterns like exact, wildcard, range, and fuzzy. A search is a full\-text query that can be done from several locations, including from within a recipe, by using the \fBsearch\fP subcommand in Knife, by using the search functionality in the Chef Manager, or by using the \fB/search\fP or \fB/search/INDEX\fP endpoints in the Chef Server API. The search engine is based on Apache Solr and is run from the server.
 .sp
 The \fBknife search\fP subcommand is used run a search query for information that is indexed on a server.
 .sp
-\fBCommon Options\fP
-.sp
-The following options can be run with all Knife sub\-commands and plug\-ins:
-.INDENT 0.0
-.TP
-.B \fB\-c CONFIG\fP, \fB\-\-config CONFIG\fP
-The configuration file to use.
-.TP
-.B \fB\-\-color\fP
-Indicates that colored output will be used.
-.TP
-.B \fB\-d\fP, \fB\-\-disable\-editing\fP
-Indicates that $EDITOR will not be opened; data will be accepted as\-is.
-.TP
-.B \fB\-\-defaults\fP
-Indicates that Knife will 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.
-.TP
-.B \fB\-f FILE_NAME\fP, \fB\-\-file FILE_NAME\fP
-Indicates that the private key will be saved to a specified file name.
-.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 server.
-.TP
-.B \fB\-\-no\-color\fP
-Indicates that color will not be used in the output.
-.TP
-.B \fB\-p PASSWORD\fP, \fB\-\-password PASSWORD\fP
-The user password.
-.TP
-.B \fB\-\-print\-after\fP
-Indicates that data will be shown after a destructive operation.
-.TP
-.B \fB\-s URL\fP, \fB\-\-server\-url URL\fP
-The URL for the 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 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
-Indicates that the response to all confirmation prompts will be "Yes" (and that Knife will not ask for confirmation).
-.UNINDENT
-.sp
 \fBSyntax\fP
 .sp
 This argument has the following syntax:
@@ -167,12 +107,42 @@ The attribute (or attributes) to show.
 .B \fB\-b ROW\fP, \fB\-\-start ROW\fP
 The row at which return results will begin.
 .TP
+.B \fB\-c CONFIG_FILE\fP, \fB\-\-config CONFIG_FILE\fP
+The configuration file to use.
+.TP
+.B \fB\-\-chef\-zero\-port PORT\fP
+The port on which chef\-zero will listen.
+.TP
+.B \fB\-\-[no\-]color\fP
+Indicates whether colored output will be used.
+.TP
+.B \fB\-d\fP, \fB\-\-disable\-editing\fP
+Indicates that $EDITOR will not be opened; data will be accepted as\-is.
+.TP
+.B \fB\-\-defaults\fP
+Indicates that Knife will 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.
+.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\-i\fP, \fB\-\-id\-only\fP
 Indicates that only matching object IDs will be shown.
 .TP
 .B \fBINDEX\fP
 The name of the index to be queried: \fBclient\fP, \fBenvironment\fP, \fBnode\fP, \fBrole\fP, or \fBDATA_BAG_NAME\fP. Default index: \fBnode\fP.
 .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 server.
+.TP
 .B \fB\-l\fP, \fB\-\-long\fP
 Display long output when searching nodes while using the default summary format.
 .TP
@@ -182,6 +152,9 @@ Display more, but not all, of a node\(aqs data when searching using the default
 .B \fB\-o SORT\fP, \fB\-\-sort SORT\fP
 The order in which search results will be sorted.
 .TP
+.B \fB\-\-print\-after\fP
+Indicates that data will be shown after a destructive operation.
+.TP
 .B \fB\-q SEARCH_QUERY\fP, \fB\-\-query SEARCH_QUERY\fP
 Use to protect search queries that start with a hyphen (\-). A \fB\-q\fP query may be specified as an argument or an option, but not both.
 .TP
@@ -191,8 +164,26 @@ Indicates that only the run\-list will be shown.
 .B \fB\-R INT\fP, \fB\-\-rows INT\fP
 The number of rows to be returned.
 .TP
+.B \fB\-s URL\fP, \fB\-\-server\-url URL\fP
+The URL for the server.
+.TP
 .B \fBSEARCH_QUERY\fP
 The search query used to identify a a list of items on a server. This option uses the same syntax as the \fBsearch\fP sub\-command.
+.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 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
+Indicates that the response to all confirmation prompts will be "Yes" (and that 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 server to also work against the local chef\-repo.
 .UNINDENT
 .sp
 \fBExamples\fP
@@ -299,6 +290,6 @@ $ knife search node "role:web AND NOT name:web03"
 .sp
 where the query in the previous example will search all servers that have the \fBweb\fP role, but not on the server named \fBweb03\fP.
 .SH AUTHOR
-Opscode
+Chef
 .\" Generated by docutils manpage writer.
 .