summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNuo Yan <nuo@opscode.com>2011-04-29 12:25:31 -0700
committerNuo Yan <nuo@opscode.com>2011-04-29 12:25:31 -0700
commit3e85a7abac0201b62c3af4920927b2e52c030b98 (patch)
treee31e713df349cce737557981ec8d6455b514a9e4
parent01bf9130905a646df4375049f2e9c7e3b9d8e3aa (diff)
downloadchef-3e85a7abac0201b62c3af4920927b2e52c030b98.tar.gz
Update chef-expander-cluster man pages to chef-expander
-rw-r--r--chef/distro/common/html/chef-expander.8.html (renamed from chef/distro/common/html/chef-expander-cluster.8.html)20
-rw-r--r--chef/distro/common/man/man8/chef-expander.8 (renamed from chef/distro/common/man/man8/chef-expander-cluster.8)10
-rw-r--r--chef/distro/common/markdown/man8/chef-expander.mkd (renamed from chef/distro/common/markdown/man8/chef-expander-cluster.mkd)8
3 files changed, 19 insertions, 19 deletions
diff --git a/chef/distro/common/html/chef-expander-cluster.8.html b/chef/distro/common/html/chef-expander.8.html
index 3cc0d2da66..867aa1f1b3 100644
--- a/chef/distro/common/html/chef-expander-cluster.8.html
+++ b/chef/distro/common/html/chef-expander.8.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv='content-type' value='text/html;charset=utf8'>
<meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
- <title>chef-expander-cluster(8) - fetches messages from RabbitMQ, processes, and loads into chef-solr</title>
+ <title>chef-expander(8) - fetches messages from RabbitMQ, processes, and loads into chef-solr</title>
<style type='text/css' media='all'>
/* style: man */
body#manpage {margin:0}
@@ -67,19 +67,19 @@
</div>
<ol class='man-decor man-head man head'>
- <li class='tl'>chef-expander-cluster(8)</li>
+ <li class='tl'>chef-expander(8)</li>
<li class='tc'>Chef Manual</li>
- <li class='tr'>chef-expander-cluster(8)</li>
+ <li class='tr'>chef-expander(8)</li>
</ol>
<h2 id="NAME">NAME</h2>
<p class="man-name">
- <code>chef-expander-cluster</code> - <span class="man-whatis">fetches messages from RabbitMQ, processes, and loads into chef-solr</span>
+ <code>chef-expander</code> - <span class="man-whatis">fetches messages from RabbitMQ, processes, and loads into chef-solr</span>
</p>
<h2 id="SYNOPSIS">SYNOPSIS</h2>
-<p><strong>chef-expander-cluster</strong> <em>(options)</em></p>
+<p><strong>chef-expander</strong> <em>(options)</em></p>
<dl>
<dt><code>-c</code>, <code>--config CONFIG_FILE</code></dt><dd>a configuration file to use</dd>
@@ -103,13 +103,13 @@ correct format to be loaded into Solr and loads them into Solr.</p>
<p>Chef Expander is designed for clustered operation, though small
installations will only need one worker process. To run Chef
-Expander with one worker process, run chef-expander-cluster -n 1.
+Expander with one worker process, run chef-expander -n 1.
You will then have a master and worker process, which looks like
this in ps:</p>
<pre><code>your-shell&gt; ps aux|grep expander
you 52110 0.1 0.7 2515476 62748 s003 S+ 3:49PM 0:00.80 chef-expander worker #1 (vnodes 0-1023)
-you 52108 0.1 0.5 2492880 41696 s003 S+ 3:49PM 0:00.91 ruby bin/chef-expander-cluster -n 1
+you 52108 0.1 0.5 2492880 41696 s003 S+ 3:49PM 0:00.91 ruby bin/chef-expander -n 1
</code></pre>
<p>Workers are single threaded and therefore cannot use more than 100%
@@ -143,9 +143,9 @@ wiki, http://wiki.opscode.com/display/chef/Home.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p>Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#x6c;&#x74;&#111;&#58;&#97;&#x64;&#97;&#109;&#64;&#111;&#x73;&#x70;&#99;&#111;&#x64;&#x65;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#97;&#x64;&#97;&#x6d;&#x40;&#111;&#115;&#112;&#99;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#x6c;&#116;&#x6f;&#x3a;&#97;&#100;&#97;&#109;&#x40;&#111;&#115;&#112;&#x63;&#111;&#x64;&#101;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#97;&#100;&#97;&#109;&#64;&#111;&#x73;&#112;&#99;&#x6f;&#100;&#x65;&#46;&#x63;&#x6f;&#109;</a> of Opscode
(http://www.opscode.com), with contributions from the community. This
-manual page was created by Nuo Yan <a href="&#x6d;&#97;&#105;&#108;&#116;&#x6f;&#x3a;&#110;&#x75;&#111;&#64;&#x6f;&#x70;&#115;&#x63;&#x6f;&#100;&#x65;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#110;&#117;&#x6f;&#x40;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#46;&#x63;&#x6f;&#x6d;</a>. Permission is
+manual page was created by Nuo Yan <a href="&#109;&#x61;&#105;&#x6c;&#116;&#111;&#58;&#x6e;&#117;&#x6f;&#x40;&#x6f;&#x70;&#115;&#x63;&#111;&#100;&#x65;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x6e;&#x75;&#111;&#64;&#x6f;&#112;&#x73;&#99;&#111;&#x64;&#x65;&#46;&#x63;&#x6f;&#x6d;</a>. Permission is
granted to copy, distribute and / or modify this document under the
terms of the Apache 2.0 License.</p>
@@ -156,7 +156,7 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
<ol class='man-decor man-foot man foot'>
<li class='tl'>Chef 0.10.0.rc.1</li>
<li class='tc'>April 2011</li>
- <li class='tr'>chef-expander-cluster(8)</li>
+ <li class='tr'>chef-expander(8)</li>
</ol>
</div>
diff --git a/chef/distro/common/man/man8/chef-expander-cluster.8 b/chef/distro/common/man/man8/chef-expander.8
index a8fa0c4041..7c697c0a62 100644
--- a/chef/distro/common/man/man8/chef-expander-cluster.8
+++ b/chef/distro/common/man/man8/chef-expander.8
@@ -1,13 +1,13 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "CHEF\-EXPANDER\-CLUSTER" "8" "April 2011" "Chef 0.10.0.rc.1" "Chef Manual"
+.TH "CHEF\-EXPANDER" "8" "April 2011" "Chef 0.10.0.rc.1" "Chef Manual"
.
.SH "NAME"
-\fBchef\-expander\-cluster\fR \- fetches messages from RabbitMQ, processes, and loads into chef\-solr
+\fBchef\-expander\fR \- fetches messages from RabbitMQ, processes, and loads into chef\-solr
.
.SH "SYNOPSIS"
-\fBchef\-expander\-cluster\fR \fI(options)\fR
+\fBchef\-expander\fR \fI(options)\fR
.
.TP
\fB\-c\fR, \fB\-\-config CONFIG_FILE\fR
@@ -52,7 +52,7 @@ Chef Expander fetches messages from RabbitMQ, processes them into the correct fo
\fBRunning Chef Expander\fR
.
.P
-Chef Expander is designed for clustered operation, though small installations will only need one worker process\. To run Chef Expander with one worker process, run chef\-expander\-cluster \-n 1\. You will then have a master and worker process, which looks like this in ps:
+Chef Expander is designed for clustered operation, though small installations will only need one worker process\. To run Chef Expander with one worker process, run chef\-expander \-n 1\. You will then have a master and worker process, which looks like this in ps:
.
.IP "" 4
.
@@ -60,7 +60,7 @@ Chef Expander is designed for clustered operation, though small installations wi
your\-shell> ps aux|grep expander
you 52110 0\.1 0\.7 2515476 62748 s003 S+ 3:49PM 0:00\.80 chef\-expander worker #1 (vnodes 0\-1023)
-you 52108 0\.1 0\.5 2492880 41696 s003 S+ 3:49PM 0:00\.91 ruby bin/chef\-expander\-cluster \-n 1
+you 52108 0\.1 0\.5 2492880 41696 s003 S+ 3:49PM 0:00\.91 ruby bin/chef\-expander \-n 1
.
.fi
.
diff --git a/chef/distro/common/markdown/man8/chef-expander-cluster.mkd b/chef/distro/common/markdown/man8/chef-expander.mkd
index 9a3e932c8b..d72ee1df9f 100644
--- a/chef/distro/common/markdown/man8/chef-expander-cluster.mkd
+++ b/chef/distro/common/markdown/man8/chef-expander.mkd
@@ -1,9 +1,9 @@
-chef-expander-cluster(8) -- fetches messages from RabbitMQ, processes, and loads into chef-solr
+chef-expander(8) -- fetches messages from RabbitMQ, processes, and loads into chef-solr
========================================
## SYNOPSIS
-__chef-expander-cluster__ _(options)_
+__chef-expander__ _(options)_
* `-c`, `--config CONFIG_FILE`:
a configuration file to use
@@ -33,13 +33,13 @@ __Running Chef Expander__
Chef Expander is designed for clustered operation, though small
installations will only need one worker process. To run Chef
-Expander with one worker process, run chef-expander-cluster -n 1.
+Expander with one worker process, run chef-expander -n 1.
You will then have a master and worker process, which looks like
this in ps:
your-shell> ps aux|grep expander
you 52110 0.1 0.7 2515476 62748 s003 S+ 3:49PM 0:00.80 chef-expander worker #1 (vnodes 0-1023)
- you 52108 0.1 0.5 2492880 41696 s003 S+ 3:49PM 0:00.91 ruby bin/chef-expander-cluster -n 1
+ you 52108 0.1 0.5 2492880 41696 s003 S+ 3:49PM 0:00.91 ruby bin/chef-expander -n 1
Workers are single threaded and therefore cannot use more than 100%
of a single CPU. If you find that your queues are getting backlogged,