You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by km...@apache.org on 2017/03/22 20:12:42 UTC

[2/2] geode-native git commit: GEODE-2513 Unbrand section on Remote Querying

GEODE-2513 Unbrand section on Remote Querying

- Corrected typos along the way
- Added prose to identify when links take the reader to
the Geode manual


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

Branch: refs/heads/develop
Commit: b7183eb907a01bbd964352c5cc28689bf4ab1980
Parents: d480999
Author: Karen Miller <km...@pivotal.io>
Authored: Tue Mar 21 10:47:06 2017 -0700
Committer: Karen Miller <km...@pivotal.io>
Committed: Wed Mar 22 13:12:33 2017 -0700

----------------------------------------------------------------------
 .../master_middleman/source/subnavs/geode-nc-nav.erb  |  4 ++--
 .../91-quickintro/1-quickintro-overview.html.md.erb   | 10 ++++------
 .../2-quickintro-querycodeexamples.html.md.erb        | 13 +++++++------
 .../3-quickintro-requirements.html.md.erb             | 10 ++++------
 .../4-quickintro-exampleportfolioregion.html.md.erb   |  4 ++--
 .../41-quickintro-query-portfolioregion.html.md.erb   |  5 ++---
 .../92-querylanguage/2-accessingdata.html.md.erb      |  5 ++---
 .../21-basic-region-access.html.md.erb                | 12 +++++++-----
 .../1-querystring-overview.html.md.erb                |  6 +++---
 .../93-querystrings/4-where-clause.html.md.erb        |  2 +-
 .../8-query-language-elements.html.md.erb             |  4 ++--
 .../93-querystrings/8a-method-invocation.html.md.erb  |  4 ++--
 .../8b-query-lang-literals.html.md.erb                |  4 ++--
 .../94-indexes/indexes-overview.html.md.erb           |  2 +-
 .../1-remote-query-api-overview.html.md.erb           |  4 ++--
 .../2-create-manage-queries.html.md.erb               |  2 --
 .../2-query-code-examples-resultset.html.md.erb       |  2 +-
 .../remote-querying/remote-querying.html.md.erb       | 14 +++++++-------
 18 files changed, 51 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb b/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb
index bea210e..ce33e1e 100644
--- a/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb
+++ b/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb
@@ -644,7 +644,7 @@ limitations under the License.
                                 </ul>
                             </li>
                             <li class="has_submenu">
-                                <a href="/docs/guide-native/11/remote-querying/93-querystrings/1-querystring-overview.html">Using Query Strings in the Native Client</a>
+                                <a href="/docs/guide-native/11/remote-querying/93-querystrings/1-querystring-overview.html">Using Query Strings in the Client</a>
                                 <ul>
                                     <li class="has_submenu">
                                         <a href="/docs/guide-native/11/remote-querying/93-querystrings/3-from-clause.html">FROM Clause</a>
@@ -704,7 +704,7 @@ limitations under the License.
                                         <a href="/docs/guide-native/11/remote-querying/93-querystrings/8a-method-invocation.html">Method Invocation</a>
                                     </li>
                                     <li>
-                                        <a href="/docs/guide-native/11/remote-querying/93-querystrings/8b-query-lang-literals.html">Query Language Literals Supported by Native Client</a>
+                                        <a href="/docs/guide-native/11/remote-querying/93-querystrings/8b-query-lang-literals.html">Supported Query Language Literals</a>
                                     </li>
                                     <li>
                                         <a href="/docs/guide-native/11/remote-querying/93-querystrings/8c-type-conversions.html">Type Conversions</a>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/91-quickintro/1-quickintro-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/91-quickintro/1-quickintro-overview.html.md.erb b/docs/geode-native-docs/remote-querying/91-quickintro/1-quickintro-overview.html.md.erb
index 5117006..033ffcf 100644
--- a/docs/geode-native-docs/remote-querying/91-quickintro/1-quickintro-overview.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/91-quickintro/1-quickintro-overview.html.md.erb
@@ -19,16 +19,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-Use the Geode native client query API to query your cached data stored on a Geode cache server. The query is evaluated and executed on the cache server, and the results are returned to the native client.
+Use the client query API to query your cached data stored on a cache server. The query is evaluated and executed on the cache server, and the results are returned to the client.
 
 You can also optimize your queries by defining indexes on the cache server.
 
 The query language for the native client is essentially a subset of OQL (ODMG 3.0 Object Data Management Group, [http://www.odmg.org](http://www.odmg.org).), which is based on SQL-92. OQL is a SQL-like language with extended functionality for querying complex objects, object attributes, and methods.
 
-It is assumed that you have general familiarity with SQL querying and indexing, and with the information on the native client cache.
+This section assumes that you have general familiarity with SQL querying and indexing, and with the information on the client cache.
 
-The C++ and .NET API documentation for the native client provides extensive details for all of the querying interfaces, classes and methods at [http://gemfire-apis.docs.pivotal.io](http://gemfire-apis.docs.pivotal.io).
+Query language features and grammar are described in the Geode manual at [Querying](geodeman/developing/querying_basics/chapter_overview.html). This section describes areas that are unique to the native client.
 
-Query language features and grammar are described at [Querying](geodeman/developing/querying_basics/chapter_overview.html). This section describes areas that are unique to the native client.
-
-If you are using the pool API, you should obtain the QueryService from the pool . For information about the pool API, see [Native Client Pool API](../../connection-pools/native-client-pool-api.html#native-client-pool-api).
+If you are using the pool API, you should obtain the QueryService from the pool. For information about the pool API, see [Client Pool API](../../connection-pools/native-client-pool-api.html#native-client-pool-api).

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/91-quickintro/2-quickintro-querycodeexamples.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/91-quickintro/2-quickintro-querycodeexamples.html.md.erb b/docs/geode-native-docs/remote-querying/91-quickintro/2-quickintro-querycodeexamples.html.md.erb
index f37dc4d..8634310 100644
--- a/docs/geode-native-docs/remote-querying/91-quickintro/2-quickintro-querycodeexamples.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/91-quickintro/2-quickintro-querycodeexamples.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title:  Executing a Query from the Native Client
+title:  Executing a Query from the Client
 ---
 
 <!--
@@ -19,15 +19,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-C\#/.NET and C++ examples show how to execute a query from the native client.
+This
+.NET and C++ example uses the example `portfolios` region to show how to execute a query from the client.
 
 **Note:**
 In all queries that use the example data, it is assumed that the `portfolios` region has `javaobject.Portfolio` objects on the cache server.
 
-1.  If you are using the C++ native client, get a pointer to the `QueryService` method.
-2.  Create a `QueryPtr` to a query (C++) or create a query instance (C\# .NET) that is compatible with the OQL specification.
-3.  Use the `execute` method for the `Query` interface to submit the query string to the cache server. The server remotely evaluates the query string and returns the results to the client.
-4.  You can iterate through the returned objects as part of the query process.
+-  If you are using the C++ client, get a pointer to the `QueryService` method.
+-  Create a `QueryPtr` to a query (C++) or create a query instance (.NET) that is compatible with the OQL specification.
+-  Use the `execute` method for the `Query` interface to submit the query string to the cache server. The server remotely evaluates the query string and returns the results to the client.
+-  You can iterate through the returned objects as part of the query process.
 
 ## <a id="security__section_15C6689C363B469B947B177E1DE73208" class="no-quick-link"></a>C\#/.NET Example
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/91-quickintro/3-quickintro-requirements.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/91-quickintro/3-quickintro-requirements.html.md.erb b/docs/geode-native-docs/remote-querying/91-quickintro/3-quickintro-requirements.html.md.erb
index 42c128d..2b67941 100644
--- a/docs/geode-native-docs/remote-querying/91-quickintro/3-quickintro-requirements.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/91-quickintro/3-quickintro-requirements.html.md.erb
@@ -23,11 +23,11 @@ Note the particular requirements for using region endpoints; setting server regi
 
 ## <a id="security__section_AB5CC1F7CA1949FEA8A35687BC486F10" class="no-quick-link"></a>Using Region Endpoints
 
-When you are using region endpoints, at least one region must exist on the native client before a query can be executed through the client. All objects in the region belong to the same class hierarchy (homogenous types).
+When you are using region endpoints, at least one region must exist on the client before a query can be executed through the client. All objects in the region belong to the same class hierarchy (homogenous types).
 
 ## <a id="security__section_A619799378B14214AF922D819907FF38" class="no-quick-link"></a>Setting Server Region Data Policy and Scope
 
-Native client remote querying only accesses the data that is available in the remote cache server region, so no local cache loading operations are performed. Depending on the cache server region's scope and data-policy attribute settings, this could mean that your queries and indexes only see a part of the data available for the server region in the distributed cache.
+Remote querying only accesses the data that is available in the remote cache server region, so no local cache loading operations are performed. Depending on the cache server region's scope and data-policy attribute settings, this could mean that your queries and indexes only see a part of the data available for the server region in the distributed cache.
 
 To ensure a complete data set for your queries and indexes, your cache server region must use one of the REPLICATE region shortcut settings in the region attribute refid or it must explicitly have its data policy set to replicate or persistent-replicate .
 
@@ -35,7 +35,7 @@ For a cache server region, setting its data policy to replicate or `persistent-r
 
 Depending on your use of the server cache, the non-global distributed scopes `distributed-ack` and `distributed-no-ack `may encounter race conditions during entry distribution that cause the data set to be out of sync with the distributed region. The global scope guarantees data consistency across the distributed system, but at the cost of reduced performance.
 
-The following table summarizes the effects of cache server region scope and data policy settings on the data available to your querying and indexing operations. For more information, see [Distributed and Replicated Regions](geodeman/developing/distributed_regions/chapter_overview.html).
+The following table summarizes the effects of cache server region scope and data policy settings on the data available to your querying and indexing operations. For more information, see the server's documentation on [Distributed and Replicated Regions](geodeman/developing/distributed_regions/chapter_overview.html).
 
 <a id="security__table_92A6A66523764199A19BCD66BA189921"></a>
 
@@ -47,9 +47,7 @@ The following table summarizes the effects of cache server region scope and data
 
 ## <a id="security__section_18C174BB0B2A4F23B9A78F872FA220C4" class="no-quick-link"></a>Implementing the equals and hashcode Methods
 
-The `Portfolio` and `Position` query objects for the cache server must have the `equals` and `hashCode` methods implemented, and those methods must provide the properties and behavior mentioned in the online documentation for `Object.equals` and `Object.hashCode`. Inconsistent query results can occur if these methods are absent.
-
-See the `Object` class description in the Java API documentation for more information about the equals and hashCode methods.
+The `Portfolio` and `Position` query objects for the cache server must have the `equals` and `hashCode` methods implemented, and those methods must provide the properties and behavior for Java `Object.equals` and `Object.hashCode`. Inconsistent query results can occur if these methods are absent.
 
 ## <a id="security__section_407A315F22014CD8A0BC622454789888" class="no-quick-link"></a>Setting Object Type Constraints
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/91-quickintro/4-quickintro-exampleportfolioregion.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/91-quickintro/4-quickintro-exampleportfolioregion.html.md.erb b/docs/geode-native-docs/remote-querying/91-quickintro/4-quickintro-exampleportfolioregion.html.md.erb
index fe3b64e..620bdee 100644
--- a/docs/geode-native-docs/remote-querying/91-quickintro/4-quickintro-exampleportfolioregion.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/91-quickintro/4-quickintro-exampleportfolioregion.html.md.erb
@@ -19,9 +19,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-Examples show C++ and corresponding Java class definitions and sample data for the example `portfolios` region. The region's keys are the portfolio ID.
+This extended example is used throughout the section to show C++ and corresponding Java class definitions and sample data for the example `portfolios` region. The region's keys are the portfolio ID.
 
-User-defined data types must implement the `Serializable` interface on the native client side, while corresponding Java classes must implement the `DataSerializable` interface. The C++ objects for the native client must correspond to the Java objects for the Geode cache server. This means that an object on one side should deserialize correctly at the other side.
+User-defined data types must implement the `Serializable` interface on the client side, while corresponding Java classes must implement the `DataSerializable` interface. The C++ objects for the client must correspond to the Java objects for the Geode cache server. This means that an object on one side should deserialize correctly at the other side.
 
 **Sample C++ class definition**
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/91-quickintro/41-quickintro-query-portfolioregion.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/91-quickintro/41-quickintro-query-portfolioregion.html.md.erb b/docs/geode-native-docs/remote-querying/91-quickintro/41-quickintro-query-portfolioregion.html.md.erb
index 85ac9da..cb1f84b 100644
--- a/docs/geode-native-docs/remote-querying/91-quickintro/41-quickintro-query-portfolioregion.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/91-quickintro/41-quickintro-query-portfolioregion.html.md.erb
@@ -19,9 +19,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-Examples show a sampling of specific queries that you can run against `portfolios` on the server.
-
-The query results for the data are listed in the table. For the first several, the coding examples are included as well to show how you can execute the queries using the API.
+The `porfolios` example continues, showing a sampling of specific queries.
+The query results for the data are listed in the table. For the first several, the coding examples are included as well to show how to execute the queries using the API.
 
 ## <a id="running-native-client-xact__section_2EA54E860ACB48259484B555CA065E98" class="no-quick-link"></a>Get distinct positions from portfolios with at least a $25.00 market value
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/92-querylanguage/2-accessingdata.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/92-querylanguage/2-accessingdata.html.md.erb b/docs/geode-native-docs/remote-querying/92-querylanguage/2-accessingdata.html.md.erb
index 80acc7a..cb5bb9d 100644
--- a/docs/geode-native-docs/remote-querying/92-querylanguage/2-accessingdata.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/92-querylanguage/2-accessingdata.html.md.erb
@@ -19,13 +19,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-Accessing your cached data through the querying service is similar to accessing database contents through SQL queries. How you specify your regions and region contents is particular to the native client.
+Accessing your cached data through the querying service is similar to accessing database contents through SQL queries. How you specify your regions and region contents is particular to the client.
 
 The query language supports drilling down into nested object structures. Regions can contain nested data collections that are unavailable until referenced in the FROM clause.
 
-This discussion describes how to navigate to your cached data through the native client query service.
+This discussion describes how to navigate to your cached data through the client query service.
 
-**Note:**
 Querying and indexing only operate on remote cache server contents.
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/92-querylanguage/21-basic-region-access.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/92-querylanguage/21-basic-region-access.html.md.erb b/docs/geode-native-docs/remote-querying/92-querylanguage/21-basic-region-access.html.md.erb
index bf75113..e5ce724 100644
--- a/docs/geode-native-docs/remote-querying/92-querylanguage/21-basic-region-access.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/92-querylanguage/21-basic-region-access.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-In the context of a query, you specify the name of a region by its full path, starting with a forward slash (/ ).
+In the context of a query, specify the name of a region by its full path, starting with a forward slash (/ ).
 
 ## <a id="security__section_789E081192A74B00B0E726EDC1C574C4" class="no-quick-link"></a>Object Attributes
 
@@ -41,8 +41,10 @@ You can also access entry keys and entry data through the region:
 -   `/portfolios.keySet` returns the `Set` of entry keys in the region
 -   `/portfolios.entrySet` returns the `Set` of `Region.Entry` objects
 -   `/portfolios.values` returns the Collection of entry values
--   `/portfolios` return the Collection of entry values
-    **Note:**
-    These collections are immutable. Invoking modifier methods on them, such as `add` and `remove`, result in an `UnsupportedOperationException`.
+-   `/portfolios` return the Collection of entry values.
 
-For the last two bullets, the FROM clause `/portfolios.values` and `/portfolios` return the same thing.
+The FROM clause `/portfolios.values` and `/portfolios` return the same 
+thing.
+Note that these collections are immutable.
+Invoking modifier methods on them, such as `add` and `remove`,
+result in an `UnsupportedOperationException`.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/93-querystrings/1-querystring-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/93-querystrings/1-querystring-overview.html.md.erb b/docs/geode-native-docs/remote-querying/93-querystrings/1-querystring-overview.html.md.erb
index ab5e331..9312a9a 100644
--- a/docs/geode-native-docs/remote-querying/93-querystrings/1-querystring-overview.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/93-querystrings/1-querystring-overview.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title:  Using Query Strings in the Native Client
+title:  Using Query Strings in the Client
 ---
 
 <!--
@@ -19,10 +19,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-To use a query string in a native client, specify the string as a parameter in a `QueryService::newQuery` method, then execute the query using `Query::execute`, passing in the required parameters.
+To use a query string in a client, specify the string as a parameter in a `QueryService::newQuery` method, then execute the query using `Query::execute`, passing in the required parameters.
 
 Alternatively, if an expression evaluates to a boolean value, you can specify it using the region shortcut methods `Region::existsValue`, `Region::selectValue`, and `Region::query`. These shortcut methods evaluate whether given expressions return any entries and return a single value entry, respectively. See [Region Shortcut Query Methods](../95-remotequeryapi/2-create-manage-queries.html#running-native-client-xact__section_0F92AD1BDB29426BB24CD41F5A0FAB78) for more information about these shortcut methods.
 
-If your query requires any `IMPORT` statements, you must include these before the `SELECT` statement in the query string that is passed to the query engine. It should be a fully qualified package name relative to the cache server. The Java class definition must exist and have the exact footprint as the native client C++ class.
+If your query requires any `IMPORT` statements, you must include these before the `SELECT` statement in the query string that is passed to the query engine. It should be a fully qualified package name relative to the cache server. The Java class definition must exist and have the same signature as the client C++ class.
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/93-querystrings/4-where-clause.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/93-querystrings/4-where-clause.html.md.erb b/docs/geode-native-docs/remote-querying/93-querystrings/4-where-clause.html.md.erb
index 4d4ba85..4aefdec 100644
--- a/docs/geode-native-docs/remote-querying/93-querystrings/4-where-clause.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/93-querystrings/4-where-clause.html.md.erb
@@ -23,7 +23,7 @@ The optional WHERE clause defines the search criteria for the selection, filteri
 
 Without a WHERE clause, the SELECT projection list receives the entire collection or set of collections as specified in the FROM clause.
 
-The query processor searches the collection for elements that match the conditions specified in the WHERE clause conditions. If there is an index on an expression matched by the WHERE clause, then the query processor may use the index to optimize the search and avoid iterating over the entire collection. For more information on indexes, see [Advanced Querying](geodeman/developing/query_additional/advanced_querying.html).
+The query processor searches the collection for elements that match the conditions specified in the WHERE clause conditions. If there is an index on an expression matched by the WHERE clause, then the query processor may use the index to optimize the search and avoid iterating over the entire collection. 
 
 A WHERE clause expression is a boolean condition that is evaluated for each element in the collection. If the expression evaluates to true for an element, the query processor passes that element on to the SELECT projection list. This example uses the WHERE clause to return the portfolio objects in the region that have a type xyz .
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/93-querystrings/8-query-language-elements.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/93-querystrings/8-query-language-elements.html.md.erb b/docs/geode-native-docs/remote-querying/93-querystrings/8-query-language-elements.html.md.erb
index 8277995..9a2b1a2 100644
--- a/docs/geode-native-docs/remote-querying/93-querystrings/8-query-language-elements.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/93-querystrings/8-query-language-elements.html.md.erb
@@ -25,9 +25,9 @@ This section discusses various aspects and tools of the native client query engi
 
     The query language supports method invocation inside query expressions.
 
--   **[Query Language Literals Supported by Native Client](8b-query-lang-literals.html)**
+-   **[Supported Query Language Literals](8b-query-lang-literals.html)**
 
-    Query language expressions can contain literals as well as operators and attribute names. The native client supports many types of literals.
+    Query language expressions can contain literals as well as operators and attribute names. The client supports many types of literals.
 
 -   **[Type Conversions](8c-type-conversions.html)**
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/93-querystrings/8a-method-invocation.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/93-querystrings/8a-method-invocation.html.md.erb b/docs/geode-native-docs/remote-querying/93-querystrings/8a-method-invocation.html.md.erb
index 12fbcf0..6011e90 100644
--- a/docs/geode-native-docs/remote-querying/93-querystrings/8a-method-invocation.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/93-querystrings/8a-method-invocation.html.md.erb
@@ -24,12 +24,12 @@ The query language supports method invocation inside query expressions.
 <a id="security__section_9EB15A373E8C41E1A1C40981588A4DFB"></a>
 
 The query processor maps attributes in query strings using the attribute rules described in [Object Attributes](../92-querylanguage/21-basic-region-access.html#security__section_789E081192A74B00B0E726EDC1C574C4). Methods declared to return `void` evaluate to `null` when invoked through the query processor.
-If you know that the attribute name maps to a public method that takes no parameters, you can simply include the method name in the query string as an attribute. For example, `emps.isEmpty` is equivalent to `emps.isEmpty`() . In the following example, the query invokes `isEmpty` on positions, and returns the set of all portfolios with no positions.
+If you know that the attribute name maps to a public method that takes no parameters, you can simply include the method name in the query string as an attribute. For example, `emps.isEmpty` is equivalent to `emps.isEmpty()` . In the following example, the query invokes `isEmpty` on positions, and returns the set of all portfolios with no positions.
 
 ``` pre
 SELECT DISTINCT * FROM /portfolios WHERE positions.isEmpty
 ```
 
-The native client also supports the invocation of public methods with parameters. To invoke methods with parameters, include the method name as an attribute in the query string and provide the method arguments between parentheses. You can only use constants in the query strings.
+The client also supports the invocation of public methods with parameters. To invoke methods with parameters, include the method name as an attribute in the query string and provide the method arguments between parentheses. You can only use constants in the query strings.
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/93-querystrings/8b-query-lang-literals.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/93-querystrings/8b-query-lang-literals.html.md.erb b/docs/geode-native-docs/remote-querying/93-querystrings/8b-query-lang-literals.html.md.erb
index c3edcc3..11d7dc4 100644
--- a/docs/geode-native-docs/remote-querying/93-querystrings/8b-query-lang-literals.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/93-querystrings/8b-query-lang-literals.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title:  Query Language Literals Supported by Native Client
+title:  Supported Query Language Literals
 ---
 
 <!--
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-Query language expressions can contain literals as well as operators and attribute names. The native client supports many types of literals.
+Query language expressions can contain literals as well as operators and attribute names. The client supports many types of literals.
 
 -   `boolean`. Boolean value, either `TRUE` or `FALSE`.
 -   `integer` and `long`. Type `long` if it is suffixed with the ASCII letter L. Otherwise it is of type `int`.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/94-indexes/indexes-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/94-indexes/indexes-overview.html.md.erb b/docs/geode-native-docs/remote-querying/94-indexes/indexes-overview.html.md.erb
index 608107f..b7dda4c 100644
--- a/docs/geode-native-docs/remote-querying/94-indexes/indexes-overview.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/94-indexes/indexes-overview.html.md.erb
@@ -43,4 +43,4 @@ You can create an index for remote querying declaratively on the cache server in
    <entry> . . .
 ```
 
-For detailed information about working with indexes configured on a cache server, see the section [Working with Indexes](geodeman/developing/query_index/query_index.html).
+For detailed information about working with indexes configured on a cache server, see [Working with Indexes](geodeman/developing/query_index/query_index.html) within the server's documentation.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/95-remotequeryapi/1-remote-query-api-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/95-remotequeryapi/1-remote-query-api-overview.html.md.erb b/docs/geode-native-docs/remote-querying/95-remotequeryapi/1-remote-query-api-overview.html.md.erb
index a10ece9..eb1a911 100644
--- a/docs/geode-native-docs/remote-querying/95-remotequeryapi/1-remote-query-api-overview.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/95-remotequeryapi/1-remote-query-api-overview.html.md.erb
@@ -19,9 +19,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-You use the native client querying API to access all the querying functionality discussed in the previous sections.
+You use the querying API to access all the querying functionality discussed in the previous sections.
 
-This section gives a general overview of the interfaces and classes that are provided by the Query package API, and the shortcut methods provided in the Region interface. For complete, current information on the classes and interfaces discussed here, see the native client API documentation.
+This section gives a general overview of the interfaces and classes that are provided by the Query package API, and the shortcut methods provided in the Region interface.
 
 -   **[Creating and Managing Queries](2-create-manage-queries.html)**
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/95-remotequeryapi/2-create-manage-queries.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/95-remotequeryapi/2-create-manage-queries.html.md.erb b/docs/geode-native-docs/remote-querying/95-remotequeryapi/2-create-manage-queries.html.md.erb
index 0af60bc..266283e 100644
--- a/docs/geode-native-docs/remote-querying/95-remotequeryapi/2-create-manage-queries.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/95-remotequeryapi/2-create-manage-queries.html.md.erb
@@ -59,5 +59,3 @@ The `Region` interface has several shortcut query methods. All take a `query` pr
     bool entryExists
     = region->existsValue("'type' = 'QQQ' ");
     ```
-
-For more information about these shortcut query methods, see the Region class description in the native client API documentation.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/96-progexamples/2-query-code-examples-resultset.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/96-progexamples/2-query-code-examples-resultset.html.md.erb b/docs/geode-native-docs/remote-querying/96-progexamples/2-query-code-examples-resultset.html.md.erb
index 77709ff..378914a 100644
--- a/docs/geode-native-docs/remote-querying/96-progexamples/2-query-code-examples-resultset.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/96-progexamples/2-query-code-examples-resultset.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-API examples demonstrate methods for returning `ResultSet` for both built-in and user-fined data types.
+API examples demonstrate methods for returning `ResultSet` for both built-in and user-defined data types.
 
 **Query Returns a ResultSet for a Built-In Data Type**
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/b7183eb9/docs/geode-native-docs/remote-querying/remote-querying.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/remote-querying.html.md.erb b/docs/geode-native-docs/remote-querying/remote-querying.html.md.erb
index d083da6..c1233e7 100644
--- a/docs/geode-native-docs/remote-querying/remote-querying.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/remote-querying.html.md.erb
@@ -19,26 +19,26 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-*Remote Querying* documents remote querying from the native client to the Geode cache server. Using examples and procedures, it describes how to use the APIs to run queries against cached data; work with query strings in the native client; create and manage queries; and create indexes.
+This section documents remote querying from the client to the server. Using examples and procedures, it describes how to use the APIs to run queries against cached data, work with query strings in the client, create and manage queries, and create indexes.
 
 -   **[Remote Querying Basics](91-quickintro/1-quickintro-overview.html)**
 
-    Use the Geode native client query API to query your cached data stored on a Geode cache server. The query is evaluated and executed on the cache server, and the results are returned to the native client.
+    Use the client query API to query your cached data stored on a cache server. The query is evaluated and executed on the cache server, and the results are returned to the client.
 
--   **[Using Query Strings in the Native Client](93-querystrings/1-querystring-overview.html)**
+-   **[Using Query Strings in the Client](93-querystrings/1-querystring-overview.html)**
 
-    To use a query string in a native client, specify the string as a parameter in a `QueryService::newQuery` method, then execute the query using `Query::execute`, passing in the required parameters.
+    To use a query string in a client, specify the string as a parameter in a `QueryService::newQuery` method, then execute the query using `Query::execute`, passing in the required parameters.
 
 -   **[Accessing Cached Data](92-querylanguage/2-accessingdata.html)**
 
-    Accessing your cached data through the querying service is similar to accessing database contents through SQL queries. How you specify your regions and region contents is particular to the native client.
+    Accessing your cached data through the querying service is similar to accessing database contents through SQL queries. How you specify your regions and region contents is particular to the client.
 
 -   **[Query Language Elements](93-querystrings/8-query-language-elements.html)**
 
-    This section discusses various aspects and tools of the native client query engine.
+    This section discusses various aspects and tools of the client query engine.
 
 -   **[Remote Query API](95-remotequeryapi/1-remote-query-api-overview.html)**
 
-    You use the native client querying API to access all the querying functionality discussed in the previous sections.
+    You use the client querying API to access all the querying functionality discussed in the previous sections.