You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2017/05/31 17:28:04 UTC
[1/2] lucene-solr:master: Ref Guide: remove lingering references to
"example Jetty" and "your container"
Repository: lucene-solr
Updated Branches:
refs/heads/master 7a5261a22 -> d148bd4e9
Ref Guide: remove lingering references to "example Jetty" and "your container"
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d148bd4e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d148bd4e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d148bd4e
Branch: refs/heads/master
Commit: d148bd4e9ea7bf3d117cc46b6576f824b79c39d9
Parents: 52c27b4
Author: Cassandra Targett <ct...@apache.org>
Authored: Wed May 31 12:27:28 2017 -0500
Committer: Cassandra Targett <ct...@apache.org>
Committed: Wed May 31 12:27:52 2017 -0500
----------------------------------------------------------------------
solr/solr-ref-guide/src/coreadmin-api.adoc | 2 +-
solr/solr-ref-guide/src/enabling-ssl.adoc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d148bd4e/solr/solr-ref-guide/src/coreadmin-api.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/coreadmin-api.adoc b/solr/solr-ref-guide/src/coreadmin-api.adoc
index 3624c52..a2e3aa3 100644
--- a/solr/solr-ref-guide/src/coreadmin-api.adoc
+++ b/solr/solr-ref-guide/src/coreadmin-api.adoc
@@ -119,7 +119,7 @@ The RELOAD action loads a new core from the configuration of an existing, regist
`admin/cores?action=RELOAD&core=_core-name_`
-This is useful when you've made changes to a Solr core's configuration on disk, such as adding new field definitions. Calling the RELOAD action lets you apply the new configuration without having to restart the Web container.
+This is useful when you've made changes to a Solr core's configuration on disk, such as adding new field definitions. Calling the RELOAD action lets you apply the new configuration without having to restart Solr.
[IMPORTANT]
====
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d148bd4e/solr/solr-ref-guide/src/enabling-ssl.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/enabling-ssl.adoc b/solr/solr-ref-guide/src/enabling-ssl.adoc
index 87394ee..ec6b59d 100644
--- a/solr/solr-ref-guide/src/enabling-ssl.adoc
+++ b/solr/solr-ref-guide/src/enabling-ssl.adoc
@@ -20,7 +20,7 @@
Solr can encrypt communications to and from clients, and between nodes in SolrCloud mode, with SSL.
-This section describes enabling SSL with the example Jetty server using a self-signed certificate.
+This section describes enabling SSL using a self-signed certificate.
For background on SSL certificates and keys, see http://www.tldp.org/HOWTO/SSL-Certificates-HOWTO/.
[2/2] lucene-solr:master: Ref Guide: fix format issues and
inconsistencies
Posted by ct...@apache.org.
Ref Guide: fix format issues and inconsistencies
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/52c27b4e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/52c27b4e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/52c27b4e
Branch: refs/heads/master
Commit: 52c27b4ed309067086d01f5eb272b90982990953
Parents: 7a5261a
Author: Cassandra Targett <ct...@apache.org>
Authored: Wed May 31 12:27:00 2017 -0500
Committer: Cassandra Targett <ct...@apache.org>
Committed: Wed May 31 12:27:52 2017 -0500
----------------------------------------------------------------------
solr/solr-ref-guide/src/format-of-solr-xml.adoc | 24 ++++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/52c27b4e/solr/solr-ref-guide/src/format-of-solr-xml.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/format-of-solr-xml.adoc b/solr/solr-ref-guide/src/format-of-solr-xml.adoc
index 97d6f36..4e55033 100644
--- a/solr/solr-ref-guide/src/format-of-solr-xml.adoc
+++ b/solr/solr-ref-guide/src/format-of-solr-xml.adoc
@@ -25,7 +25,7 @@ This section will describe the default `solr.xml` file included with Solr and ho
[[Formatofsolr.xml-Definingsolr.xml]]
== Defining solr.xml
-You can find `solr.xml` in your Solr Home directory or in Zookeeper. The default `solr.xml` file looks like this:
+You can find `solr.xml` in your `$SOLR_HOME` directory (usually `server/solr`) in standalone mode or in Zookeeper when using SolrCloud. The default `solr.xml` file looks like this:
[source,xml]
----
@@ -66,17 +66,17 @@ There are no attributes that you can specify in the `<solr>` tag, which is the r
|`collectionsHandler` |As above, for custom CollectionsHandler implementations.
| `infoHandler` |As above, for custom InfoHandler implementations.
|`coreLoadThreads` |Specifies the number of threads that will be assigned to load cores in parallel.
-|`coreRootDirectory` |The root of the core discovery tree, defaults to SOLR_HOME.
+|`coreRootDirectory` |The root of the core discovery tree, defaults to `$SOLR_HOME`.
|`managementPath` |Currently non-operational.
-|`sharedLib` |Specifies the path to a common library directory that will be shared across all cores. Any JAR files in this directory will be added to the search path for Solr plugins. This path is relative to the top-level container's Solr Home. Custom handlers may be placed in this directory
+|`sharedLib` |Specifies the path to a common library directory that will be shared across all cores. Any JAR files in this directory will be added to the search path for Solr plugins. This path is relative to `$SOLR_HOME`. Custom handlers may be placed in this directory.
|`shareSchema` |This attribute, when set to true, ensures that the multiple cores pointing to the same Schema resource file will be referring to the same IndexSchema Object. Sharing the IndexSchema Object makes loading the core faster. If you use this feature, make sure that no core-specific property is used in your Schema file.
|`transientCacheSize` |Defines how many cores with transient=true that can be loaded before swapping the least recently used core for a new core.
-|`configSetBaseDir` |The directory under which configsets for solr cores can be found. Defaults to SOLR_HOME/configsets
+|`configSetBaseDir` |The directory under which configsets for Solr cores can be found. Defaults to `$SOLR_HOME/configsets`.
|===
-==== The `<solrcloud>` element
+==== The `<solrcloud>` Element
-This element defines several parameters that relate so SolrCloud. This section is ignored unless the solr instance is started with either `-DzkRun` or `-DzkHost`
+This element defines several parameters that relate so SolrCloud. This section is ignored unless theSolr instance is started with either `-DzkRun` or `-DzkHost`
// TODO: Change column width to %autowidth.spread when https://github.com/asciidoctor/asciidoctor-pdf/issues/599 is fixed
@@ -96,18 +96,18 @@ This element defines several parameters that relate so SolrCloud. This section i
|`zkCredentialsProvider` & ` zkACLProvider` |Optional parameters that can be specified if you are using <<zookeeper-access-control.adoc#zookeeper-access-control,ZooKeeper Access Control>>.
|===
-==== The `<logging>` element
+==== The `<logging>` Element
// TODO: Change column width to %autowidth.spread when https://github.com/asciidoctor/asciidoctor-pdf/issues/599 is fixed
[cols="30,70",options="header"]
|===
|Node |Description
-|`class` |The class to use for logging. The corresponding JAR file must be available to solr, perhaps through a `<lib>` directive in solrconfig.xml.
+|`class` |The class to use for logging. The corresponding JAR file must be available to Solr, perhaps through a `<lib>` directive in `solrconfig.xml`.
|`enabled` |true/false - whether to enable logging or not.
|===
-===== The `<logging><watcher>` element
+===== The `<logging><watcher>` Element
// TODO: Change column width to %autowidth.spread when https://github.com/asciidoctor/asciidoctor-pdf/issues/599 is fixed
@@ -118,7 +118,7 @@ This element defines several parameters that relate so SolrCloud. This section i
|`threshold` |The logging level above which your particular logging implementation will record. For example when using log4j one might specify DEBUG, WARN, INFO, etc.
|===
-==== The `<shardHandlerFactory>` element
+==== The `<shardHandlerFactory>` Element
Custom shard handlers can be defined in `solr.xml` if you wish to create a custom shard handler.
@@ -134,8 +134,8 @@ Since this is a custom shard handler, sub-elements are specific to the implement
[cols="30,70",options="header"]
|===
|Node |Description
-|`socketTimeout` |The read timeout for intra-cluster query and administrative requests. The default is the same as the distribUpdateSoTimeout specified in the solrcloud section.
-|`connTimeout` |The connection timeout for intra-cluster query and administrative requests. Defaults to the distribUpdateConnTimeout specified in the solrcloud section
+|`socketTimeout` |The read timeout for intra-cluster query and administrative requests. The default is the same as the `distribUpdateSoTimeout` specified in the `<solrcloud>` section.
+|`connTimeout` |The connection timeout for intra-cluster query and administrative requests. Defaults to the `distribUpdateConnTimeout` specified in the `<solrcloud>` section
|`urlScheme` |URL scheme to be used in distributed search
|`maxConnectionsPerHost` |Maximum connections allowed per host. Defaults to 20
|`maxConnections` |Maximum total connections allowed. Defaults to 10000