summaryrefslogtreecommitdiff
path: root/chef/distro/common
diff options
context:
space:
mode:
authorNuo Yan <nuo@opscode.com>2011-04-13 15:07:44 -0700
committerNuo Yan <nuo@opscode.com>2011-04-13 15:09:22 -0700
commitd56c2a2c543ec2308dcebac403d8064bb40b1bfe (patch)
tree8a24ba7343105e42f059d22e66523d7574974541 /chef/distro/common
parent3f33e091708852312dd0c3419e229f6daf35c28f (diff)
downloadchef-d56c2a2c543ec2308dcebac403d8064bb40b1bfe.tar.gz
chef-solr man page revision
Diffstat (limited to 'chef/distro/common')
-rw-r--r--chef/distro/common/html/chef-solr.8.html8
-rw-r--r--chef/distro/common/man/man8/chef-solr.84
-rw-r--r--chef/distro/common/markdown/man8/chef-solr.mkd5
3 files changed, 9 insertions, 8 deletions
diff --git a/chef/distro/common/html/chef-solr.8.html b/chef/distro/common/html/chef-solr.8.html
index c0b3a56a7e..813a73b2a1 100644
--- a/chef/distro/common/html/chef-solr.8.html
+++ b/chef/distro/common/html/chef-solr.8.html
@@ -101,7 +101,7 @@
<h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>Chef-solr provides search service for Chef. You need to have both
-chef-solr and chef-expander (the indexer) in order for search to work.</p>
+chef-solr and chef-expander-cluster running in order for search to work.</p>
<p><strong>Installation</strong></p>
@@ -135,16 +135,16 @@ You can restore your search index using `knife index rebuild`
<h2 id="SEE-ALSO">SEE ALSO</h2>
-<p><strong>chef-expander</strong>(8)</p>
+<p><strong>chef-expander-cluster</strong>(8)</p>
<p>Full documentation for Chef and chef-server is located on the Chef
wiki, http://wiki.opscode.com/display/chef/Home.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p>Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#x6f;&#58;&#x61;&#100;&#97;&#x6d;&#64;&#111;&#x73;&#112;&#99;&#x6f;&#x64;&#x65;&#46;&#x63;&#x6f;&#109;" data-bare-link="true">&#x61;&#x64;&#97;&#x6d;&#64;&#x6f;&#115;&#112;&#99;&#111;&#x64;&#101;&#x2e;&#99;&#x6f;&#109;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#x61;&#x64;&#97;&#109;&#x40;&#111;&#115;&#112;&#x63;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#x6d;&#x40;&#x6f;&#115;&#x70;&#x63;&#111;&#100;&#101;&#x2e;&#x63;&#111;&#109;</a> of Opscode
(http://www.opscode.com), with contributions from the community. This
-manual page was written by Joshua Timberman <a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#x3a;&#106;&#111;&#x73;&#x68;&#117;&#97;&#x40;&#x6f;&#x70;&#115;&#x63;&#111;&#x64;&#101;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#106;&#111;&#115;&#104;&#x75;&#97;&#64;&#x6f;&#112;&#x73;&#x63;&#111;&#x64;&#x65;&#46;&#99;&#x6f;&#x6d;</a> with
+manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#108;&#116;&#111;&#58;&#x6a;&#111;&#115;&#x68;&#117;&#97;&#64;&#x6f;&#112;&#x73;&#99;&#x6f;&#100;&#x65;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#106;&#x6f;&#x73;&#104;&#x75;&#x61;&#x40;&#x6f;&#112;&#x73;&#x63;&#111;&#x64;&#101;&#x2e;&#99;&#x6f;&#x6d;</a> with
help2man. Permission is granted to copy, distribute and / or modify
this document under the terms of the Apache 2.0 License.</p>
diff --git a/chef/distro/common/man/man8/chef-solr.8 b/chef/distro/common/man/man8/chef-solr.8
index 50bc6eda78..b2c23fb1f5 100644
--- a/chef/distro/common/man/man8/chef-solr.8
+++ b/chef/distro/common/man/man8/chef-solr.8
@@ -62,7 +62,7 @@ Show chef\-solr version
Show this message
.
.SH "DESCRIPTION"
-Chef\-solr provides search service for Chef\. You need to have both chef\-solr and chef\-expander (the indexer) in order for search to work\.
+Chef\-solr provides search service for Chef\. You need to have both chef\-solr and chef\-expander\-cluster running in order for search to work\.
.
.P
\fBInstallation\fR
@@ -102,7 +102,7 @@ You can restore your search index using `knife index rebuild`
.IP "" 0
.
.SH "SEE ALSO"
-\fBchef\-expander\fR(8)
+\fBchef\-expander\-cluster\fR(8)
.
.P
Full documentation for Chef and chef\-server is located on the Chef wiki, http://wiki\.opscode\.com/display/chef/Home\.
diff --git a/chef/distro/common/markdown/man8/chef-solr.mkd b/chef/distro/common/markdown/man8/chef-solr.mkd
index c0a754e3d7..3100080399 100644
--- a/chef/distro/common/markdown/man8/chef-solr.mkd
+++ b/chef/distro/common/markdown/man8/chef-solr.mkd
@@ -2,6 +2,7 @@ chef-solr(8) -- Runs as Chef's search server
========================================
## SYNOPSIS
+
__chef-solr__ _(options)_
* `-c`, `--config CONFIG`:
@@ -34,7 +35,7 @@ __chef-solr__ _(options)_
## DESCRIPTION
Chef-solr provides search service for Chef. You need to have both
-chef-solr and chef-expander (the indexer) in order for search to work.
+chef-solr and chef-expander-cluster running in order for search to work.
__Installation__
@@ -67,7 +68,7 @@ when prompted for confirmation. The process should look like this:
## SEE ALSO
-__chef-expander__(8)
+__chef-expander-cluster__(8)
Full documentation for Chef and chef-server is located on the Chef
wiki, http://wiki.opscode.com/display/chef/Home.