GEODE-2129: Docs - clarify need for unique distributed-system-id

Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/fdd61668
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fdd61668
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fdd61668

Branch: refs/heads/feature/GEODE-2156
Commit: fdd6166889af780435cbae0923655fdfdff5d628
Parents: 1477c74
Author: Dave Barnes <dbar...@pivotal.io>
Authored: Thu Dec 1 15:28:13 2016 -0800
Committer: Dave Barnes <dbar...@pivotal.io>
Committed: Thu Dec 1 15:29:38 2016 -0800

----------------------------------------------------------------------
 geode-docs/configuring/chapter_overview.html.md.erb          | 5 +++--
 .../configuring/cluster_config/export-import.html.md.erb     | 2 +-
 .../cluster_config/gfsh_config_troubleshooting.html.md.erb   | 2 +-
 .../running/deploy_config_files_intro.html.md.erb            | 6 ++++--
 geode-docs/reference/topics/gemfire_properties.html.md.erb   | 8 +++++++-
 5 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdd61668/geode-docs/configuring/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/chapter_overview.html.md.erb 
b/geode-docs/configuring/chapter_overview.html.md.erb
index 295444c..f4a48e8 100644
--- a/geode-docs/configuring/chapter_overview.html.md.erb
+++ b/geode-docs/configuring/chapter_overview.html.md.erb
@@ -19,9 +19,10 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 -->
 
-You use the `gfsh` command-line utility to configure your Apache Geode cluster 
(also called a "distributed system"). The cluster configuration service 
persists the cluster configurations and distributes the configurations to 
members of the cluster. There are also several additional ways to configure a 
cluster.
+Use the `gfsh` command-line utility to configure your Apache Geode cluster 
(also called a "distributed system"). The cluster configuration service 
persists the cluster configurations and distributes the configurations to 
members of the cluster. There are also several additional ways to configure a 
cluster.
 
-You use `gfsh` to configure regions, disk stores, members, and other Geode 
objects. You also use `gfsh` to start and stop locators, servers, and Geode 
monitoring tools. As you execute these commands, the cluster configuration 
service persists the configuration. When new members join the cluster, the 
service distributes the configuration to the new members.
+Use `gfsh` to configure regions, disk stores, members, and other Geode 
objects. 
+You can also use `gfsh` to start and stop locators, servers, and Geode 
monitoring tools. As you execute these commands, the cluster configuration 
service persists the configuration. When new members join the cluster, the 
service distributes the configuration to the new members.
 
 `gfsh` is the recommended means of configuring and managing your Apache Geode 
cluster, however you can still configure many aspects of a cluster using the 
older methods of the cache.xml and gemfire.properties files. See 
[cache.xml](../reference/topics/chapter_overview_cache_xml.html#cache_xml) and 
the [Reference](../reference/book_intro.html#reference) for configuration 
parameters. You can also configure some aspects of a cluster using a Java API. 
See [Managing Apache Geode](../managing/book_intro.html#managing_gemfire_intro).
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdd61668/geode-docs/configuring/cluster_config/export-import.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/cluster_config/export-import.html.md.erb 
b/geode-docs/configuring/cluster_config/export-import.html.md.erb
index 5a89f51..32dab1e 100644
--- a/geode-docs/configuring/cluster_config/export-import.html.md.erb
+++ b/geode-docs/configuring/cluster_config/export-import.html.md.erb
@@ -25,7 +25,7 @@ The cluster configuration service saves the cluster 
configuration as you create
 
 ## Exporting a Cluster Configuration
 
-You issue the `gfsh` `export cluster-configuration` command to save the 
configuration data for you cluster in a zip file. This zip file contains 
subdirectories for cluster-level configurations and a directory for each group 
specified in the cluster. The contents of these directories are described in 
[Cluster Configuration Files and 
Troubleshooting](gfsh_config_troubleshooting.html#concept_ylt_2cb_y4).
+Issue the `gfsh` `export cluster-configuration` command to save the 
configuration data for your cluster in a zip file. This zip file contains 
subdirectories for cluster-level configurations and a directory for each group 
specified in the cluster. The contents of these directories are described in 
[Cluster Configuration Files and 
Troubleshooting](gfsh_config_troubleshooting.html#concept_ylt_2cb_y4).
 
 To export a cluster configuration, run the `gfsh` `export 
cluster-configuration` command while connected to a Geode cluster. For example:
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdd61668/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb
----------------------------------------------------------------------
diff --git 
a/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb 
b/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb
index 638ff1d..99a4932 100644
--- 
a/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb
+++ 
b/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb
@@ -24,7 +24,7 @@ When you use the cluster configuration service in Geode, you 
can examine the gen
 The following directories and configuration files are available on the locator 
running the cluster configuration service:
 
 **Cluster-level configuration**  
-For configurations that apply to all members of a cluster, the locator creates 
a `cluster` subdirectory within the `cluster_config` directory (or in the 
cluster configuration directory when starting up the locator with the 
`--cluster-config-dir=value` parameter) specified All servers receive this 
configuration when they are started using `gfsh`. This directory contains:
+For configurations that apply to all members of a cluster, the locator creates 
a `cluster` subdirectory within the `cluster_config` directory (or in the 
cluster configuration directory when starting up the locator with the 
`--cluster-config-dir=value` parameter) specified. All servers receive this 
configuration when they are started using `gfsh`. This directory contains:
 
 -   `cluster.xml` -- A Geode `cache.xml` file containing configuration common 
to all members
 -   `cluster.properties` -- a Geode ` gemfire.properties` file containing 
properties common to all members

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdd61668/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb
----------------------------------------------------------------------
diff --git 
a/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb 
b/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb
index 6d52529..f44d60e 100644
--- a/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb
+++ b/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb
@@ -27,8 +27,10 @@ These are the basic steps for deploying configuration files, 
with related detail
 
 ## <a 
id="concept_337B365782E44951B73F33E1E17AB07B__section_53C98F9DB1584E3BABFA315CDF254A92"
 class="no-quick-link"></a>Geode Configuration Files
 
--   `gemfire.properties`. Contains the settings required by members of a 
distributed system. These settings include licensing, system member discovery, 
communication parameters, logging, and statistics. See the 
[Reference](../../reference/book_intro.html#reference).
--   **`gfsecurity.properties`**. An optional separate file that contains 
security-related (`security-*`) settings that are otherwise defined in 
`gemfire.properties`. Placing these member properties into a separate file 
allows you to restrict user access to those specific settings. See the 
[Reference](../../reference/book_intro.html#reference).
+-   `gemfire.properties`. Contains the settings required by members of a 
distributed system. These settings include licensing, system member discovery, 
communication parameters, logging, and statistics. 
+See the [Geode Properties 
Reference](../../reference/topics/gemfire_properties.html).
+-   **`gfsecurity.properties`**. An optional separate file that contains 
security-related (`security-*`) settings that are otherwise defined in 
`gemfire.properties`. Placing these member properties into a separate file 
allows you to restrict user access to those specific settings. 
+See the [Geode Properties 
Reference](../../reference/topics/gemfire_properties.html).
 -   `cache.xml`. Declarative cache configuration file. This file contains XML 
declarations for cache, region, and region entry configuration. You also use it 
to configure disk stores, database login credentials, server and remote site 
location information, and socket information. See 
[cache.xml](../../reference/topics/chapter_overview_cache_xml.html#cache_xml).
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdd61668/geode-docs/reference/topics/gemfire_properties.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/reference/topics/gemfire_properties.html.md.erb 
b/geode-docs/reference/topics/gemfire_properties.html.md.erb
index f9455dd..80b4ee8 100644
--- a/geode-docs/reference/topics/gemfire_properties.html.md.erb
+++ b/geode-docs/reference/topics/gemfire_properties.html.md.erb
@@ -145,7 +145,13 @@ See <a 
href="../../managing/autoreconnect/member-reconnect.html">Handling Forced
 </tr>
 <tr class="even">
 <td>distributed-system-id</td>
-<td>Identifier used to distinguish messages from different distributed 
systems. Set this to different values for different systems in a multi-site 
(WAN) configuration. This is required for Portable Data eXchange (PDX) data 
serialization. This setting must be the same for every member in the same 
distributed system and unique to the distributed system within the WAN 
installation. -1 means no setting. Valid values are integers in the range 
-1...255.</td>
+<td>Identifier used to distinguish messages from different distributed 
systems. 
+This is required for Portable Data eXchange (PDX) data serialization. 
+Set <code class="ph codeph">distributed-system-id</code> to different values 
for different systems in a multi-site (WAN) configuration, and to different 
values for production vs. development environments.
+This setting must be the same for every member of a given distributed system 
and unique to each distributed system within a WAN installation. 
+<br/>Valid values are integers in the range -1...255.
+-1 means no setting. 
+</td>
 <td>-1</td>
 </tr>
 <tr class="odd">

Reply via email to