summaryrefslogtreecommitdiff
path: root/chef/distro/common/man
diff options
context:
space:
mode:
authorsersut <serdar@opscode.com>2013-08-13 09:53:10 +0300
committersersut <serdar@opscode.com>2013-08-13 09:53:10 +0300
commit3ffc33dbc4f8c1155fc540522c9c7fade223be52 (patch)
tree3823b793d063a302976655ce2f8a6b9ade02864e /chef/distro/common/man
parent70add0f90239ab45c76a7bf1cb02a9c2245d3122 (diff)
downloadchef-3ffc33dbc4f8c1155fc540522c9c7fade223be52.tar.gz
Bump version for 10.28.0 RC release.10.28.0.rc.0
Diffstat (limited to 'chef/distro/common/man')
-rw-r--r--chef/distro/common/man/man1/knife-bootstrap.12
-rw-r--r--chef/distro/common/man/man1/knife-client.12
-rw-r--r--chef/distro/common/man/man1/knife-configure.12
-rw-r--r--chef/distro/common/man/man1/knife-cookbook-site.12
-rw-r--r--chef/distro/common/man/man1/knife-cookbook.117
-rw-r--r--chef/distro/common/man/man1/knife-data-bag.117
-rw-r--r--chef/distro/common/man/man1/knife-environment.114
-rw-r--r--chef/distro/common/man/man1/knife-exec.12
-rw-r--r--chef/distro/common/man/man1/knife-index.12
-rw-r--r--chef/distro/common/man/man1/knife-node.12
-rw-r--r--chef/distro/common/man/man1/knife-role.12
-rw-r--r--chef/distro/common/man/man1/knife-search.12
-rw-r--r--chef/distro/common/man/man1/knife-ssh.12
-rw-r--r--chef/distro/common/man/man1/knife-status.12
-rw-r--r--chef/distro/common/man/man1/knife-tag.12
-rw-r--r--chef/distro/common/man/man1/knife.12
-rw-r--r--chef/distro/common/man/man1/shef.12
-rw-r--r--chef/distro/common/man/man8/chef-client.82
-rw-r--r--chef/distro/common/man/man8/chef-expander.82
-rw-r--r--chef/distro/common/man/man8/chef-expanderctl.82
-rw-r--r--chef/distro/common/man/man8/chef-server-webui.82
-rw-r--r--chef/distro/common/man/man8/chef-server.82
-rw-r--r--chef/distro/common/man/man8/chef-solo.840
-rw-r--r--chef/distro/common/man/man8/chef-solr.82
24 files changed, 30 insertions, 98 deletions
diff --git a/chef/distro/common/man/man1/knife-bootstrap.1 b/chef/distro/common/man/man1/knife-bootstrap.1
index 66e4440ac8..4aef1ff25c 100644
--- a/chef/distro/common/man/man1/knife-bootstrap.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE\-BOOTSTRAP" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\-bootstrap\fR \- Install Chef Client on a remote host
diff --git a/chef/distro/common/man/man1/knife-client.1 b/chef/distro/common/man/man1/knife-client.1
index 3082ae7a40..646cd9e8e4 100644
--- a/chef/distro/common/man/man1/knife-client.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE\-CLIENT" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\-client\fR \- Manage Chef API Clients
diff --git a/chef/distro/common/man/man1/knife-configure.1 b/chef/distro/common/man/man1/knife-configure.1
index bd59d26c16..abe3ee3f86 100644
--- a/chef/distro/common/man/man1/knife-configure.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE\-CONFIGURE" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\-configure\fR \- Generate configuration files for knife or Chef Client
diff --git a/chef/distro/common/man/man1/knife-cookbook-site.1 b/chef/distro/common/man/man1/knife-cookbook-site.1
index d72b517677..355bbbb399 100644
--- a/chef/distro/common/man/man1/knife-cookbook-site.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE\-COOKBOOK\-SITE" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\-cookbook\-site\fR \- Install and update open source cookbooks
diff --git a/chef/distro/common/man/man1/knife-cookbook.1 b/chef/distro/common/man/man1/knife-cookbook.1
index 32ae70ff18..dfa051a172 100644
--- a/chef/distro/common/man/man1/knife-cookbook.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE\-COOKBOOK" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\-cookbook\fR \- upload and manage chef cookbooks
@@ -105,20 +105,7 @@ 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:
-.
-.IP "" 4
-.
-.nf
-
-`knife cookbook upload COOKBOOK COOKBOOK \.\.\.`
-.
-.fi
-.
-.IP "" 0
-.
-.P
-works for one to many cookbooks\.
+As the command parses the name args as 1\.\.n cookbook names: \fBknife cookbook upload COOKBOOK COOKBOOK \.\.\.\fR works for one to many cookbooks\.
.
.SH "DOWNLOAD"
\fBknife cookbook download cookbook [version]\fR \fI(options)\fR
diff --git a/chef/distro/common/man/man1/knife-data-bag.1 b/chef/distro/common/man/man1/knife-data-bag.1
index 43ea5a03e1..febe0e4447 100644
--- a/chef/distro/common/man/man1/knife-data-bag.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE\-DATA\-BAG" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\-data\-bag\fR \- Store arbitrary data on a Chef Server
@@ -105,20 +105,7 @@ 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:
-.
-.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\.
+\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\.
.
.P
Chef Server does not provide a secure mechanism for distributing encryption keys\.
diff --git a/chef/distro/common/man/man1/knife-environment.1 b/chef/distro/common/man/man1/knife-environment.1
index e30e664a67..26ca80d16d 100644
--- a/chef/distro/common/man/man1/knife-environment.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE\-ENVIRONMENT" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\-environment\fR \- Define cookbook policies for the environments in your infrastructure
@@ -41,17 +41,7 @@ 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:
-.
-.IP "" 4
-.
-.nf
-
-Show the resource URI for each environment
-.
-.fi
-.
-.IP "" 0
+\fBknife environment list\fR \fI(options)\fR * \fB\-w\fR, \fB\-\-with\-uri\fR: Show the resource URI for each environment
.
.SH "SHOW"
\fBknife environment show\fR \fIenvironment\fR \fI(options)\fR
diff --git a/chef/distro/common/man/man1/knife-exec.1 b/chef/distro/common/man/man1/knife-exec.1
index d4b69184d0..08f9c97fec 100644
--- a/chef/distro/common/man/man1/knife-exec.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE\-EXEC" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\-exec\fR \- Run user scripts using the Chef API DSL
diff --git a/chef/distro/common/man/man1/knife-index.1 b/chef/distro/common/man/man1/knife-index.1
index cdc55f3749..20b202391b 100644
--- a/chef/distro/common/man/man1/knife-index.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE\-INDEX" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\-index\fR \- Rebuild the search index on a Chef Server
diff --git a/chef/distro/common/man/man1/knife-node.1 b/chef/distro/common/man/man1/knife-node.1
index 14f1e956e3..f744905299 100644
--- a/chef/distro/common/man/man1/knife-node.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE\-NODE" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\-node\fR \- Manage the hosts in your infrastructure
diff --git a/chef/distro/common/man/man1/knife-role.1 b/chef/distro/common/man/man1/knife-role.1
index 0ba235017c..d36b0f308a 100644
--- a/chef/distro/common/man/man1/knife-role.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE\-ROLE" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\-role\fR \- Group common configuration settings
diff --git a/chef/distro/common/man/man1/knife-search.1 b/chef/distro/common/man/man1/knife-search.1
index f81151ee5b..c6fd8fe455 100644
--- a/chef/distro/common/man/man1/knife-search.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE\-SEARCH" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\-search\fR \- Find objects on a Chef Server by query
diff --git a/chef/distro/common/man/man1/knife-ssh.1 b/chef/distro/common/man/man1/knife-ssh.1
index 4b901d03a4..84b4bd4f22 100644
--- a/chef/distro/common/man/man1/knife-ssh.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE\-SSH" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\-ssh\fR \- Run a command or interactive session on multiple remote hosts
diff --git a/chef/distro/common/man/man1/knife-status.1 b/chef/distro/common/man/man1/knife-status.1
index 869b097cb5..9d476e6229 100644
--- a/chef/distro/common/man/man1/knife-status.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE\-STATUS" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\-status\fR \- Display status information for the nodes in your infrastructure
diff --git a/chef/distro/common/man/man1/knife-tag.1 b/chef/distro/common/man/man1/knife-tag.1
index 45205bff20..719a45a415 100644
--- a/chef/distro/common/man/man1/knife-tag.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE\-TAG" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\-tag\fR \- Apply tags to nodes on a Chef Server
diff --git a/chef/distro/common/man/man1/knife.1 b/chef/distro/common/man/man1/knife.1
index 13359e1de8..3d51c0ebe8 100644
--- a/chef/distro/common/man/man1/knife.1
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "KNIFE" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBknife\fR \- Chef Server API client utility
diff --git a/chef/distro/common/man/man1/shef.1 b/chef/distro/common/man/man1/shef.1
index eff1d90cf5..671e0adc65 100644
--- a/chef/distro/common/man/man1/shef.1
+++ b/chef/distro/common/man/man1/shef.1
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "SHEF" "1" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "SHEF" "1" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBshef\fR \- Interactive Chef Console
diff --git a/chef/distro/common/man/man8/chef-client.8 b/chef/distro/common/man/man8/chef-client.8
index 2141728d49..41eaecb298 100644
--- a/chef/distro/common/man/man8/chef-client.8
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "CHEF\-CLIENT" "8" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBchef\-client\fR \- Runs a client node connecting to a chef\-server\.
diff --git a/chef/distro/common/man/man8/chef-expander.8 b/chef/distro/common/man/man8/chef-expander.8
index 5629a9bb28..c20a83efd6 100644
--- a/chef/distro/common/man/man8/chef-expander.8
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "CHEF\-EXPANDER" "8" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBchef\-expander\fR \- fetches messages from RabbitMQ, processes, and loads into chef\-solr
diff --git a/chef/distro/common/man/man8/chef-expanderctl.8 b/chef/distro/common/man/man8/chef-expanderctl.8
index eb46336cde..fecd7e05d1 100644
--- a/chef/distro/common/man/man8/chef-expanderctl.8
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "CHEF\-EXPANDERCTL" "8" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBchef\-expanderctl\fR \- management program for chef\-expander
diff --git a/chef/distro/common/man/man8/chef-server-webui.8 b/chef/distro/common/man/man8/chef-server-webui.8
index 0ca181e2c0..f3c0d3d0f9 100644
--- a/chef/distro/common/man/man8/chef-server-webui.8
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "CHEF\-SERVER\-WEBUI" "8" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBchef\-server\-webui\fR \- Start the Chef Server merb application slice providing Web User Interface (Management Console)\.
diff --git a/chef/distro/common/man/man8/chef-server.8 b/chef/distro/common/man/man8/chef-server.8
index 01301c7c31..4e2c450c8e 100644
--- a/chef/distro/common/man/man8/chef-server.8
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "CHEF\-SERVER" "8" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBchef\-server\fR \- Start the Chef Server merb application slice\.
diff --git a/chef/distro/common/man/man8/chef-solo.8 b/chef/distro/common/man/man8/chef-solo.8
index b5c406fd60..b0611802f4 100644
--- a/chef/distro/common/man/man8/chef-solo.8
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "CHEF\-SOLO" "8" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBchef\-solo\fR \- Runs chef in solo mode against a specified cookbook location\.
@@ -68,18 +68,7 @@ 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:
-.
-.IP "" 4
-.
-.nf
-
-file_cache_path "/var/chef\-solo"
-cookbook_path "/var/chef\-solo/cookbooks"
-.
-.fi
-.
-.IP "" 0
+For example: file_cache_path "/var/chef\-solo" cookbook_path "/var/chef\-solo/cookbooks"
.
.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\.
@@ -88,18 +77,7 @@ 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:
-.
-.IP "" 4
-.
-.nf
-
-file_cache_path "/var/chef\-solo"
-cookbook_path ["/var/chef\-solo/cookbooks", "/var/chef\-solo/site\-cookbooks"]
-.
-.fi
-.
-.IP "" 0
+For example: file_cache_path "/var/chef\-solo" cookbook_path ["/var/chef\-solo/cookbooks", "/var/chef\-solo/site\-cookbooks"]
.
.P
Note that earlier entries are now overridden by later ones\.
@@ -133,17 +111,7 @@ 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:
-.
-.IP "" 4
-.
-.nf
-
-chef\-solo \-c ~/solo\.rb \-j ~/node\.json \-r http://www\.example\.com/chef\-solo\.tar\.gz
-.
-.fi
-.
-.IP "" 0
+For example: chef\-solo \-c ~/solo\.rb \-j ~/node\.json \-r http://www\.example\.com/chef\-solo\.tar\.gz
.
.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\.
diff --git a/chef/distro/common/man/man8/chef-solr.8 b/chef/distro/common/man/man8/chef-solr.8
index 5913a66422..22a71159ff 100644
--- a/chef/distro/common/man/man8/chef-solr.8
+++ b/chef/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" "May 2013" "Chef 10.26.0" "Chef Manual"
+.TH "CHEF\-SOLR" "8" "August 2013" "Chef 10.28.0.rc.0" "Chef Manual"
.
.SH "NAME"
\fBchef\-solr\fR \- Runs as Chef\'s search server