Merge branch 'release/1.8' of github.com:apache/geode-native into release/1.8
diff --git a/docs/geode-native-docs/getting-started/getting-started-nc-client.html.md.erb b/docs/geode-native-docs/getting-started/getting-started-nc-client.html.md.erb
index 2644d1b..cd552fe 100644
--- a/docs/geode-native-docs/getting-started/getting-started-nc-client.html.md.erb
+++ b/docs/geode-native-docs/getting-started/getting-started-nc-client.html.md.erb
@@ -23,19 +23,17 @@
on the cluster.
The client API establishes a pool of these network connections for your client application to use.
-You can choose whether to use a large, remote, production-quality cluster; a small, local,
-development cluster; or something in-between, such as a testing or experimental lab installation.
-
-In the _<%=vars.product_name%> User's Guide_,
-see [Configuring and Running a Cluster](/serverman/configuring/chapter_overview.html)
-and [Client/Server Configuration](/serverman/topologies_and_comm/cs_configuration/chapter_overview.html) for instructions on setting up and starting the cluster for a client/server configuration.
+In the _<%=vars.product_name%> User's Guide_, see [Configuring and Running a Cluster](/serverman/configuring/chapter_overview.html)
+and [Client/Server Configuration](/serverman/topologies_and_comm/cs_configuration/chapter_overview.html) for
+instructions on setting up and starting the cluster for a client/server configuration.
### <a id="connecting_to_server"></a>Connecting to the Server
To connect to a server, your application must follow these steps:
-1. Instantiate a `CacheFactory`, setting characteristics of interest (for example, `log-level`).
-1. Create a cache and use it to instantiate a `PoolFactory`, specifying the hostname and port for the server locator.
+1. Instantiate a `CacheFactory`, setting properties of interest (for example, `log-level`).
+1. Create a cache and use it to instantiate a `PoolFactory`.
+1. Using the PoolFactory, specify the hostname and port for the server locator.
1. Create a named pool of network connections.
1. Instantiate a region of the desired type (usually CACHING_PROXY or PROXY) and connect it by name to its counterpart on the server.
@@ -116,8 +114,6 @@
The `examples` directory contains CMake files and a `cpp` subdirectory containing C++ examples.
The Windows build also includes a `dotnet` subdirectory containing C# examples.
-CMake files are located at each level of the directory structure to allow examples to be built individually or in groups.
-
The directory structure resembles this hierarchy (some entries are omitted for clarity):
MyProject/
diff --git a/docs/geode-native-docs/regions/regions.html.md.erb b/docs/geode-native-docs/regions/regions.html.md.erb
index fc719c0..40131b3 100644
--- a/docs/geode-native-docs/regions/regions.html.md.erb
+++ b/docs/geode-native-docs/regions/regions.html.md.erb
@@ -163,7 +163,5 @@
## <a id="getting-region-size"></a>Getting the Region Size
The `Region` API provides a `size` method (`Size` property for .NET) that gets the size of a region.
-
For client regions, this gives the number of entries in the local cache, not on the servers.
-
See the `Region` API documentation for details.
diff --git a/docs/geode-native-docs/security/authentication.html.md.erb b/docs/geode-native-docs/security/authentication.html.md.erb
index 2203d6d..9e8eee2 100644
--- a/docs/geode-native-docs/security/authentication.html.md.erb
+++ b/docs/geode-native-docs/security/authentication.html.md.erb
@@ -27,7 +27,8 @@
### .NET Authentication Example
-The following excerpt is taken from the .NET example provided with your Native Client distribution in the `../examples/dotnet/AuthInitialize` directory.
+The following excerpt is taken from the .NET example provided with your Native Client distribution in the `..\examples\dotnet\AuthInitialize` directory.
+In this C# authentication example, credentials are implemented in the GetCredentials member function of the ExampleAuthInitialize class, which implements the IAuthInitialize interface.
In this C# authentication example, the `CacheFactory` creation process sets the authentication callback:
@@ -70,16 +71,8 @@
### C++ Authentication Example
-In this C++ authentication example, the `CacheFactory` creation process sets the authentication callback:
-
-```cpp
- auto cacheFactory = CacheFactory(config);
- auto authInitialize = std::make_shared<UserPasswordAuthInit>();
- cacheFactory.set("log-level", "none");
- cacheFactory.setAuthInitialize(authInitialize);
-```
-
-Credentials are implemented in the `getCredentials` member function of the `AuthInitialize` abstract class.
+[**db**: update from new example]
+In this C++ authentication example, credentials are implemented in the getCredentials member function of the AuthInitialize abstract class.
```cpp
class UserPasswordAuthInit : public AuthInitialize {
diff --git a/docs/geode-native-docs/security/security.html.md.erb b/docs/geode-native-docs/security/security.html.md.erb
index 3bbcc61..516eaaf 100644
--- a/docs/geode-native-docs/security/security.html.md.erb
+++ b/docs/geode-native-docs/security/security.html.md.erb
@@ -34,5 +34,5 @@
- **[TLS/SSL Client/Server Communication Encryption](sslclientserver.html)**
- Communication between client and server must be encrypted so authentication credentials and other transmissions cannot be viewed by third-parties.
+ Communication between client and server should be encrypted so authentication credentials and other transmissions cannot be viewed by third-parties.
