You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by rv...@apache.org on 2016/09/30 00:33:32 UTC

[25/50] [abbrv] incubator-geode git commit: GEODE-37 Package renaming [#118023839]

GEODE-37 Package renaming [#118023839]


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

Branch: refs/staging/docs-grant1
Commit: 23e2f5cecd7c6271e43985d2ba71441010991c32
Parents: 27455f0
Author: Dave Barnes <db...@pivotal.io>
Authored: Thu Sep 8 14:36:22 2016 -0700
Committer: Dave Barnes <db...@pivotal.io>
Committed: Thu Sep 8 14:36:22 2016 -0700

----------------------------------------------------------------------
 .../managing_data_entries.html.md.erb           |   2 +-
 .../create_a_region_with_API.html.md.erb        |   4 +-
 .../managing_data_regions.html.md.erb           |  26 ++--
 .../data_regions/region_shortcuts.html.md.erb   |   6 +-
 .../store_retrieve_region_shortcuts.html.md.erb |   2 +-
 .../setting_distributed_properties.html.md.erb  |   2 +-
 .../intro_cache_management.html.md.erb          |  10 +-
 .../setting_cache_initializer.html.md.erb       |   2 +-
 .../setting_cache_properties.html.md.erb        |   2 +-
 .../cluster_config/gfsh_persist.html.md.erb     |   2 +-
 .../running/running_the_cacheserver.html.md.erb |   6 +-
 .../running/running_the_locator.html.md.erb     |   8 +-
 ...implementing_continuous_querying.html.md.erb |   6 +-
 .../auto_serialization.html.md.erb              |   4 +-
 .../jsonformatter_pdxinstances.html.md.erb      |   2 +-
 .../use_pdx_serializable.html.md.erb            |   8 +-
 .../use_pdx_serializer.html.md.erb              |  10 +-
 .../chapter_overview.html.md.erb                |  14 +--
 .../delta_propagation_example.html.md.erb       |   4 +-
 .../implementing_delta_propagation.html.md.erb  |   4 +-
 .../how_distribution_works.html.md.erb          |   2 +-
 .../locking_in_global_regions.html.md.erb       |   4 +-
 .../managing_distributed_regions.html.md.erb    |   2 +-
 .../filtering_multisite_events.html.md.erb      |  12 +-
 ...mplementing_cache_event_handlers.html.md.erb |  10 +-
 ...ist_of_event_handlers_and_events.html.md.erb |   6 +-
 .../resolving_multisite_conflicts.html.md.erb   |   2 +-
 ..._callbacks_that_modify_the_cache.html.md.erb |   4 +-
 .../configuring_data_eviction.html.md.erb       |   4 +-
 .../configuring_data_expiration.html.md.erb     |   2 +-
 .../function_execution.html.md.erb              |  10 +-
 .../how_function_execution_works.html.md.erb    |   4 +-
 .../chapter_overview.html.md.erb                |   2 +-
 .../implementing_data_loaders.html.md.erb       |   4 +-
 .../moving_partitioned_data.html.md.erb         |   4 +-
 ...using_custom_partition_resolvers.html.md.erb |   6 +-
 .../create_multiple_indexes.html.md.erb         |   2 +-
 .../querying_basics/running_a_query.html.md.erb |   4 +-
 .../dynamic_region_creation.html.md.erb         |  42 +++----
 .../storing_data_on_disk.html.md.erb            |   6 +-
 .../transactions/JTA_transactions.html.md.erb   |   2 +-
 .../transactional_function_example.html.md.erb  |   4 +-
 .../querying_quick_reference.html.md.erb        |   4 +-
 getting_started/setup_classpath.html.md.erb     |   4 +-
 .../disk_store_configuration_params.html.md.erb |   2 +-
 managing/heap_use/heap_management.html.md.erb   |   4 +-
 .../heap_use/off_heap_management.html.md.erb    |   2 +-
 managing/logging/logging_categories.html.md.erb |   6 +-
 managing/logging/logging_whats_next.html.md.erb |   2 +-
 .../management/list_of_mbeans_full.html.md.erb  |  22 ++--
 .../management_system_overview.html.md.erb      |   4 +-
 managing/management/mm_overview.html.md.erb     |   2 +-
 .../management/programming_example.html.md.erb  |  20 +--
 .../performance_controls.html.md.erb            |   2 +-
 ..._controls_controlling_socket_use.html.md.erb |   2 +-
 ..._controls_setting_cache_timeouts.html.md.erb |   4 +-
 .../sockets_and_gateways.html.md.erb            |   2 +-
 .../region_compression.html.md.erb              |   6 +-
 .../authentication_examples.html.md.erb         |  10 +-
 .../how_authorization_works.html.md.erb         |   2 +-
 .../implementing_authentication.html.md.erb     |   4 +-
 .../implementing_authorization.html.md.erb      |   2 +-
 .../application_defined_statistics.html.md.erb  |   2 +-
 .../diagnosing_system_probs.html.md.erb         |  22 ++--
 .../recovering_from_p2p_crashes.html.md.erb     |   2 +-
 .../system_failure_and_recovery.html.md.erb     |  10 +-
 reference/topics/cache_xml.html.md.erb          | 110 ++++++++---------
 reference/topics/client-cache.html.md.erb       |  80 ++++++------
 reference/topics/elements_ref.html.md.erb       |   8 +-
 reference/topics/gfe_cache_xml.html.md.erb      | 122 +++++++++----------
 ...handling_exceptions_and_failures.html.md.erb |   2 +-
 .../region_shortcuts_reference.html.md.erb      |   8 +-
 rest_apps/develop_rest_apps.html.md.erb         |  22 ++--
 ...et_region_data_for_multiple_keys.html.md.erb |   4 +-
 rest_apps/get_regions.html.md.erb               |   4 +-
 rest_apps/post_execute_functions.html.md.erb    |   4 +-
 rest_apps/post_execute_query.html.md.erb        |   6 +-
 rest_apps/post_if_absent_data.html.md.erb       |   2 +-
 .../put_multiple_values_for_keys.html.md.erb    |   4 +-
 rest_apps/put_replace_data.html.md.erb          |   2 +-
 rest_apps/put_update_cas_data.html.md.erb       |   8 +-
 rest_apps/put_update_data.html.md.erb           |   2 +-
 rest_apps/rest_examples.html.md.erb             |  48 ++++----
 rest_apps/setup_config.html.md.erb              |   2 +-
 .../gemcached/deploying_gemcached.html.md.erb   |   2 +-
 .../gfsh/command-pages/create.html.md.erb       |  14 +--
 .../gfsh/getting_started_gfsh.html.md.erb       |   2 +-
 .../changing_gemfire_default_cfg.html.md.erb    |   4 +-
 .../setting_up_the_module.html.md.erb           |   4 +-
 .../http_session_mgmt/quick_start.html.md.erb   |   4 +-
 .../session_state_log_files.html.md.erb         |  14 +--
 .../tc_setting_up_the_module.html.md.erb        |   2 +-
 .../tomcat_changing_gf_default_cfg.html.md.erb  |  10 +-
 .../tomcat_setting_up_the_module.html.md.erb    |  14 +--
 ...weblogic_changing_gf_default_cfg.html.md.erb |   4 +-
 .../weblogic_setting_up_the_module.html.md.erb  |   8 +-
 tools_modules/pulse/quickstart.html.md.erb      |   2 +-
 .../chapter_overview.html.md.erb                |   2 +-
 .../client_server_whats_next.html.md.erb        |   4 +-
 .../using_bind_addresses.html.md.erb            |   2 +-
 100 files changed, 467 insertions(+), 467 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/basic_config/data_entries_custom_classes/managing_data_entries.html.md.erb
----------------------------------------------------------------------
diff --git a/basic_config/data_entries_custom_classes/managing_data_entries.html.md.erb b/basic_config/data_entries_custom_classes/managing_data_entries.html.md.erb
index 7d54e5a..d809635 100644
--- a/basic_config/data_entries_custom_classes/managing_data_entries.html.md.erb
+++ b/basic_config/data_entries_custom_classes/managing_data_entries.html.md.erb
@@ -85,7 +85,7 @@ Always change your entries using copies of the retrieved objects\u2014never directl
     `EntryEvent.getOldValue`
     `Query.select`
 
-2.  Create a copy of the returned object and work with that. For objects that are cloneable or serializable, you can copy the entry value to a new object using `com.gemstone.gemfire.CopyHelper.copy`. Example:
+2.  Create a copy of the returned object and work with that. For objects that are cloneable or serializable, you can copy the entry value to a new object using `org.apache.geode.CopyHelper.copy`. Example:
 
     ``` pre
     Object o = (StringBuffer)region.get("stringBuf");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/basic_config/data_regions/create_a_region_with_API.html.md.erb
----------------------------------------------------------------------
diff --git a/basic_config/data_regions/create_a_region_with_API.html.md.erb b/basic_config/data_regions/create_a_region_with_API.html.md.erb
index 302c131..ba8e384 100644
--- a/basic_config/data_regions/create_a_region_with_API.html.md.erb
+++ b/basic_config/data_regions/create_a_region_with_API.html.md.erb
@@ -13,10 +13,10 @@ Region creation is subject to attribute consistency checks, both internal to the
     Use a region shortcut to create your region factory. 
     -   
 
-        In peers and servers, use `com.gemstone.gemfire.cache.RegionFactory`.
+        In peers and servers, use `org.apache.geode.cache.RegionFactory`.
     -   
 
-        In clients, use `com.gemstone.gemfire.cache.client.ClientRegionFactory`.
+        In clients, use `org.apache.geode.cache.client.ClientRegionFactory`.
 
 2.  
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/basic_config/data_regions/managing_data_regions.html.md.erb
----------------------------------------------------------------------
diff --git a/basic_config/data_regions/managing_data_regions.html.md.erb b/basic_config/data_regions/managing_data_regions.html.md.erb
index bc3e0ad..cd9427b 100644
--- a/basic_config/data_regions/managing_data_regions.html.md.erb
+++ b/basic_config/data_regions/managing_data_regions.html.md.erb
@@ -7,7 +7,7 @@ Apache Geode provides different APIs and XML configuration models to support con
 <a id="data_regions__section_18A9481217204613958897FE64105097"></a>
 You store your data in region entry key/value pairs, with keys and values being any object types your application needs.
 
-The `com.gemstone.gemfire.cache.Region` interface implements `java.util.Map`.
+The `org.apache.geode.cache.Region` interface implements `java.util.Map`.
 
 Each region's attributes define how the data in the region is stored, distributed, and managed. Data regions can be distributed, partitioned among system members, or local to the member.
 
@@ -20,21 +20,21 @@ If you change attributes that define a region, you must restart the member for t
 
 Geode's regions APIs provide specialized behavior for different system member types.
 
--   **Peer/Server Region APIs**. Use these methods, interfaces, and classes for peer/server region creation. These are in the `com.gemstone.gemfire.cache` package. They correspond to declarations in the `<cache>` element for creating and configuring regions.
-    -   **`com.gemstone.gemfire.cache.Cache.createRegionFactory`** . This method takes a `RegionShortcut` `enum` to initiate region configuration, and returns a `RegionFactory`. Use `createRegionFactory()`, not "`new                                     RegionFactory`," to create a RegionFactory.
-    -   **`com.gemstone.gemfire.cache.RegionFactory`**. Provides methods to set individual region attributes and to create the region. The `create` call returns `Region`.
-    -   **`com.gemstone.gemfire.cache.RegionShortcut`**. Common region configurations can be retrieved through `Cache` `createRegionShortcut` and with the region attribute, `refid`.
--   **Client Region APIs**. Use these methods, interfaces, and classes for client region creation. These are in the `com.gemstone.gemfire.cache.client` package. They correspond to declarations in the `<client-cache>` element for creating and configuring regions.
+-   **Peer/Server Region APIs**. Use these methods, interfaces, and classes for peer/server region creation. These are in the `org.apache.geode.cache` package. They correspond to declarations in the `<cache>` element for creating and configuring regions.
+    -   **`org.apache.geode.cache.Cache.createRegionFactory`** . This method takes a `RegionShortcut` `enum` to initiate region configuration, and returns a `RegionFactory`. Use `createRegionFactory()`, not "`new                                     RegionFactory`," to create a RegionFactory.
+    -   **`org.apache.geode.cache.RegionFactory`**. Provides methods to set individual region attributes and to create the region. The `create` call returns `Region`.
+    -   **`org.apache.geode.cache.RegionShortcut`**. Common region configurations can be retrieved through `Cache` `createRegionShortcut` and with the region attribute, `refid`.
+-   **Client Region APIs**. Use these methods, interfaces, and classes for client region creation. These are in the `org.apache.geode.cache.client` package. They correspond to declarations in the `<client-cache>` element for creating and configuring regions.
 
     These are client versions of the Peer/Server Region APIs. These client APIs provide similar functionality, but are tailored to the needs and behaviors of client regions.
 
-    -   **`com.gemstone.gemfire.cache.clientCache.createRegionFactory`** . This method takes a `ClientRegionShortcut` `enum` to initiate region configuration, and returns a `ClientRegionFactory`.
-    -   **`com.gemstone.gemfire.cache.client.ClientRegionFactory`**. Provides methods to set individual region attributes and to create the region. The `create` call returns `Region`.
-    -   **`com.gemstone.gemfire.cache.client.ClientRegionShortcut`** . Common region configurations can be retrieved through `ClientCache` `createClientRegionFactory` and with the region attribute, `refid`.
--   **Region APIs Used For All Member Types**. These interfaces and classes are used universally for region management. These are in the `com.gemstone.gemfire.cache` package. They correspond to declarations under the `<cache>` and `<client-cache>` elements for creating and configuring regions.
-    -   **`com.gemstone.gemfire.cache.Region`** . Interface for managing your regions and their entries.
-    -   **`com.gemstone.gemfire.cache.RegionAttributes`** . Object holding region configuration settings.
-    -   **`com.gemstone.gemfire.cache.createRegionFactory`**. Can be used to create `RegionAttributes` to pass to `RegionFactory` and `ClientRegionFactory`.
+    -   **`org.apache.geode.cache.clientCache.createRegionFactory`** . This method takes a `ClientRegionShortcut` `enum` to initiate region configuration, and returns a `ClientRegionFactory`.
+    -   **`org.apache.geode.cache.client.ClientRegionFactory`**. Provides methods to set individual region attributes and to create the region. The `create` call returns `Region`.
+    -   **`org.apache.geode.cache.client.ClientRegionShortcut`** . Common region configurations can be retrieved through `ClientCache` `createClientRegionFactory` and with the region attribute, `refid`.
+-   **Region APIs Used For All Member Types**. These interfaces and classes are used universally for region management. These are in the `org.apache.geode.cache` package. They correspond to declarations under the `<cache>` and `<client-cache>` elements for creating and configuring regions.
+    -   **`org.apache.geode.cache.Region`** . Interface for managing your regions and their entries.
+    -   **`org.apache.geode.cache.RegionAttributes`** . Object holding region configuration settings.
+    -   **`org.apache.geode.cache.createRegionFactory`**. Can be used to create `RegionAttributes` to pass to `RegionFactory` and `ClientRegionFactory`.
 
 ## <a id="data_regions__section_9F898C23D2164ED5BB3789FD8B1F68C3" class="no-quick-link"></a>Create and Access Data Regions
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/basic_config/data_regions/region_shortcuts.html.md.erb
----------------------------------------------------------------------
diff --git a/basic_config/data_regions/region_shortcuts.html.md.erb b/basic_config/data_regions/region_shortcuts.html.md.erb
index bcbded8..270987b 100644
--- a/basic_config/data_regions/region_shortcuts.html.md.erb
+++ b/basic_config/data_regions/region_shortcuts.html.md.erb
@@ -42,14 +42,14 @@ You can create your own named attributes as needed, by providing an `id` in your
 
 You can select the most common region attributes settings from Geode\u2019s predefined named region attributes in these classes:
 
--   **`com.gemstone.gemfire.cache.RegionShortcut`**. For peers and servers.
--   **`com.gemstone.gemfire.cache.client.ClientRegionShortcut`**. For clients.
+-   **`org.apache.geode.cache.RegionShortcut`**. For peers and servers.
+-   **`org.apache.geode.cache.client.ClientRegionShortcut`**. For clients.
 
 Shortcut attributes are a convenience only. They are just named attributes that Geode has already stored for you. You can override their settings by storing new attributes with the same id as the predefined attributes.
 
 For a full list of all available region shortcuts, see [Region Shortcuts Quick Reference](../../reference/topics/region_shortcuts_table.html#reference_ufj_5kz_4k).
 
-The `com.gemstone.gemfire.cache.RegionShortcut` Javadocs give complete listings of the options.
+The `org.apache.geode.cache.RegionShortcut` Javadocs give complete listings of the options.
 
 ## <a id="region_shortcuts__section_D0975C76572E41F79C1A6EE7CF371251" class="no-quick-link"></a>RegionShortcuts for Peers and Servers
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/basic_config/data_regions/store_retrieve_region_shortcuts.html.md.erb
----------------------------------------------------------------------
diff --git a/basic_config/data_regions/store_retrieve_region_shortcuts.html.md.erb b/basic_config/data_regions/store_retrieve_region_shortcuts.html.md.erb
index fdb5723..9d39bd5 100644
--- a/basic_config/data_regions/store_retrieve_region_shortcuts.html.md.erb
+++ b/basic_config/data_regions/store_retrieve_region_shortcuts.html.md.erb
@@ -5,7 +5,7 @@ title:  Storing and Retrieving Region Shortcuts and Custom Named Region Attribut
 Use these examples to get started with Geode region shortcuts.
 
 <a id="region_shortcuts__section_D9E58754D2B0435FA2986DBBF3063D4C"></a>
-Geode region shortcuts, in `com.gemstone.gemfire.cache.RegionShortcut` for peers and servers and `com.gemstone.gemfire.cache.client.ClientRegionShortcut` for clients, are available wherever you create a region in the `cache.xml` or through the API. Custom named attributes, stored by you, are available from the moment you store them on.
+Geode region shortcuts, in `org.apache.geode.cache.RegionShortcut` for peers and servers and `org.apache.geode.cache.client.ClientRegionShortcut` for clients, are available wherever you create a region in the `cache.xml` or through the API. Custom named attributes, stored by you, are available from the moment you store them on.
 
 The region shortcuts are special Geode named region attributes, with identifying names. Create custom named region attributes by setting the attributes and storing them with a unique identifier in the region attribute `id`. Retrieve named attributes by providing the shortcut enum value or the name you assigned in the `id` to the region creation:
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/basic_config/gemfire_properties/setting_distributed_properties.html.md.erb
----------------------------------------------------------------------
diff --git a/basic_config/gemfire_properties/setting_distributed_properties.html.md.erb b/basic_config/gemfire_properties/setting_distributed_properties.html.md.erb
index 7f810d3..db03d15 100644
--- a/basic_config/gemfire_properties/setting_distributed_properties.html.md.erb
+++ b/basic_config/gemfire_properties/setting_distributed_properties.html.md.erb
@@ -59,6 +59,6 @@ Set distributed system properties by any combination of the following. The syste
     disable-tcp=false
     ```
 
-4.  Default value. The default property values are listed in the online Java documentation for `com.gemstone.gemfire.distributed.DistributedSystem`.
+4.  Default value. The default property values are listed in the online Java documentation for `org.apache.geode.distributed.DistributedSystem`.
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/basic_config/the_cache/intro_cache_management.html.md.erb
----------------------------------------------------------------------
diff --git a/basic_config/the_cache/intro_cache_management.html.md.erb b/basic_config/the_cache/intro_cache_management.html.md.erb
index 037c051..2d21a60 100644
--- a/basic_config/the_cache/intro_cache_management.html.md.erb
+++ b/basic_config/the_cache/intro_cache_management.html.md.erb
@@ -5,7 +5,7 @@ title:  Introduction to Cache Management
 The cache provides in-memory storage and management for your data.
 
 <a id="concept_F8BA7F2D3B5A40D78461E78BC5FB31FA__section_B364B076EB5843DAAC28EE2805686453"></a>
-You organize your data in the cache into *data regions*, each with its own configurable behavior. You store your data into your regions in key/value pairs called *data entries*. The cache also provides features like transactions, data querying, disk storage management, and logging. See the Javadocs for `com.gemstone.gemfire.cache.Cache`.
+You organize your data in the cache into *data regions*, each with its own configurable behavior. You store your data into your regions in key/value pairs called *data entries*. The cache also provides features like transactions, data querying, disk storage management, and logging. See the Javadocs for `org.apache.geode.cache.Cache`.
 
 You generally configure caches using the `gfsh` command-line utility or a combination of XML declarations and API calls. Geode loads and processes your XML declarations when you first create the cache.
 
@@ -15,10 +15,10 @@ Geode has one cache type for managing server and peer caches and one for managin
 
 Geode's caching APIs provide specialized behavior for different system member types and security settings.
 
--   **`com.gemstone.gemfire.cache.RegionService`**. Generally, you use the `RegionService` functionality through instances of `Cache` and `ClientCache`. You only specifically use instances of `RegionService` for limited-access users in secure client applications that service many users. The `RegionService` API provides access to existing cache data regions and to the standard query service for the cache. For client caches, queries are sent to the server tier. For server and peer caches, queries are run in the current cache and any available peers. `RegionService` is implemented by `GemFireCache`.
--   **`com.gemstone.gemfire.cache.GemFireCache`**. You do not specifically use instances of `GemFireCache`, but you use `GemFireCache` functionality in your instances of `Cache` and `ClientCache`. `GemFireCache` extends `RegionService` and adds general caching features like region attributes, disk stores for region persistence and overflow, and access to the underlying distributed system. `GemFireCache` is implemented by `Cache` and `ClientCache`.
--   **`com.gemstone.gemfire.cache.Cache`**. Use the `Cache` interface to manage server and peer caches. You have one `Cache` per server or peer process. The `Cache` extends `GemFireCache` and adds server/peer caching features like communication within the distributed system, region creation, transactions and querying, and cache server functionality.
--   **`com.gemstone.gemfire.cache.ClientCache`**. Use the `ClientCache` interface to manage the cache in your clients. You have one `ClientCache` per client process. The `ClientCache` extends `GemFireCache` and adds client-specific caching features like client region creation, subscription keep-alive management for durable clients, querying on server and client tiers, and RegionService creation for secure access by multiple users within the client.
+-   **`org.apache.geode.cache.RegionService`**. Generally, you use the `RegionService` functionality through instances of `Cache` and `ClientCache`. You only specifically use instances of `RegionService` for limited-access users in secure client applications that service many users. The `RegionService` API provides access to existing cache data regions and to the standard query service for the cache. For client caches, queries are sent to the server tier. For server and peer caches, queries are run in the current cache and any available peers. `RegionService` is implemented by `GemFireCache`.
+-   **`org.apache.geode.cache.GemFireCache`**. You do not specifically use instances of `GemFireCache`, but you use `GemFireCache` functionality in your instances of `Cache` and `ClientCache`. `GemFireCache` extends `RegionService` and adds general caching features like region attributes, disk stores for region persistence and overflow, and access to the underlying distributed system. `GemFireCache` is implemented by `Cache` and `ClientCache`.
+-   **`org.apache.geode.cache.Cache`**. Use the `Cache` interface to manage server and peer caches. You have one `Cache` per server or peer process. The `Cache` extends `GemFireCache` and adds server/peer caching features like communication within the distributed system, region creation, transactions and querying, and cache server functionality.
+-   **`org.apache.geode\u2248setting_cache_initializer.cache.ClientCache`**. Use the `ClientCache` interface to manage the cache in your clients. You have one `ClientCache` per client process. The `ClientCache` extends `GemFireCache` and adds client-specific caching features like client region creation, subscription keep-alive management for durable clients, querying on server and client tiers, and RegionService creation for secure access by multiple users within the client.
 
 ## <a id="concept_F8BA7F2D3B5A40D78461E78BC5FB31FA__section_6486BDAF06EC4B91A548872066F3EC8C" class="no-quick-link"></a>The Cache XML
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/basic_config/the_cache/setting_cache_initializer.html.md.erb
----------------------------------------------------------------------
diff --git a/basic_config/the_cache/setting_cache_initializer.html.md.erb b/basic_config/the_cache/setting_cache_initializer.html.md.erb
index 9016cea..20cc2c6 100644
--- a/basic_config/the_cache/setting_cache_initializer.html.md.erb
+++ b/basic_config/the_cache/setting_cache_initializer.html.md.erb
@@ -27,7 +27,7 @@ Here's the corresponding class definition:
 
 ``` pre
  
-import com.gemstone.gemfire.cache.Declarable;
+import org.apache.geode.cache.Declarable;
 
 public class MyInitializer implements Declarable {
    public void init(Properties properties) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/basic_config/the_cache/setting_cache_properties.html.md.erb
----------------------------------------------------------------------
diff --git a/basic_config/the_cache/setting_cache_properties.html.md.erb b/basic_config/the_cache/setting_cache_properties.html.md.erb
index 4a2cec1..76d5066 100644
--- a/basic_config/the_cache/setting_cache_properties.html.md.erb
+++ b/basic_config/the_cache/setting_cache_properties.html.md.erb
@@ -17,6 +17,6 @@ Configure the cache and its data regions through one or more of these methods:
     As you issue commands, gfsh saves a set of configurations that apply to the entire cluster and also saves configurations that only apply to defined groups of members within the cluster. You can re-use these configurations to create a distributed system. See [Overview of the Cluster Configuration Service](../../configuring/cluster_config/gfsh_persist.html).
 
 -   Through declarations in the XML file named in the `cache-xml-file` `gemfire.properties` setting. This file is generally referred to as the `cache.xml` file, but it can have any name. See [cache.xml](../../reference/topics/chapter_overview_cache_xml.html#cache_xml).
--   Through application calls to the `com.gemstone.gemfire.cache.CacheFactory`, `com.gemstone.gemfire.cache.Cache` and `com.gemstone.gemfire.cache.Region` APIs.
+-   Through application calls to the `org.apache.geode.cache.CacheFactory`, `org.apache.geode.cache.Cache` and `org.apache.geode.cache.Region` APIs.
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/configuring/cluster_config/gfsh_persist.html.md.erb
----------------------------------------------------------------------
diff --git a/configuring/cluster_config/gfsh_persist.html.md.erb b/configuring/cluster_config/gfsh_persist.html.md.erb
index eaa4c62..85be33c 100644
--- a/configuring/cluster_config/gfsh_persist.html.md.erb
+++ b/configuring/cluster_config/gfsh_persist.html.md.erb
@@ -78,7 +78,7 @@ There are some configurations that you cannot create using `gfsh`, and that you
     -   `pdx-serializer`
     
         **Note:**
-        The `configure pdx` command always specifies the <span class="keyword apiname">com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer</span> class. You cannot specify a custom PDX serializer in gfsh.
+        The `configure pdx` command always specifies the `org.apache.geode.pdx.ReflectionBasedAutoSerializer` class. You cannot specify a custom PDX serializer in gfsh.
 
     -   `custom-expiry`
     -   `initializer`

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/configuring/running/running_the_cacheserver.html.md.erb
----------------------------------------------------------------------
diff --git a/configuring/running/running_the_cacheserver.html.md.erb b/configuring/running/running_the_cacheserver.html.md.erb
index b68e417..9de1189 100644
--- a/configuring/running/running_the_cacheserver.html.md.erb
+++ b/configuring/running/running_the_cacheserver.html.md.erb
@@ -8,7 +8,7 @@ A Geode server is a process that runs as a long-lived, configurable member of a
 The Geode server is used primarily for hosting long-lived data regions and for running standard Geode processes such as the server in a client/server configuration. You can start and stop servers using the following methods:
 
 -   The `gfsh` tool allows you to manage Geode server processes from the command line.
--   You can also start, stop and manage the Geode servers through the `com.gemstone.gemfire.distributed.ServerLauncher` API. The `ServerLauncher` API can only be used for Geode Servers that were started with `gfsh` or with the `ServerLauncher` class itself. See the JavaDocs for additional specifics on using the `ServerLauncher` API.
+-   You can also start, stop and manage the Geode servers through the `org.apache.geode.distributed.ServerLauncher` API. The `ServerLauncher` API can only be used for Geode Servers that were started with `gfsh` or with the `ServerLauncher` class itself. See the JavaDocs for additional specifics on using the `ServerLauncher` API.
 
 ## <a id="running_the_cacheserver__section_E15FB1B039CE4F6CB2E4B5618D7ECAA1" class="no-quick-link"></a>Default Server Configuration and Log Files
 
@@ -99,10 +99,10 @@ gfsh>start server --name=server3 \
 
 ## Start the Server Programmatically
 
-Use `com.gemstone.gemfire.distributed.ServerLauncher` API to start the cache server process inside your code. Use the `ServerLauncher.Builder` class to construct an instance of the `ServerLauncher`, and then use the `start()` method to start the server service. The other methods in the `ServerLauncher` class provide status information about the server and allow you to stop the server.
+Use `org.apache.geode.distributed.ServerLauncher` API to start the cache server process inside your code. Use the `ServerLauncher.Builder` class to construct an instance of the `ServerLauncher`, and then use the `start()` method to start the server service. The other methods in the `ServerLauncher` class provide status information about the server and allow you to stop the server.
 
 ``` pre
-import com.gemstone.gemfire.distributed.ServerLauncher;
+import org.apache.geode.distributed.ServerLauncher;
 
  public class MyEmbeddedServer {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/configuring/running/running_the_locator.html.md.erb
----------------------------------------------------------------------
diff --git a/configuring/running/running_the_locator.html.md.erb b/configuring/running/running_the_locator.html.md.erb
index 0cd36ae..64ac02e 100644
--- a/configuring/running/running_the_locator.html.md.erb
+++ b/configuring/running/running_the_locator.html.md.erb
@@ -59,12 +59,12 @@ Use the following guidelines to start the locator:
         gfsh> start locator --name=locator2 --bind-address=192.0.2.0 --port=13489
         ```
 
-    -   Start the locator using the `main` method in the `com.gemstone.gemfire.distributed.LocatorLauncher` class and the Java executable. For example:
+    -   Start the locator using the `main` method in the `org.apache.geode.distributed.LocatorLauncher` class and the Java executable. For example:
 
         ``` pre
         working/directory/of/Locator/process$java -server \
          -classpath "$GEMFIRE/lib/locator-dependencies.jar:/path/to/application/classes.jar" \
-         com.gemstone.gemfire.distributed.LocatorLauncher start Locator1 --port=11235 \
+         org.apache.geode.distributed.LocatorLauncher start Locator1 --port=11235 \
           --redirect-output
         ```
 
@@ -87,10 +87,10 @@ Use the following guidelines to start the locator:
         start-locator=13489
         ```
 
-    -   Use `com.gemstone.gemfire.distributed.LocatorLauncher` API to start the locator inside your code. Use the `LocatorLauncher.Builder` class to construct an instance of the `LocatorLauncher`, and then use the `start()` method to start a Locator service embedded in your Java application process. The other methods in the `LocatorLauncher` class provide status information about the locator and allow you to stop the locator.
+    -   Use `org.apache.geode.distributed.LocatorLauncher` API to start the locator inside your code. Use the `LocatorLauncher.Builder` class to construct an instance of the `LocatorLauncher`, and then use the `start()` method to start a Locator service embedded in your Java application process. The other methods in the `LocatorLauncher` class provide status information about the locator and allow you to stop the locator.
 
         ``` pre
-        import com.gemstone.gemfire.distributed.LocatorLauncher;
+        import org.apache.geode.distributed.LocatorLauncher;
 
          public class MyEmbeddedLocator {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/continuous_querying/implementing_continuous_querying.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/continuous_querying/implementing_continuous_querying.html.md.erb b/developing/continuous_querying/implementing_continuous_querying.html.md.erb
index 6414383..de4c81e 100644
--- a/developing/continuous_querying/implementing_continuous_querying.html.md.erb
+++ b/developing/continuous_querying/implementing_continuous_querying.html.md.erb
@@ -38,7 +38,7 @@ Before you begin, you should be familiar with [Querying](../querying_basics/chap
     ```
 
 3. Write your CQ listeners to handle CQ events from the server.
-    Implement `com.gemstone.gemfire.cache.query.CqListener` in each event handler you need. In addition to your main CQ listeners, you might have listeners that you use for all CQs to track statistics or other general information.
+    Implement `org.apache.geode.cache.query.CqListener` in each event handler you need. In addition to your main CQ listeners, you might have listeners that you use for all CQs to track statistics or other general information.
 
     **Note:**
     Be especially careful if you choose to update your cache from your `CqListener`. If your listener updates the region that is queried in its own CQ and that region has a `Pool` named, the update will be forwarded to the server. If the update on the server satisfies the same CQ, it may be returned to the same listener that did the update, which could put your application into an infinite loop. This same scenario could be played out with multiple regions and multiple CQs, if the listeners are programmed to update each other's regions.
@@ -51,7 +51,7 @@ Before you begin, you should be familiar with [Querying](../querying_basics/chap
     {
       public void onEvent(CqEvent cqEvent)
       {
-        // com.gemstone.gemfire.cache Operation associated with the query op
+        // org.apache.geode.cache Operation associated with the query op
         Operation queryOperation = cqEvent.getQueryOperation();
         // key and new value from the event
         Object key = cqEvent.getKey();
@@ -92,7 +92,7 @@ Before you begin, you should be familiar with [Querying](../querying_basics/chap
     {
       public void onEvent(CqEvent cqEvent)
       {
-        // com.gemstone.gemfire.cache Operation associated with the query op
+        // org.apache.geode.cache Operation associated with the query op
         Operation queryOperation = cqEvent.getQueryOperation();
         // key and new value from the event
         Object key = cqEvent.getKey();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/data_serialization/auto_serialization.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/data_serialization/auto_serialization.html.md.erb b/developing/data_serialization/auto_serialization.html.md.erb
index 6002229..7e3dfa2 100644
--- a/developing/data_serialization/auto_serialization.html.md.erb
+++ b/developing/data_serialization/auto_serialization.html.md.erb
@@ -46,7 +46,7 @@ In your application where you manage data from the cache, provide the following
           <pdx>
             <pdx-serializer>
               <class-name>
-               com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer
+               org.apache.geode.pdx.ReflectionBasedAutoSerializer
               </class-name>
               <parameter name="classes">
               <string>com.company.domain.DomainObject</string>
@@ -87,7 +87,7 @@ In your application where you manage data from the cache, provide the following
           <pdx>
             <pdx-serializer>
               <class-name>
-               com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer
+               org.apache.geode.pdx.ReflectionBasedAutoSerializer
               </class-name>
             <parameter name="classes">
               <string>com.company.domain.DomainObject</string>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/data_serialization/jsonformatter_pdxinstances.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/data_serialization/jsonformatter_pdxinstances.html.md.erb b/developing/data_serialization/jsonformatter_pdxinstances.html.md.erb
index 9440b0a..59ceb3c 100644
--- a/developing/data_serialization/jsonformatter_pdxinstances.html.md.erb
+++ b/developing/data_serialization/jsonformatter_pdxinstances.html.md.erb
@@ -26,4 +26,4 @@ After executing a Geode query or calling `region.get`, you can use the following
 -   `toJSON`. Reads a PdxInstance and returns a JSON string.
 -   `toJSONByteArray`. Reads a PdxInstance and returns a JSON byte array.
 
-For more information on using the JSONFormatter, see the Java API documentation for `com.gemstone.gemfire.pdx.JSONFormatter`.
+For more information on using the JSONFormatter, see the Java API documentation for `org.apache.geode.pdx.JSONFormatter`.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/data_serialization/use_pdx_serializable.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/data_serialization/use_pdx_serializable.html.md.erb b/developing/data_serialization/use_pdx_serializable.html.md.erb
index d4aa2e7..948112b 100644
--- a/developing/data_serialization/use_pdx_serializable.html.md.erb
+++ b/developing/data_serialization/use_pdx_serializable.html.md.erb
@@ -7,14 +7,14 @@ For a domain object with source that you can modify, implement the `PdxSerializa
 <a id="use_pdx_serializable__section_7F357A8E56B54BFB9A5778C0F89E034E"></a>
 **Procedure**
 
-1.  In your domain class, implement `PdxSerializable`, importing the required `com.gemstone.gemfire.pdx` classes.
+1.  In your domain class, implement `PdxSerializable`, importing the required `org.apache.geode.pdx` classes.
 
     For example:
 
     ``` pre
-    import com.gemstone.gemfire.pdx.PdxReader;
-    import com.gemstone.gemfire.pdx.PdxSerializable;
-    import com.gemstone.gemfire.pdx.PdxWriter;
+    import org.apache.geode.pdx.PdxReader;
+    import org.apache.geode.pdx.PdxSerializable;
+    import org.apache.geode.pdx.PdxWriter;
 
     public class PortfolioPdx implements PdxSerializable {
       ...

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/data_serialization/use_pdx_serializer.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/data_serialization/use_pdx_serializer.html.md.erb b/developing/data_serialization/use_pdx_serializer.html.md.erb
index 3cdf599..7ef401e 100644
--- a/developing/data_serialization/use_pdx_serializer.html.md.erb
+++ b/developing/data_serialization/use_pdx_serializer.html.md.erb
@@ -25,10 +25,10 @@ The `PdxSerializer` `toData` and `fromData` methods differ from those for `PdxSe
         Example:
 
         ``` pre
-        import com.gemstone.gemfire.cache.Declarable;
-        import com.gemstone.gemfire.pdx.PdxReader;
-        import com.gemstone.gemfire.pdx.PdxSerializer;
-        import com.gemstone.gemfire.pdx.PdxWriter;
+        import org.apache.geode.cache.Declarable;
+        import org.apache.geode.pdx.PdxReader;
+        import org.apache.geode.pdx.PdxSerializer;
+        import org.apache.geode.pdx.PdxWriter;
 
         public class ExamplePdxSerializer implements PdxSerializer, Declarable {
         ...
@@ -59,7 +59,7 @@ The `PdxSerializer` `toData` and `fromData` methods differ from those for `PdxSe
         ```
 
     **Note:**
-    You cannot specify a custom `pdx-serializer` class using gfsh, however the `configure pdx` command automatically configures the <span class="keyword apiname">com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer</span> class. See [configure pdx](../../tools_modules/gfsh/command-pages/configure.html#topic_jdkdiqbgphqh).
+    You cannot specify a custom `pdx-serializer` class using gfsh, however the `configure pdx` command automatically configures the <span class="keyword apiname">org.apache.geode.pdx.ReflectionBasedAutoSerializer</span> class. See [configure pdx](../../tools_modules/gfsh/command-pages/configure.html#topic_jdkdiqbgphqh).
 
 3.  Program `PdxSerializer.toData` to recognize, cast, and handle your domain object:
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/delta_propagation/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/delta_propagation/chapter_overview.html.md.erb b/developing/delta_propagation/chapter_overview.html.md.erb
index 6079292..1beb847 100644
--- a/developing/delta_propagation/chapter_overview.html.md.erb
+++ b/developing/delta_propagation/chapter_overview.html.md.erb
@@ -4,27 +4,27 @@ title:  Delta Propagation
 
 Delta propagation allows you to reduce the amount of data you send over the network by including only changes to objects rather than the entire object.
 
--   **[How Delta Propagation Works](../../developing/delta_propagation/how_delta_propagation_works.html)**
+-   **[How Delta Propagation Works](how_delta_propagation_works.html)**
 
     Delta propagation reduces the amount of data you send over the network. You do this by only sending the change, or delta, information about an object, instead of sending the entire changed object. If you do not use cloning when applying the deltas, you can also expect to generate less garbage in your receiving JVMs.
 
--   **[When to Avoid Delta Propagation](../../developing/delta_propagation/when_to_use_delta_prop.html)**
+-   **[When to Avoid Delta Propagation](when_to_use_delta_prop.html)**
 
     Generally, the larger your objects and the smaller the deltas, the greater the benefits of using delta propagation. Partitioned regions with higher redundancy levels generally benefit more from delta propagation. However, in some application scenarios, delta propagation does not show any significant benefits. On occasion it results in performance degradation.
 
--   **[Delta Propagation Properties](../../developing/delta_propagation/delta_propagation_properties.html)**
+-   **[Delta Propagation Properties](delta_propagation_properties.html)**
 
     This topic describes the properties that can be used to configure delta propagation.
 
--   **[Implementing Delta Propagation](../../developing/delta_propagation/implementing_delta_propagation.html)**
+-   **[Implementing Delta Propagation](implementing_delta_propagation.html)**
 
-    By default, delta propagation is enabled in your distributed system. When enabled, delta propagation is used for objects that implement `com.gemstone.gemfire.Delta`. You program the methods to store and extract delta information for your entries and to apply received delta information.
+    By default, delta propagation is enabled in your distributed system. When enabled, delta propagation is used for objects that implement `org.apache.geode.Delta`. You program the methods to store and extract delta information for your entries and to apply received delta information.
 
--   **[Errors In Delta Propagation](../../developing/delta_propagation/errors_in_delta_propagation.html)**
+-   **[Errors In Delta Propagation](errors_in_delta_propagation.html)**
 
     This topic lists the errors that can occur when using delta propagation.
 
--   **[Delta Propagation Example](../../developing/delta_propagation/delta_propagation_example.html)**
+-   **[Delta Propagation Example](delta_propagation_example.html)**
 
     This topic provides an example of delta propagation.
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/delta_propagation/delta_propagation_example.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/delta_propagation/delta_propagation_example.html.md.erb b/developing/delta_propagation/delta_propagation_example.html.md.erb
index b541e06..075b32e 100644
--- a/developing/delta_propagation/delta_propagation_example.html.md.erb
+++ b/developing/delta_propagation/delta_propagation_example.html.md.erb
@@ -22,8 +22,8 @@ This example shows the basic approach to programming a `Delta` implementation.
 ``` pre
 package delta;
 
-import com.gemstone.gemfire.Delta;
-import com.gemstone.gemfire.InvalidDeltaException;
+import org.apache.geode.Delta;
+import org.apache.geode.InvalidDeltaException;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/delta_propagation/implementing_delta_propagation.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/delta_propagation/implementing_delta_propagation.html.md.erb b/developing/delta_propagation/implementing_delta_propagation.html.md.erb
index 8a8a0a0..7727532 100644
--- a/developing/delta_propagation/implementing_delta_propagation.html.md.erb
+++ b/developing/delta_propagation/implementing_delta_propagation.html.md.erb
@@ -2,7 +2,7 @@
 title:  Implementing Delta Propagation
 ---
 
-By default, delta propagation is enabled in your distributed system. When enabled, delta propagation is used for objects that implement `com.gemstone.gemfire.Delta`. You program the methods to store and extract delta information for your entries and to apply received delta information.
+By default, delta propagation is enabled in your distributed system. When enabled, delta propagation is used for objects that implement `org.apache.geode.Delta`. You program the methods to store and extract delta information for your entries and to apply received delta information.
 
 <a id="implementing_delta_propagation__section_877AC61D691C44078A782683F90D169B"></a>
 Use the following procedure to implement delta propagation in your distributed system.
@@ -10,7 +10,7 @@ Use the following procedure to implement delta propagation in your distributed s
 1.  Study your object types and expected application behavior to determine which regions can benefit from using delta propagation. Delta propagation does not improve performance for all data and data modification scenarios. See [When to Avoid Delta Propagation](when_to_use_delta_prop.html#when_to_use_delta_prop).
 2.  For each region where you are using delta propagation, choose whether to enable cloning using the delta propagation property `cloning-enabled`. Cloning is disabled by default. See [Delta Propagation Properties](delta_propagation_properties.html#delta_propagation_properties).
 3.  If you do not enable cloning, review all associated listener code for dependencies on `EntryEvent.getOldValue`. Without cloning, Geode modifies the entry in place and so loses its reference to the old value. For delta events, the `EntryEvent` methods `getOldValue` and `getNewValue` both return the new value.
-4.  For every class where you want delta propagation, implement `com.gemstone.gemfire.Delta` and update your methods to support delta propagation. Exactly how you do this depends on your application and object needs, but these steps describe the basic approach:
+4.  For every class where you want delta propagation, implement `org.apache.geode.Delta` and update your methods to support delta propagation. Exactly how you do this depends on your application and object needs, but these steps describe the basic approach:
     1.  If the class is a plain old Java object (POJO), wrap it for this implementation and update your code to work with the wrapper class.
     2.  Define as transient any extra object fields that you use to manage delta state. This can help performance when the full object is distributed. Whenever standard Java serialization is used, the transient keyword indicates to Java to not serialize the field.
     3.  Study the object contents to decide how to handle delta changes. Delta propagation has the same issues of distributed concurrency control as the distribution of full objects, but on a more detailed level. Some parts of your objects may be able to change independent of one another while others may always need to change together. Send deltas large enough to keep your data logically consistent. If, for example, field A and field B depend on each other, then your delta distributions should either update both fields or neither. As with regular updates, the fewer producers you have on a data region, the lower your likelihood of concurrency issues.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/distributed_regions/how_distribution_works.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/distributed_regions/how_distribution_works.html.md.erb b/developing/distributed_regions/how_distribution_works.html.md.erb
index 65092f7..bbc7522 100644
--- a/developing/distributed_regions/how_distribution_works.html.md.erb
+++ b/developing/distributed_regions/how_distribution_works.html.md.erb
@@ -6,7 +6,7 @@ To use distributed and replicated regions, you should understand how they work a
 
 <a id="how_distribution_works__section_2F892A4987C547E68CA78067133C2C2C"></a>
 **Note:**
-The management of replicated and distributed regions supplements the general information for managing data regions provided in [Basic Configuration and Programming](../../basic_config/book_intro.html). See also `com.gemstone.gemfire.cache.PartitionAttributes`.
+The management of replicated and distributed regions supplements the general information for managing data regions provided in [Basic Configuration and Programming](../../basic_config/book_intro.html). See also `org.apache.geode.cache.PartitionAttributes`.
 
 A distributed region automatically sends entry value updates to remote caches and receives updates from them.
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/distributed_regions/locking_in_global_regions.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/distributed_regions/locking_in_global_regions.html.md.erb b/developing/distributed_regions/locking_in_global_regions.html.md.erb
index 9974c6c..6a6e030 100644
--- a/developing/distributed_regions/locking_in_global_regions.html.md.erb
+++ b/developing/distributed_regions/locking_in_global_regions.html.md.erb
@@ -10,10 +10,10 @@ In regions with global scope, locking helps ensure cache consistency.
 Locking of regions and entries is done in two ways:
 
 1.  **Implicit**. Geode automatically locks global regions and their data entries during most operations. Region invalidation and destruction do not acquire locks.
-2.  **Explicit**. You can use the API to explicitly lock the region and its entries. Do this to guarantee atomicity in tasks with multi-step distributed operations. The `Region` methods `com.gemstone.gemfire.cache.Region.getDistributedLock` and `com.gemstone.gemfire.cache.Region.getRegionDistributedLock` return instances of `java.util.concurrent.locks.Lock` for a region and a specified key.
+2.  **Explicit**. You can use the API to explicitly lock the region and its entries. Do this to guarantee atomicity in tasks with multi-step distributed operations. The `Region` methods `org.apache.geode.cache.Region.getDistributedLock` and `org.apache.geode.cache.Region.getRegionDistributedLock` return instances of `java.util.concurrent.locks.Lock` for a region and a specified key.
 
     **Note:**
-    You must use the `Region` API to lock regions and region entries. Do not use the `DistributedLockService` in the `com.gemstone.gemfire.distributed` package. That service is available only for locking in arbitrary distributed applications. It is not compatible with the `Region` locking methods.
+    You must use the `Region` API to lock regions and region entries. Do not use the `DistributedLockService` in the `org.apache.geode.distributed` package. That service is available only for locking in arbitrary distributed applications. It is not compatible with the `Region` locking methods.
 
 ## <a id="locking_in_global_regions__section_5B47F9C5C27A4B789A3498AC553BB1FB" class="no-quick-link"></a>Lock Timeouts
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/distributed_regions/managing_distributed_regions.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/distributed_regions/managing_distributed_regions.html.md.erb b/developing/distributed_regions/managing_distributed_regions.html.md.erb
index 2dd1f73..f36d8ca 100644
--- a/developing/distributed_regions/managing_distributed_regions.html.md.erb
+++ b/developing/distributed_regions/managing_distributed_regions.html.md.erb
@@ -7,7 +7,7 @@ Plan the configuration and ongoing management of your distributed, replicated, a
 <a id="configure_distributed_region__section_11E9E1B3EB5845D9A4FB226A992B8D0D"></a>
 Before you begin, understand [Basic Configuration and Programming](../../basic_config/book_intro.html).
 
-1.  Choose the region shortcut setting that most closely matches your region configuration. See **`com.gemstone.gemfire.cache.RegionShortcut`** or [Region Shortcuts](../../reference/topics/chapter_overview_regionshortcuts.html#concept_ymp_rkz_4dffhdfhk). To create a replicated region, use one of the `REPLICATE` shortcut settings. To create a preloaded region, set your region `data-policy` to `preloaded`. This `cache.xml` declaration creates a replicated region:
+1.  Choose the region shortcut setting that most closely matches your region configuration. See **`org.apache.geode.cache.RegionShortcut`** or [Region Shortcuts](../../reference/topics/chapter_overview_regionshortcuts.html#concept_ymp_rkz_4dffhdfhk). To create a replicated region, use one of the `REPLICATE` shortcut settings. To create a preloaded region, set your region `data-policy` to `preloaded`. This `cache.xml` declaration creates a replicated region:
 
     ``` pre
     <region-attributes refid="REPLICATE"> 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/events/filtering_multisite_events.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/events/filtering_multisite_events.html.md.erb b/developing/events/filtering_multisite_events.html.md.erb
index 76086da..a46d18e 100644
--- a/developing/events/filtering_multisite_events.html.md.erb
+++ b/developing/events/filtering_multisite_events.html.md.erb
@@ -28,13 +28,13 @@ You install a `GatewayEventFilter` implementation to a configured gateway sender
     <cache>
       <gateway-sender id="remoteA" parallel="true" remote-distributed-system-id="1"> 
         <gateway-event-filter>
-          <class-name>com.gemstone.gemfire.util.SampleEventFilter</class-name>
+          <class-name>org.apache.geode.util.SampleEventFilter</class-name>
           <parameter name="param1">
             <string>"value1"</string>
           </parameter>
         </gateway-event-filter>
         <gateway-transport-filter>
-          <class-name>com.gemstone.gemfire.util.SampleTransportFilter</class-name>
+          <class-name>org.apache.geode.util.SampleTransportFilter</class-name>
           <parameter name="param1">
             <string>"value1"</string>
           </parameter>
@@ -48,7 +48,7 @@ You install a `GatewayEventFilter` implementation to a configured gateway sender
       ...
       <gateway-receiver start-port="1530" end-port="1551"> 
         <gateway-transport-filter>
-          <class-name>com.gemstone.gemfire.util.SampleTransportFilter</class-name>
+          <class-name>org.apache.geode.util.SampleTransportFilter</class-name>
           <parameter name="param1">
             <string>"value1"</string>
           </parameter>
@@ -61,15 +61,15 @@ You install a `GatewayEventFilter` implementation to a configured gateway sender
 
     ``` pre
     gfsh>create gateway-sender --id=remoteA --parallel=true --remote-distributed-id="1" 
-    --gateway-event-filter=com.gemstone.gemfire.util.SampleEventFilter 
-    --gateway-transport-filter=com.gemstone.gemfire.util.SampleTransportFilter
+    --gateway-event-filter=org.apache.geode.util.SampleEventFilter 
+    --gateway-transport-filter=org.apache.geode.util.SampleTransportFilter
     ```
 
     See [create gateway-sender](../../tools_modules/gfsh/command-pages/create.html#topic_hg2_bjz_ck).
 
     ``` pre
     gfsh>create gateway-receiver --start-port=1530 --end-port=1551 \
-    --gateway-transport-filter=com.gemstone.gemfire.util.SampleTransportFilter
+    --gateway-transport-filter=org.apache.geode.util.SampleTransportFilter
     ```
 
     **Note:**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/events/implementing_cache_event_handlers.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/events/implementing_cache_event_handlers.html.md.erb b/developing/events/implementing_cache_event_handlers.html.md.erb
index 5473623..583fcdc 100644
--- a/developing/events/implementing_cache_event_handlers.html.md.erb
+++ b/developing/events/implementing_cache_event_handlers.html.md.erb
@@ -13,11 +13,11 @@ Write-behind cache listeners are created by extending the `AsyncEventListener` i
 **Procedure**
 
 1.  Decide which events your application needs to handle. For each region, decide which events you want to handle. For the cache, decide whether to handle transaction events.
-2.  For each event, decide which handlers to use. The `*Listener` and `*Adapter` classes in `com.gemstone.gemfire.cache.util` show the options.
+2.  For each event, decide which handlers to use. The `*Listener` and `*Adapter` classes in `org.apache.geode.cache.util` show the options.
 3.  Program each event handler:
 
     1.  Extend the handler's adapter class.
-    2.  If you want to declare the handler in the `cache.xml`, implement the `com.gemstone.gemfire.cache.Declarable` interface as well.
+    2.  If you want to declare the handler in the `cache.xml`, implement the `org.apache.geode.cache.Declarable` interface as well.
     3.  Implement the handler's callback methods as needed by your application.
 
         **Note:**
@@ -27,9 +27,9 @@ Write-behind cache listeners are created by extending the `AsyncEventListener` i
 
         ``` pre
         package myPackage;
-        import com.gemstone.gemfire.cache.Declarable;
-        import com.gemstone.gemfire.cache.EntryEvent;
-        import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
+        import org.apache.geode.cache.Declarable;
+        import org.apache.geode.cache.EntryEvent;
+        import org.apache.geode.cache.util.CacheListenerAdapter;
         import java.util.Properties;
                                 
         public class MyCacheListener extends CacheListenerAdapter implements Declarable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/events/list_of_event_handlers_and_events.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/events/list_of_event_handlers_and_events.html.md.erb b/developing/events/list_of_event_handlers_and_events.html.md.erb
index 7524d91..5f63db1 100644
--- a/developing/events/list_of_event_handlers_and_events.html.md.erb
+++ b/developing/events/list_of_event_handlers_and_events.html.md.erb
@@ -44,7 +44,7 @@ Use either cache handlers or membership handlers in any single application. Do n
 </tr>
 <tr>
 <td><code class="ph codeph">ClientMembershipListener</code>
-<p>(com.gemstone.gemfire.management .membership.ClientMembershipListener)</p></td>
+<p>(org.apache.geode.management .membership.ClientMembershipListener)</p></td>
 <td><code class="ph codeph">ClientMembershipEvent</code></td>
 <td>One of the interfaces that replaces the deprecated Admin APIs. You can use the ClientMembershipListener to receive membership events only about clients. This listener's callback methods are invoked when this process detects connection changes to clients. Callback methods include <code class="ph codeph">memberCrashed</code>, <code class="ph codeph">memberJoined</code>, <code class="ph codeph">memberLeft</code> (graceful exit).</td>
 </tr>
@@ -60,7 +60,7 @@ Use either cache handlers or membership handlers in any single application. Do n
 </tr>
 <tr>
 <td><code class="ph codeph">MembershipListener</code>
-<p>(com.gemstone.gemfire.management .membership.MembershipListener)</p></td>
+<p>(org.apache.geode.management .membership.MembershipListener)</p></td>
 <td><code class="ph codeph">MembershipEvent</code></td>
 <td>Use this interface to receive membership events only about peers. This listener's callback methods are invoked when peer members join or leave the Geode distributed system. Callback methods include <code class="ph codeph">memberCrashed</code>, <code class="ph codeph">memberJoined</code>, and <code class="ph codeph">memberLeft</code> (graceful exit).</td>
 </tr>
@@ -86,7 +86,7 @@ Extends <code class="ph codeph">CacheCallback</code> interface. Installed in cac
 </tr>
 <tr>
 <td><code class="ph codeph">UniversalMembershipListenerAdapter</code>
-<p>(com.gemstone.gemfire .management.membership .UniversalMembershipListenerAdapter)</p></td>
+<p>(org.apache.geode .management.membership .UniversalMembershipListenerAdapter)</p></td>
 <td><code class="ph codeph">MembershipEvent</code> and <code class="ph codeph">ClientMembershipEvent</code></td>
 <td>One of the interfaces that replaces the deprecated Admin APIs. Provides a wrapper for MembershipListener and ClientMembershipListener callbacks for both clients and peers.</td>
 </tr>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/events/resolving_multisite_conflicts.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/events/resolving_multisite_conflicts.html.md.erb b/developing/events/resolving_multisite_conflicts.html.md.erb
index eb06260..31fe7a3 100644
--- a/developing/events/resolving_multisite_conflicts.html.md.erb
+++ b/developing/events/resolving_multisite_conflicts.html.md.erb
@@ -17,7 +17,7 @@ A `GatewayConflictResolver` implementation is called only for update events that
 
 1.  Program the event handler:
     1.  Create a class that implements the `GatewayConflictResolver` interface.
-    2.  If you want to declare the handler in `cache.xml`, implement the `com.gemstone.gemfire.cache.Declarable` interface as well.
+    2.  If you want to declare the handler in `cache.xml`, implement the `org.apache.geode.cache.Declarable` interface as well.
     3.  Implement the handler's `onEvent()` method to determine whether the WAN event should be allowed. `onEvent()` receives both a `TimestampedEntryEvent` and a `GatewayConflictHelper` instance. `TimestampedEntryEvent` has methods for obtaining the timestamp and distributed system ID of both the update event and the current region entry. Use methods in the `GatewayConflictHelper` to either disallow the update event (retaining the existing region entry value) or provide an alternate value.
 
         **Example:**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/events/writing_callbacks_that_modify_the_cache.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/events/writing_callbacks_that_modify_the_cache.html.md.erb b/developing/events/writing_callbacks_that_modify_the_cache.html.md.erb
index 6ad9526..299fd87 100644
--- a/developing/events/writing_callbacks_that_modify_the_cache.html.md.erb
+++ b/developing/events/writing_callbacks_that_modify_the_cache.html.md.erb
@@ -34,10 +34,10 @@ public void afterCreate(EntryEvent event) {
       try {
         otherRegion.create(key, val);
       }
-      catch (com.gemstone.gemfire.cache.RegionDestroyedException e) {
+      catch (org.apache.geode.cache.RegionDestroyedException e) {
         ...
       }
-      catch (com.gemstone.gemfire.cache.EntryExistsException e) {
+      catch (org.apache.geode.cache.EntryExistsException e) {
         ...
       }
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/eviction/configuring_data_eviction.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/eviction/configuring_data_eviction.html.md.erb b/developing/eviction/configuring_data_eviction.html.md.erb
index 9b13265..42f3dbd 100644
--- a/developing/eviction/configuring_data_eviction.html.md.erb
+++ b/developing/eviction/configuring_data_eviction.html.md.erb
@@ -19,7 +19,7 @@ Configure data eviction as follows. You do not need to perform these steps in th
     -   Overflow the entry data to disk. See [Persistence and Overflow](../storing_data_on_disk/chapter_overview.html).
 
 3.  Decide the maximum amount of data to allow in the member for the eviction measurement indicated. This is the maximum for all storage for the region in the member. For partitioned regions, this is the total for all buckets stored in the member for the region - including any secondary buckets used for redundancy.
-4.  Decide whether to program a custom sizer for your region. If you are able to provide such a class, it might be faster than the standard sizing done by Geode. Your custom class must follow the guidelines for defining custom classes and, additionally, must implement `com.gemstone.gemfire.cache.util.ObjectSizer`. See [Requirements for Using Custom Classes in Data Caching](../../basic_config/data_entries_custom_classes/using_custom_classes.html).
+4.  Decide whether to program a custom sizer for your region. If you are able to provide such a class, it might be faster than the standard sizing done by Geode. Your custom class must follow the guidelines for defining custom classes and, additionally, must implement `org.apache.geode.cache.util.ObjectSizer`. See [Requirements for Using Custom Classes in Data Caching](../../basic_config/data_entries_custom_classes/using_custom_classes.html).
 
 **Note:**
 You can also configure Regions using the gfsh command-line interface, however, you cannot configure `eviction-attributes` using gfsh. See [Region Commands](../../tools_modules/gfsh/quick_ref_commands_by_area.html#topic_EF03119A40EE492984F3B6248596E1DD) and [Disk Store Commands](../../tools_modules/gfsh/quick_ref_commands_by_area.html#topic_1ACC91B493EE446E89EC7DBFBBAE00EA).
@@ -48,7 +48,7 @@ Examples:
     <partition-attributes local-max-memory="512" total-num-buckets="13"/>
     <eviction-attributes>
        <lru-memory-size action="local-destroy"/>
-       <class-name>com.gemstone.gemfire.cache.util.ObjectSizer
+       <class-name>org.apache.geode.cache.util.ObjectSizer
        </class-name>
     </eviction-attributes>
   </region-attributes>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/expiration/configuring_data_expiration.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/expiration/configuring_data_expiration.html.md.erb b/developing/expiration/configuring_data_expiration.html.md.erb
index 96c6a67..0fae74a 100644
--- a/developing/expiration/configuring_data_expiration.html.md.erb
+++ b/developing/expiration/configuring_data_expiration.html.md.erb
@@ -26,7 +26,7 @@ Configure the type of expiration and the expiration action to use.
     ```
 
 -   Override the region-wide settings for specific entries, if required by your application. To do this:
-    1.  Program a custom expiration class that implements `com.gemstone.gemfire.cache.CustomExpiry`. Example:
+    1.  Program a custom expiration class that implements `org.apache.geode.cache.CustomExpiry`. Example:
 
         ``` pre
         // Custom expiration class

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/function_exec/function_execution.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/function_exec/function_execution.html.md.erb b/developing/function_exec/function_execution.html.md.erb
index 6a7404e..8cb9f0e 100644
--- a/developing/function_exec/function_execution.html.md.erb
+++ b/developing/function_exec/function_execution.html.md.erb
@@ -14,7 +14,7 @@ Main tasks:
 
 ## <a id="function_execution__section_7D43B0C628D54F579D5C434D3DF69B3C" class="no-quick-link"></a>Write the Function Code
 
-To write the function code, you implement the `Function` interface or extend the `FunctionAdapter` class. Both are in the `com.gemstone.gemfire.cache.execute` package. The adapter class provides some default implementations for methods, which you can override.
+To write the function code, you implement the `Function` interface or extend the `FunctionAdapter` class. Both are in the `org.apache.geode.cache.execute` package. The adapter class provides some default implementations for methods, which you can override.
 
 Code the methods you need for the function. These steps do not have to be done in this order.
 
@@ -52,10 +52,10 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import com.gemstone.gemfire.cache.execute.FunctionAdapter;
-import com.gemstone.gemfire.cache.execute.FunctionContext;
-import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
-import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
+import org.apache.geode.cache.execute.FunctionAdapter;
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.cache.execute.RegionFunctionContext;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
 
 public class MultiGetFunction extends FunctionAdapter {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/function_exec/how_function_execution_works.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/function_exec/how_function_execution_works.html.md.erb b/developing/function_exec/how_function_execution_works.html.md.erb
index 54608e8..19959e8 100644
--- a/developing/function_exec/how_function_execution_works.html.md.erb
+++ b/developing/function_exec/how_function_execution_works.html.md.erb
@@ -16,7 +16,7 @@ You can execute data-independent functions or data-dependent functions in Geode
 
 -   **On a region\u2014**If you are executing a data-dependent function, specify a region and, optionally, a set of keys on which to run the function. The method `FunctionService.onRegion()` directs a data-dependent function to execute on a specific region.
 
-See the `com.gemstone.gemfire.cache.execute.FunctionService` Java API documentation for more details.
+See the `org.apache.geode.cache.execute.FunctionService` Java API documentation for more details.
 
 ## <a id="how_function_execution_works__section_E0C4B7D2E4414F099788A5A441FF0E03" class="no-quick-link"></a>How Functions Are Executed
 
@@ -37,7 +37,7 @@ When a failure (such as an execution error or member crash while executing) occu
 3.  Calling the result collector\u2019s `clearResults` method
 4.  Executing the function
 
-For client regions, the system retries the execution according to `com.gemstone.gemfire.cache.client.Pool` `retryAttempts`. If the function fails to run every time, the final exception is returned to the `getResult` method.
+For client regions, the system retries the execution according to `org.apache.geode.cache.client.Pool` `retryAttempts`. If the function fails to run every time, the final exception is returned to the `getResult` method.
 
 For member calls, the system retries until either it succeeds or no data remains in the system for the function to operate on.
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/outside_data_sources/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/outside_data_sources/chapter_overview.html.md.erb b/developing/outside_data_sources/chapter_overview.html.md.erb
index 5953f31..fc4f5ac 100644
--- a/developing/outside_data_sources/chapter_overview.html.md.erb
+++ b/developing/outside_data_sources/chapter_overview.html.md.erb
@@ -7,7 +7,7 @@ Apache Geode has application plug-ins to read data into the cache and write it o
 <a id="outside_data_sources__section_100B707BB812430E8D9CFDE3BE4698D1"></a>
 The application plug-ins:
 
-1.  Load data on cache misses using an implementation of a `com.gemstone.gemfire.cache.CacheLoader`. The `CacheLoader.load` method is called when the `get` operation can't find the value in the cache. The value returned from the loader is put into the cache and returned to the `get` operation. You might use this in conjunction with data expiration to get rid of old data, and your other data loading applications, which might be prompted by events in the outside data source. See [Configure Data Expiration](../expiration/configuring_data_expiration.html).
+1.  Load data on cache misses using an implementation of a `org.apache.geode.cache.CacheLoader`. The `CacheLoader.load` method is called when the `get` operation can't find the value in the cache. The value returned from the loader is put into the cache and returned to the `get` operation. You might use this in conjunction with data expiration to get rid of old data, and your other data loading applications, which might be prompted by events in the outside data source. See [Configure Data Expiration](../expiration/configuring_data_expiration.html).
 2.  Write data out to the data source using the cache event handlers, `CacheWriter` and `CacheListener`. For implementation details, see [Implementing Cache Event Handlers](../events/implementing_cache_event_handlers.html).
     -   `CacheWriter` is run synchronously. Before performing any operation on a region entry, if any cache writers are defined for the region in the distributed system, the system invokes the most convenient writer. In partitioned and distributed regions, cache writers are usually defined in only a subset of the caches holding the region - often in only one cache. The cache writer can abort the region entry operation.
     -   `CacheListener` is run synchronously after the cache is updated. This listener works only on local cache events, so install your listener in every cache where you want it to handle events. You can install multiple cache listeners in any of your caches.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/outside_data_sources/implementing_data_loaders.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/outside_data_sources/implementing_data_loaders.html.md.erb b/developing/outside_data_sources/implementing_data_loaders.html.md.erb
index 155dfaf..2b65b44 100644
--- a/developing/outside_data_sources/implementing_data_loaders.html.md.erb
+++ b/developing/outside_data_sources/implementing_data_loaders.html.md.erb
@@ -11,9 +11,9 @@ To program a data loader and configure your region to use it:
 ## <a id="implementing_data_loaders__section_88076AF5EC184FE88AAF4C806A0CA9DF" class="no-quick-link"></a>Program your loader
 To program your loader:
 
-1.  Implement `com.gemstone.gemfire.cache.CacheLoader`.
+1.  Implement `org.apache.geode.cache.CacheLoader`.
 
-2.  If you want to declare the loader in your `cache.xml`, implement the `com.gemstone.gemfire.cache.Declarable` interface as well.
+2.  If you want to declare the loader in your `cache.xml`, implement the `org.apache.geode.cache.Declarable` interface as well.
 
 3.  Program the single `CacheLoader` `load` method to do whatever your application requires for retrieving the value from outside the cache. If you need to run `Region` API calls from your loader, spawn separate threads for them. Do not make direct calls to `Region` methods from your load method implementation as it could cause the cache loader to block, hurting the performance of the distributed system. For example:
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/partitioned_regions/moving_partitioned_data.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/partitioned_regions/moving_partitioned_data.html.md.erb b/developing/partitioned_regions/moving_partitioned_data.html.md.erb
index 4632ac9..054f7fe 100644
--- a/developing/partitioned_regions/moving_partitioned_data.html.md.erb
+++ b/developing/partitioned_regions/moving_partitioned_data.html.md.erb
@@ -32,7 +32,7 @@ source = sourceMembers.iterator().next();
 PartitionRegionHelper.moveBucketByKey(r, source, destination, product);
 ```
 
-See the Java API documentation for `com.gemstone.gemfire.cache.partition.PartitionRegionHelper.moveBucketByKey` for more details.
+See the Java API documentation for `org.apache.geode.cache.partition.PartitionRegionHelper.moveBucketByKey` for more details.
 
 The `moveData` method moves data up to a given percentage (measured in bytes) from a source member to a destination member. For example, you could use this method to move a specified percentage of data from an overloaded member to another member to improve distribution.
 
@@ -52,7 +52,7 @@ DistributedMember destination = ds.findDistributedMember(destName);
 PartitionRegionHelper.moveData(r, source, destination, 20);
 ```
 
-See the Java API documentation for `com.gemstone.gemfire.cache.partition.PartitionRegionHelper.moveData` for more details.
+See the Java API documentation for `org.apache.geode.cache.partition.PartitionRegionHelper.moveData` for more details.
 
 For more information on partitioned regions and rebalancing, see [Partitioned Regions](chapter_overview.html).
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/partitioned_regions/using_custom_partition_resolvers.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/partitioned_regions/using_custom_partition_resolvers.html.md.erb b/developing/partitioned_regions/using_custom_partition_resolvers.html.md.erb
index 477ca2c..df9e4b3 100644
--- a/developing/partitioned_regions/using_custom_partition_resolvers.html.md.erb
+++ b/developing/partitioned_regions/using_custom_partition_resolvers.html.md.erb
@@ -10,7 +10,7 @@ If you are colocating data between regions and custom partitioning the data in t
 
 <a id="custom_partition_region_data__section_1D7043815DF24308ABE4C78BFDFEE686"></a>
 
-For standard partitioning, use `com.gemstone.gemfire.cache.PartitionResolver`. To implement fixed partitioning, use `com.gemstone.gemfire.cache.FixedPartitionResolver`.
+For standard partitioning, use `org.apache.geode.cache.PartitionResolver`. To implement fixed partitioning, use `org.apache.geode.cache.FixedPartitionResolver`.
 
 <a id="custom_partition_region_data__section_5A8D752F02834146A37D9430F1CA32DA"></a>
 
@@ -22,7 +22,7 @@ For standard partitioning, use `com.gemstone.gemfire.cache.PartitionResolver`. T
 
 **Procedure**
 
-1.  Using `com.gemstone.gemfire.cache.PartitionResolver` (standard partitioning) or `com.gemstone.gemfire.cache.FixedPartitionResolver` (fixed partitioning), implement the standard partitioning resolver or the fixed partitioning resolver in one of the following locations, listed here in the search order used by Geode:
+1.  Using `org.apache.geode.cache.PartitionResolver` (standard partitioning) or `org.apache.geode.cache.FixedPartitionResolver` (fixed partitioning), implement the standard partitioning resolver or the fixed partitioning resolver in one of the following locations, listed here in the search order used by Geode:
     -   **Custom class**. You provide this class as the partition resolver to the region creation.
     -   **Entry key**. You use the implementing key object for every operation on the region entries.
     -   **Cache callback argument**. This implementation restricts you to using methods that accept a cache callback argument to manage the region entries. For a full list of the methods that take a callback argument, see the `Region` Javadocs.
@@ -57,7 +57,7 @@ For standard partitioning, use `com.gemstone.gemfire.cache.PartitionResolver`. T
 4.  For fixed partitioning only, program and configure additional fixed partitioning pieces:
     1.  Set the fixed partition attributes for each member.
 
-        These attributes define the data stored for the region by the member and must be different for different members. See `com.gemstone.gemfire.cache.FixedPartitionAttributes` for definitions of the attributes. Define each `partition-name` in your data host members for the region. For each partition name, in the member you want to host the primary copy, define it with `is-primary` set to `true`. In every member you want to host the secondary copy, define it with `is-primary` set to `false` (the default). The number of secondaries must match the number of redundant copies you have defined for the region. See [Configure High Availability for a Partitioned Region](configuring_ha_for_pr.html).
+        These attributes define the data stored for the region by the member and must be different for different members. See `org.apache.geode.cache.FixedPartitionAttributes` for definitions of the attributes. Define each `partition-name` in your data host members for the region. For each partition name, in the member you want to host the primary copy, define it with `is-primary` set to `true`. In every member you want to host the secondary copy, define it with `is-primary` set to `false` (the default). The number of secondaries must match the number of redundant copies you have defined for the region. See [Configure High Availability for a Partitioned Region](configuring_ha_for_pr.html).
 
         **Note:**
         Buckets for a partition are hosted only by the members that have defined the partition name in their `FixedPartitionAttributes`.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/query_index/create_multiple_indexes.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/query_index/create_multiple_indexes.html.md.erb b/developing/query_index/create_multiple_indexes.html.md.erb
index a45f6d2..a629349 100644
--- a/developing/query_index/create_multiple_indexes.html.md.erb
+++ b/developing/query_index/create_multiple_indexes.html.md.erb
@@ -27,7 +27,7 @@ If index creation fails, you may receive an error message in gfsh similar to the
 
 ``` pre
 gfsh>create defined indexes
-Exception : com.gemstone.gemfire.cache.query.RegionNotFoundException , 
+Exception : org.apache.geode.cache.query.RegionNotFoundException , 
 Message : Region ' /r3' not found: from  /r3Occurred on following members
 1. india(s1:17866)<v1>:27809
 ```

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/developing/querying_basics/running_a_query.html.md.erb
----------------------------------------------------------------------
diff --git a/developing/querying_basics/running_a_query.html.md.erb b/developing/querying_basics/running_a_query.html.md.erb
index cb213e4..c17dbed 100644
--- a/developing/querying_basics/running_a_query.html.md.erb
+++ b/developing/querying_basics/running_a_query.html.md.erb
@@ -9,7 +9,7 @@ The QueryService instance you should use depends on whether you are querying the
 
 ## <a id="running_a_querying__section_8B9C3F5BFBA6421A81EEB404DBE512C2" class="no-quick-link"></a>Querying a Local Cache
 
-To query the application's local cache or to query other members, use `com.gemstone.gemfire.cache.Cache.getQueryService`.
+To query the application's local cache or to query other members, use `org.apache.geode.cache.Cache.getQueryService`.
 
 **Sample Code**
 
@@ -35,7 +35,7 @@ To query the application's local cache or to query other members, use `com.gemst
 
 ## <a id="running_a_querying__section_BAD35A249F784095857CC6848F91F6A4" class="no-quick-link"></a>Querying a Server Cache from a Client
 
-To perform a client to server query, use `com.gemstone.gemfire.cache.client.Pool.getQueryService`.
+To perform a client to server query, use `org.apache.geode.cache.client.Pool.getQueryService`.
 
 **Sample Code**