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/29 00:31:21 UTC
[1/3] geode-native git commit: GEODE-2513 Revise docs section on .NET
API per reviews
Repository: geode-native
Updated Branches:
refs/heads/develop 273a1f291 -> 00682c330
GEODE-2513 Revise docs section on .NET API per reviews
- IGFSerializable becomes IGeodeSerializable
- Apache.Geode.Client.dll should be Apache.Geode.dll
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/00682c33
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/00682c33
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/00682c33
Branch: refs/heads/develop
Commit: 00682c3302d894dcd2dcb527014a5d86dbcd9c75
Parents: 226662f
Author: Karen Miller <km...@pivotal.io>
Authored: Tue Mar 28 16:25:32 2017 -0700
Committer: Karen Miller <km...@pivotal.io>
Committed: Tue Mar 28 17:31:12 2017 -0700
----------------------------------------------------------------------
.../source/subnavs/geode-nc-nav.erb | 10 +++++-----
.../custom-class-igfserializable.html.md.erb | 10 +++++-----
.../how-igfserializable-works.html.md.erb | 2 +-
.../implementing-igfserializable.html.md.erb | 16 ++++++++--------
.../dotnet-caching-api/private-assembly.html.md.erb | 10 +++++-----
.../registering-the-type.html.md.erb | 2 +-
.../serializable-types.html.md.erb | 6 +++---
.../serialize-using-igfserializable.html.md.erb | 10 +++++-----
8 files changed, 33 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/00682c33/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 d76a435..6bda757 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
@@ -425,16 +425,16 @@ limitations under the License.
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/guide-native/11/dotnet-caching-api/serialize-using-igfserializable.html">Serialize with the Geode IGFSerializable Interface</a>
+ <a href="/docs/guide-native/11/dotnet-caching-api/serialize-using-igfserializable.html">Serialize with the IGeodeSerializable Interface</a>
<ul>
<li>
<a href="/docs/guide-native/11/dotnet-caching-api/serializable-types.html">Generic and Custom Serializable Types</a>
</li>
<li>
- <a href="/docs/guide-native/11/dotnet-caching-api/how-igfserializable-works.html">How Serialization Works with IGFSerializable</a>
+ <a href="/docs/guide-native/11/dotnet-caching-api/how-igfserializable-works.html">How Serialization Works with IGeodeSerializable</a>
</li>
<li>
- <a href="/docs/guide-native/11/dotnet-caching-api/implementing-igfserializable.html">Implement the IGFSerializable Interface</a>
+ <a href="/docs/guide-native/11/dotnet-caching-api/implementing-igfserializable.html">Implement the IGeodeSerializable Interface</a>
</li>
<li>
<a href="/docs/guide-native/11/dotnet-caching-api/registering-the-type.html">Register the Type</a>
@@ -442,7 +442,7 @@ limitations under the License.
</ul>
</li>
<li>
- <a href="/docs/guide-native/11/dotnet-caching-api/custom-class-igfserializable.html">Using a Custom Class With IGFSerializable</a>
+ <a href="/docs/guide-native/11/dotnet-caching-api/custom-class-igfserializable.html">Using a Custom Class With IGeodeSerializable</a>
</li>
</ul>
</li>
@@ -459,7 +459,7 @@ limitations under the License.
<a href="/docs/guide-native/11/dotnet-caching-api/resolving-the-error.html">Resolving the Error</a>
</li>
<li>
- <a href="/docs/guide-native/11/dotnet-caching-api/private-assembly.html">Using Apache.Geode.Client.dll As a Private Assembly</a>
+ <a href="/docs/guide-native/11/dotnet-caching-api/private-assembly.html">Using Apache.Geode.dll As a Private Assembly</a>
</li>
<li>
<a href="/docs/guide-native/11/dotnet-caching-api/implementing-shared-assembly.html">Implementing the Shared Assembly</a>
http://git-wip-us.apache.org/repos/asf/geode-native/blob/00682c33/docs/geode-native-docs/dotnet-caching-api/custom-class-igfserializable.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/custom-class-igfserializable.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/custom-class-igfserializable.html.md.erb
index d1dcdca..8d6a333 100644
--- a/docs/geode-native-docs/dotnet-caching-api/custom-class-igfserializable.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/custom-class-igfserializable.html.md.erb
@@ -1,5 +1,5 @@
---
-title: Using a Custom Class With IGFSerializable
+title: Using a Custom Class With IGeodeSerializable
---
<!--
@@ -24,7 +24,7 @@ An example shows how to use the `BankAccount` custom key type and the `AccountHi
## Using a BankAccount Object
``` pre
-class AccountHistory : IGFSerializable
+class AccountHistory : IGeodeSerializable
{
#region Private members
private List<string> m_history;
@@ -44,12 +44,12 @@ class AccountHistory : IGFSerializable
{
m_history.Add(entry);
}
- public static IGFSerializable CreateInstance()
+ public static IGeodeSerializable CreateInstance()
{
return new AccountHistory();
}
- #region IGFSerializable Members
- public IGFSerializable FromData(DataInput input)
+ #region IGeodeSerializable Members
+ public IGeodeSerializable FromData(DataInput input)
{
int len = input.ReadInt32();
m_history.Clear();
http://git-wip-us.apache.org/repos/asf/geode-native/blob/00682c33/docs/geode-native-docs/dotnet-caching-api/how-igfserializable-works.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/how-igfserializable-works.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/how-igfserializable-works.html.md.erb
index b2fd411..6008497 100644
--- a/docs/geode-native-docs/dotnet-caching-api/how-igfserializable-works.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/how-igfserializable-works.html.md.erb
@@ -1,5 +1,5 @@
---
-title: How Serialization Works with IGFSerializable
+title: How Serialization Works with IGeodeSerializable
---
<!--
http://git-wip-us.apache.org/repos/asf/geode-native/blob/00682c33/docs/geode-native-docs/dotnet-caching-api/implementing-igfserializable.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/implementing-igfserializable.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/implementing-igfserializable.html.md.erb
index d173c29..e9daee6 100644
--- a/docs/geode-native-docs/dotnet-caching-api/implementing-igfserializable.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/implementing-igfserializable.html.md.erb
@@ -1,5 +1,5 @@
---
-title: Implement the IGFSerializable Interface
+title: Implement the IGeodeSerializable Interface
---
<!--
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-To store your own data types in the cache, you implement the Geode `IGFSerializable` interface.
+To store your own data types in the cache, you implement the Geode `IGeodeSerializable` interface.
Examples follow the procedure.
@@ -45,7 +45,7 @@ Examples follow the procedure.
## Simple BankAccount Class
-This example shows a simple class, `BankAccount`, that encapsulates the two `ints` `customerId` and `accountId`:
+This example shows a simple class, `BankAccount`, that encapsulates the two `ints`, `customerId` and `accountId`:
``` pre
public class BankAccount
@@ -76,10 +76,10 @@ public class BankAccount
## Implementing a Serializable Class
-To make `BankAccount` serializable, you implement the `IGFSerializable` interface as shown in this example:
+To make `BankAccount` serializable, you implement the `IGeodeSerializable` interface as shown in this example:
``` pre
-public class BankAccount : IGFSerializable
+public class BankAccount : IGeodeSerializable
{
private int m_customerId;
private int m_accountId;
@@ -103,17 +103,17 @@ public class BankAccount : IGFSerializable
m_accountId = account;
}
// Our TypeFactoryMethod
- public static IGFSerializable CreateInstance()
+ public static IGeodeSerializable CreateInstance()
{
return new BankAccount(0, 0);
}
- #region IGFSerializable Members
+ #region IGeodeSerializable Members
public void ToData(DataOutput output)
{
output.WriteInt32(m_customerId);
output.WriteInt32(m_accountId);
}
- public IGFSerializable FromData(DataInput input)
+ public IGeodeSerializable FromData(DataInput input)
{
m_customerId = input.ReadInt32();
m_accountId = input.ReadInt32();
http://git-wip-us.apache.org/repos/asf/geode-native/blob/00682c33/docs/geode-native-docs/dotnet-caching-api/private-assembly.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/private-assembly.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/private-assembly.html.md.erb
index f303669..62e9824 100644
--- a/docs/geode-native-docs/dotnet-caching-api/private-assembly.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/private-assembly.html.md.erb
@@ -1,5 +1,5 @@
---
-title: Using Apache.Geode.Client.dll As a Private Assembly
+title: Using Apache.Geode.dll As a Private Assembly
---
<!--
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-To access `Apache.Geode.Client.dll` as a private assembly, you need to specify a `.config` file for your application.
+To access `Apache.Geode.dll` as a private assembly, you need to specify a `.config` file for your application.
The file needs to be the same name as your application, with a `.config` suffix. For example, the `.config` file for `main.exe` would be `main.exe.config`. The two files must reside in the same directory.
@@ -27,7 +27,7 @@ Follow these steps to create a `.config` file:
1. Copy `%GFCPP%/docs/default.exe.config` to the appropriate location.
2. Rename `default.exe.config` to the name of your application.
-3. Change the `href` attribute of the `CodeBase` element to point to your `Apache.Geode.Client.dll` file. Any of three path types \u2013 http, relative, or absolute \u2013 will work.
+3. Change the `href` attribute of the `CodeBase` element to point to your `Apache.Geode.dll` file. Any of three path types \u2013 http, relative, or absolute \u2013 will work.
## A Sample .config File
@@ -39,11 +39,11 @@ The following example shows an excerpt of a `.config` file. The `PublicKeyToken`
<assemblyBinding
xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="Apache.Geode.Client"
+ <assemblyIdentity name="Apache.Geode"
publicKeyToken="126e6338d9f55e0c"
culture="neutral" />
<codeBase version="0.0.0.0"
- href="../../bin/Apache.Geode.Client.dll"/>
+ href="../../bin/Apache.Geode.dll"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
http://git-wip-us.apache.org/repos/asf/geode-native/blob/00682c33/docs/geode-native-docs/dotnet-caching-api/registering-the-type.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/registering-the-type.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/registering-the-type.html.md.erb
index d05eb3c..018b4d6 100644
--- a/docs/geode-native-docs/dotnet-caching-api/registering-the-type.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/registering-the-type.html.md.erb
@@ -41,4 +41,4 @@ If your application uses its own key types that are too complex to easily force
See [Serialization in Native Client Mode with a Java Server](../cpp-caching-api/serialization_using_serializable.html#concept_696AB5206C3E45898CC1A24CDD93D003__section_AFB685227E4048BF9FB4FD7C55AED274) for information about implementing key types for a client that is used with a Java cache server.
-To extend a type that implements `IPdxSerializable` or `IGFSerializable` for your key, override and implement the `HashCode` and `Equals` methods in the key as needed.
+To extend a type that implements `IPdxSerializable` or `IGeodeSerializable` for your key, override and implement the `HashCode` and `Equals` methods in the key as needed.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/00682c33/docs/geode-native-docs/dotnet-caching-api/serializable-types.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/serializable-types.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/serializable-types.html.md.erb
index 33f0f1b..70f84d3 100644
--- a/docs/geode-native-docs/dotnet-caching-api/serializable-types.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/serializable-types.html.md.erb
@@ -21,16 +21,16 @@ limitations under the License.
All built-in generics are automatically registered at initialization. You have a couple of options for complex key types.
-If your application uses more complex key types that you want to make more accessible or easier to handle, you can derive a new class from `IGFSerializable`. Another option is for the application to do its own object serialization using `Byte[]` or a custom type.
+If your application uses more complex key types that you want to make more accessible or easier to handle, you can derive a new class from `IGeodeSerializable`. Another option is for the application to do its own object serialization using `Byte[]` or a custom type.
## <a id="concept_5D520C87F65B48AFA4240615190B0150__section_DA3BCFFFCB974C65BEE953DF3FAA8442" class="no-quick-link"></a>Blobs
-If you have data that is best handled as a blob, such as structs that do not contain pointers, use a `Byte[]` or, if you need something more complex than `Byte[]`, implement a custom type using either `IPdxSerializable` or `IGFSerializable`.
+If you have data that is best handled as a blob, such as structs that do not contain pointers, use a `Byte[]` or, if you need something more complex than `Byte[]`, implement a custom type using either `IPdxSerializable` or `IGeodeSerializable`.
## <a id="concept_5D520C87F65B48AFA4240615190B0150__section_D49865F1CF5F467A9FFAD244D990F3F5" class="no-quick-link"></a>Object Graphs
If you have a graph of objects in which each node can be serializable, the parent node calls `DataOutput.WriteObject` to delegate the serialization responsibility to its child nodes. Similarly, your application calls `DataInput.ReadObject` to deserialize the object graph.
**Note:**
-The Geode `IGFSerializable` interface does not support object graphs with multiple references to the same object. If your application uses these types of circular graphs, you must address this design concern explicitly.
+The Geode `IGeodeSerializable` interface does not support object graphs with multiple references to the same object. If your application uses these types of circular graphs, you must address this design concern explicitly.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/00682c33/docs/geode-native-docs/dotnet-caching-api/serialize-using-igfserializable.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/serialize-using-igfserializable.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/serialize-using-igfserializable.html.md.erb
index 41d81dc..7c7bce8 100644
--- a/docs/geode-native-docs/dotnet-caching-api/serialize-using-igfserializable.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/serialize-using-igfserializable.html.md.erb
@@ -1,5 +1,5 @@
---
-title: Serialize with the Geode IGFSerializable Interface
+title: Serialize with the IGeodeSerializable Interface
---
<!--
@@ -19,19 +19,19 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-The .NET `IGFSerializable` interface provides fast and compact data serialization.
+The .NET `IGeodeSerializable` interface provides fast and compact data serialization.
- **[Generic and Custom Serializable Types](serializable-types.html)**
All built-in generics are automatically registered at initialization. You have a couple of options for complex key types.
-- **[How Serialization Works with IGFSerializable](how-igfserializable-works.html)**
+- **[How Serialization Works with IGeodeSerializable](how-igfserializable-works.html)**
When your application puts an object into the cache for distribution, Geode serializes the data by taking these steps.
-- **[Implement the IGFSerializable Interface](implementing-igfserializable.html)**
+- **[Implement the IGeodeSerializable Interface](implementing-igfserializable.html)**
- To store your own data types in the cache, you implement the Geode `IGFSerializable` interface.
+ To store your own data types in the cache, you implement the Geode `IGeodeSerializable` interface.
- **[Register the Type](registering-the-type.html)**
[2/3] geode-native git commit: GEODE-2513 Unbrand .NET API docs
section
Posted by km...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/using-ipdxinstancefactory.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/using-ipdxinstancefactory.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/using-ipdxinstancefactory.html.md.erb
index f968067..bd46115 100644
--- a/docs/geode-native-docs/dotnet-caching-api/using-ipdxinstancefactory.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/using-ipdxinstancefactory.html.md.erb
@@ -23,103 +23,5 @@ You can use the `IPdxInstanceFactory` to create an `IPdxInstance` from raw data
This option can be useful when you need an instance of a domain class for plug-in code such as a function or a loader. If you have the raw data for the domain object (the class name and each field's type and data), then you can explicitly create a `IPdxInstance`. The `IPdxInstanceFactory` is very similar to the `IPdxWriter` except that after writing each field, you need to call the create method which returns the created `IPdxInstance.`
-## Creating an IPdxInstance with IPdxInstanceFactory
-
-``` pre
-/*
- * The PdxInstance QuickStart Example.
- * This example takes the following steps:
- *
- * This example shows IPdxInstanceFactory and IPdxInstance usage.
- *
- * 1. Create a Cache.
- * 2. Creates the PdxInstanceFactory for Person class.
- * 3. Then creates instance of PdxInstance
- * 4. It does put.
- * 5. Then it does get and access it fields.
- * 6. Close the Cache.
- *
-*/
-// Use standard namespaces
-using System;
-using System.Reflection;
-// Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
-namespace GemStone.GemFire.Cache.Generic.QuickStart {
- public class Person {
- private string name;
- // this is the only field used on server to create hashcode
- // and use in equals method
- [PdxIdentityField]
- private int id;
- private int age;
- public Person() { }
- public Person(string name, int id, int age) {
- this.name = name;
- this.id = id;
- this.age = age;
- }
- #region Public Properties
- public string Name {
- get { return name; }
- }
- public int ID {
- get { return id; }
- }
- public int Age {
- get { return age; }
- }
- #endregion
- }
-
- // The PdxRemoteQuery QuickStart example.
- class PdxInstance {
- static void Main(string[] args) {
- try {
- CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(null);
- Console.WriteLine("Connected to the Distributed System");
- // Create a Cache with the "clientPdxRemoteQuery.xml" Cache XML file.
- // Set SetPdxReadSerialized to true to access PdxInstance
- Cache cache = cacheFactory.Set("cache-xml-file",
- "XMLs/clientPdxInstance.xml").Create();
- Console.WriteLine("Created the Cache");
- // Get the example Region from the Cache which is declared
- // in the Cache XML file.
- IRegion<string, IPdxInstance> region =
- cache.GetRegion<string, IPdxInstance>("Person");
- Console.WriteLine("Obtained the Region from the Cache");
- Person p = new Person("Jack", 7, 21);
- //PdxInstanceFactory for Person class
- IPdxInstanceFactory pif = cache.CreatePdxInstanceFactory("Person");
- pif.WriteString("name", p.Name);
- pif.WriteInt("id", p.ID);
- pif.MarkIdentityField("id");
- pif.WriteInt("age", p.Age);
- IPdxInstance pdxInstance = pif.Create();
- Console.WriteLine("Created PdxInstance for Person class");
- region["Key1"] = pdxInstance;
- Console.WriteLine("Populated PdxInstance Object");
- IPdxInstance retPdxInstance = region["Key1"];
- if ((int)retPdxInstance.GetField("id") == p.ID
- && (int)retPdxInstance.GetField("age") == p.Age
- && (string)retPdxInstance.GetField("name") == p.Name
- && retPdxInstance.IsIdentityField("id") == true)
- Console.WriteLine("PdxInstance returns all fields value expected");
- else
- Console.WriteLine("PdxInstance doesn't returns all fields
- value expected");
-
- // Close the Cache.
- cache.Close();
- Console.WriteLine("Closed the Cache");
- }
- // An exception should not occur
- catch (GemFireException gfex) {
- Console.WriteLine("PdxSerializer Exception: {0}", gfex.Message);
- }
- }
- }
-}
-```
-
+View the PdxInstance QuickStart for an example.
[3/3] geode-native git commit: GEODE-2513 Unbrand .NET API docs
section
Posted by km...@apache.org.
GEODE-2513 Unbrand .NET API docs section
- Remove references to GemFire
- Namespace updates
- Correct typos and capitalization
- Use .NET scoping operator (not C++)
- Avoid duplication in the manual of QuickStart code
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/226662f0
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/226662f0
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/226662f0
Branch: refs/heads/develop
Commit: 226662f075e7ca9a39354ce67eba42bcf0dc0dba
Parents: 273a1f2
Author: Karen Miller <km...@pivotal.io>
Authored: Fri Mar 24 14:20:13 2017 -0700
Committer: Karen Miller <km...@pivotal.io>
Committed: Tue Mar 28 17:31:12 2017 -0700
----------------------------------------------------------------------
.../source/subnavs/geode-nc-nav.erb | 14 +--
.../about_native_client_users_guide.html.md.erb | 4 +-
.../application-callbacks.html.md.erb | 2 +-
.../dotnet-caching-api/cache-apis.html.md.erb | 4 +-
...p-class-to-dotnet-class-mappings.html.md.erb | 66 ++++++------
.../creating-a-cache.html.md.erb | 2 +-
.../creating-a-region.html.md.erb | 12 +--
.../csharp-dotnet-api.html.md.erb | 18 ++--
...csharp-dotnet-naming-conventions.html.md.erb | 4 +-
.../data-serialization-apis.html.md.erb | 6 +-
.../dotnet-accessing-an-entry.html.md.erb | 5 +-
.../dotnet-adding-entry-to-cache.html.md.erb | 2 +-
.../dotnet-application-domains.html.md.erb | 7 +-
.../dotnet-caching-api.html.md.erb | 10 +-
...otnet-data-serialization-options.html.md.erb | 4 +-
.../dotnet-data-serialization.html.md.erb | 2 +-
.../dotnet-pdx-autoserializer.html.md.erb | 2 +-
.../dotnet-pdx-serialization.html.md.erb | 2 -
.../event-handling-apis.html.md.erb | 2 +-
.../implementing-igfserializable.html.md.erb | 6 +-
.../implementing-shared-assembly.html.md.erb | 6 +-
.../object-lifetimes.html.md.erb | 4 +-
.../primary-apis-cache-generic.html.md.erb | 4 +-
.../private-assembly.html.md.erb | 10 +-
.../problem-scenarios.html.md.erb | 10 +-
.../region-entry-apis.html.md.erb | 4 +-
.../registering-the-type.html.md.erb | 2 +-
.../removing-entry.html.md.erb | 14 +--
.../serializable-types.html.md.erb | 1 -
...serialize-using-ipdxserializable.html.md.erb | 12 +--
.../serializing-domain-objects.html.md.erb | 2 +-
...ubleshooting-dotnet-applications.html.md.erb | 17 +---
.../using-ipdxinstancefactory.html.md.erb | 100 +------------------
33 files changed, 117 insertions(+), 243 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/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 73144d9..d76a435 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
@@ -327,10 +327,10 @@ limitations under the License.
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/guide-native/11/dotnet-caching-api/dotnet-caching-api.html">Pivotal GemFire Native Client .NET API</a>
+ <a href="/docs/guide-native/11/dotnet-caching-api/dotnet-caching-api.html">.NET Client API</a>
<ul>
<li class="has_submenu">
- <a href="/docs/guide-native/11/dotnet-caching-api/csharp-dotnet-api.html">About the Native Client .NET API</a>
+ <a href="/docs/guide-native/11/dotnet-caching-api/csharp-dotnet-api.html">About the .NET Client API</a>
<ul>
<li>
<a href="/docs/guide-native/11/dotnet-caching-api/csharp-dotnet-naming-conventions.html">.NET Naming and Usage Conventions</a>
@@ -399,10 +399,10 @@ limitations under the License.
<a href="/docs/guide-native/11/dotnet-caching-api/dotnet-pdx-serialization.html">Serialize with PDX Serialization</a>
<ul>
<li>
- <a href="/docs/guide-native/11/dotnet-caching-api/dotnet-pdx-serialization-features.html">GemFire PDX Serialization Features</a>
+ <a href="/docs/guide-native/11/dotnet-caching-api/dotnet-pdx-serialization-features.html">Geode PDX Serialization Features</a>
</li>
<li>
- <a href="/docs/guide-native/11/dotnet-caching-api/dotnet-pdx-autoserializer.html">Serialize Using the GemFire PDX Autoserializer</a>
+ <a href="/docs/guide-native/11/dotnet-caching-api/dotnet-pdx-autoserializer.html">Serialize Using the Geode PDX Autoserializer</a>
</li>
<li>
<a href="/docs/guide-native/11/dotnet-caching-api/extending-pdx-autoserializer.html">Extend the PDX Autoserializer</a>
@@ -411,7 +411,7 @@ limitations under the License.
<a href="/docs/guide-native/11/dotnet-caching-api/serializing-domain-objects.html">Serialize Your Domain Objects with IPdxSerializer</a>
</li>
<li>
- <a href="/docs/guide-native/11/dotnet-caching-api/serialize-using-ipdxserializable.html">Serialize Using the GemFire IPdxSerializable Interface</a>
+ <a href="/docs/guide-native/11/dotnet-caching-api/serialize-using-ipdxserializable.html">Serialize Using the IPdxSerializable Interface</a>
</li>
<li>
<a href="/docs/guide-native/11/dotnet-caching-api/programming-ipdxinstance.html">Program Your Application to Use IPdxInstance</a>
@@ -425,7 +425,7 @@ limitations under the License.
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/guide-native/11/dotnet-caching-api/serialize-using-igfserializable.html">Serialize with the GemFire IGFSerializable Interface</a>
+ <a href="/docs/guide-native/11/dotnet-caching-api/serialize-using-igfserializable.html">Serialize with the Geode IGFSerializable Interface</a>
<ul>
<li>
<a href="/docs/guide-native/11/dotnet-caching-api/serializable-types.html">Generic and Custom Serializable Types</a>
@@ -459,7 +459,7 @@ limitations under the License.
<a href="/docs/guide-native/11/dotnet-caching-api/resolving-the-error.html">Resolving the Error</a>
</li>
<li>
- <a href="/docs/guide-native/11/dotnet-caching-api/private-assembly.html">Using GemStone.GemFire.Cache.dll As a Private Assembly</a>
+ <a href="/docs/guide-native/11/dotnet-caching-api/private-assembly.html">Using Apache.Geode.Client.dll As a Private Assembly</a>
</li>
<li>
<a href="/docs/guide-native/11/dotnet-caching-api/implementing-shared-assembly.html">Implementing the Shared Assembly</a>
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/about_native_client_users_guide.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/about_native_client_users_guide.html.md.erb b/docs/geode-native-docs/about_native_client_users_guide.html.md.erb
index b04421b..647c728 100644
--- a/docs/geode-native-docs/about_native_client_users_guide.html.md.erb
+++ b/docs/geode-native-docs/about_native_client_users_guide.html.md.erb
@@ -41,9 +41,9 @@ This documentation provides step-by-step procedures for installation, configurat
This section describes the primary classes, and usage conventions for the C++ client API. It demonstrates how to use the API to create caches and perform data serialization. See the [C++ API](/releases/latest/api/cppdocs) documentation for API details.
-- **[Apache Geode Client .NET API](dotnet-caching-api/dotnet-caching-api.html)**
+- **[.NET Client API](dotnet-caching-api/dotnet-caching-api.html)**
- This section describes the primary classes, usage conventions, and C++ to .NET class mappings of the client .NET API. It demonstrates how to use the API to create caches and perform data serialization. The .NET API documentation is available on the [Geode website](http://geode.apache.org/docs/).
+ This section describes the primary classes, usage conventions, and C++ to .NET class mappings of the client .NET API. It demonstrates how to use the API to create caches and perform data serialization. See the [.NET API](/releases/latest/api/dotnetdocs) documentation for API details.
- **[Preserving Data](preserving-data/preserving-data.html)**
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/application-callbacks.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/application-callbacks.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/application-callbacks.html.md.erb
index ad4f3c5..3de8481 100644
--- a/docs/geode-native-docs/dotnet-caching-api/application-callbacks.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/application-callbacks.html.md.erb
@@ -21,7 +21,7 @@ limitations under the License.
For region-level events, an application can use `AttributesFactory.SetCache*` methods to implement and register the `ICacheLoader`, `ICacheWriter`, and `ICacheListener` interfaces to perform custom actions.
-You can use `Region.Put` for simple caching situations. For more complex needs, you should implement the `ICacheLoader` interface and allow the cache to manage the creation and loading of objects. When a `Region.Get` is called for a region entry with a value of null, the `ICacheLoader::Load` method of the cache loader (if any) for the region is invoked. A static `CacheLoader::NetSearch` method is provided which can be used by `ICacheLoader` implementations to locate the requested key in the distributed system. The `ICacheListener` interface can be used to listen to various region events after events such as create, update, or invalidate of region entries have occurred. The `ICacheWriter` interface is invoked before the events have occurred.
+You can use `Region.Put` for simple caching situations. For more complex needs, you should implement the `ICacheLoader` interface and allow the cache to manage the creation and loading of objects. When a `Region.Get` is called for a region entry with a value of null, the `ICacheLoader.Load` method of the cache loader (if any) for the region is invoked. A static `CacheLoader.NetSearch` method is provided which can be used by `ICacheLoader` implementations to locate the requested key in the distributed system. The `ICacheListener` interface can be used to listen to various region events after events such as create, update, or invalidate of region entries have occurred. The `ICacheWriter` interface is invoked before the events have occurred.
## Using ICacheLoader to Load New Integers in the Region
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/cache-apis.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/cache-apis.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/cache-apis.html.md.erb
index 37316ae..551b66d 100644
--- a/docs/geode-native-docs/dotnet-caching-api/cache-apis.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/cache-apis.html.md.erb
@@ -21,7 +21,7 @@ limitations under the License.
This section describes the `CacheFactory` and `Cache` classes.
-- **CacheFactory class**. Creates a `Cache` instance based on the provided distributed system and cache configuration. Any `gfcpp`.properties and `cache.xml` files provided to the application are used to initialize the system and cache. See [Setting System and Cache Properties](../setting-properties/chapter-overview.html#system_and_cache_properties). If a `cache.xml` file is used to create a cache and some of the regions already exist, a warning states that the regions exist and the cache is created.
-- **Cache class**. Entry point to the Geode caching API. This class allows you to create regions. The cache is created by calling the `create` function of the `CacheFactory` class. When creating a cache, you specify a `DistributedSystem` that tells the new cache where to find other caches on the network and how to communicate with them.
+- **CacheFactory class**. Creates a `Cache` instance based on the provided distributed system and cache configuration. Any `geode.properties` and `cache.xml` files provided to the application are used to initialize the system and cache. See [Setting System and Cache Properties](../setting-properties/chapter-overview.html#system_and_cache_properties). If a `cache.xml` file is used to create a cache and some of the regions already exist, a warning states that the regions exist and the cache is created.
+- **Cache class**. This class is the entry point to the Geode caching API. This class allows you to create regions. The cache is created by calling the `create` function of the `CacheFactory` class. When creating a cache, you specify a `DistributedSystem` that tells the new cache where to find other caches on the network and how to communicate with them.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/cpp-class-to-dotnet-class-mappings.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/cpp-class-to-dotnet-class-mappings.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/cpp-class-to-dotnet-class-mappings.html.md.erb
index ffb1f13..e605ef3 100644
--- a/docs/geode-native-docs/dotnet-caching-api/cpp-class-to-dotnet-class-mappings.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/cpp-class-to-dotnet-class-mappings.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Wherever the native C++ class methods use pass-by-reference semantics to return data, the corresponding .NET methods return the object instead of using pass-by-reference semantics.
+Wherever the C++ class methods use pass-by-reference semantics to return data, the corresponding .NET methods return the object instead of using pass-by-reference semantics.
<a id="concept_FD847E19497C4985ACB247C0FA2C2AD5__table_8D8D228E223E4E89A313A17DB5C38652"></a>
@@ -37,121 +37,121 @@ Wherever the native C++ class methods use pass-by-reference semantics to return
</thead>
<tbody>
<tr class="odd">
-<td>class <code class="ph codeph">gemfire::AttributesFactory</code></td>
+<td>class <code class="ph codeph">apache::geode::client::AttributesFactory</code></td>
<td>Sealed class <code class="ph codeph">AttributesFactory</code></td>
</tr>
<tr class="even">
-<td><p>class <code class="ph codeph">gemfire::AttributesMutator</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::AttributesMutator</code></p></td>
<td>Sealed class <code class="ph codeph">AttributesMutator</code></td>
</tr>
<tr class="odd">
-<td>class <code class="ph codeph">gemfire::Cache</code></td>
+<td>class <code class="ph codeph">apache::geode::client::Cache</code></td>
<td>Sealed class <code class="ph codeph">Cache</code></td>
</tr>
<tr class="even">
-<td><p>abstract class <code class="ph codeph">gemfire::Cacheable</code></p></td>
+<td><p>abstract class <code class="ph codeph">apache::geode::client::Cacheable</code></p></td>
<td><p>Interface <code class="ph codeph">IPdxSerializable</code> or interface <code class="ph codeph">IGFSerializable</code></p></td>
</tr>
<tr class="odd">
-<td><p>class <code class="ph codeph">gemfire::CacheableBytes</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::CacheableBytes</code></p></td>
<td><p><code class="ph codeph">Byte[]</code> or <code class="ph codeph">ArrayList<Byte></code></p></td>
</tr>
<tr class="even">
-<td><p>class <code class="ph codeph">gemfire::Cacheableint32</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::Cacheableint32</code></p></td>
<td><p><code class="ph codeph">Int32</code></p></td>
</tr>
<tr class="odd">
-<td><p>class <code class="ph codeph">gemfire::CacheableString</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::CacheableString</code></p></td>
<td><p><code class="ph codeph">String</code></p></td>
</tr>
<tr class="even">
-<td><p>abstract class <code class="ph codeph">gemfire::CacheableKey</code></p></td>
+<td><p>abstract class <code class="ph codeph">apache::geode::client::CacheableKey</code></p></td>
<td><p>You can use any type that implements <code class="ph codeph">hashcode</code> and <code class="ph codeph">equals</code>. The generic .NET built-in types are all suitable.</p></td>
</tr>
<tr class="odd">
-<td><p>abstract class <code class="ph codeph">gemfire::CacheListener</code></p></td>
+<td><p>abstract class <code class="ph codeph">apache::geode::client::CacheListener</code></p></td>
<td><p>Interface <code class="ph codeph">ICacheListener</code></p></td>
</tr>
<tr class="even">
-<td><p>class <code class="ph codeph">gemfire::CacheLoader</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::CacheLoader</code></p></td>
<td><p>Interface <code class="ph codeph">ICacheLoader</code> plus static class <code class="ph codeph">CacheLoader</code></p></td>
</tr>
<tr class="odd">
-<td><p>class <code class="ph codeph">gemfire::CacheWriter</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::CacheWriter</code></p></td>
<td><p>Interface class <code class="ph codeph">ICacheWriter</code></p></td>
</tr>
<tr class="even">
-<td><p>class <code class="ph codeph">gemfire::CacheFactory</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::CacheFactory</code></p></td>
<td><p>Sealed class <code class="ph codeph">CacheFactory</code></p></td>
</tr>
<tr class="odd">
-<td><p>class <code class="ph codeph">gemfire::DataInput</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::DataInput</code></p></td>
<td><p>With <code class="ph codeph">IPdxSerializable</code>, <code class="ph codeph">IPdxReader.</code></p>
<p>With <code class="ph codeph">IGFSerializable</code>, sealed class <code class="ph codeph">DataInput</code>.</p></td>
</tr>
<tr class="even">
-<td><p>class <code class="ph codeph">gemfire::DataOutput</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::DataOutput</code></p></td>
<td><p>With <code class="ph codeph">IPdxSerializable</code>, <code class="ph codeph">IPdxWriter.</code></p>
<p>With <code class="ph codeph">IGFSerializable</code>, sealed class <code class="ph codeph">DataOutput</code> .</p></td>
</tr>
<tr class="odd">
-<td><p>class <code class="ph codeph">gemfire::DiskPolicyType</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::DiskPolicyType</code></p></td>
<td><p>enum <code class="ph codeph">DiskPolicyType</code> plus static class <code class="ph codeph">DiskPolicy</code> containing convenience methods for <code class="ph codeph">DiskPolicyType</code> enumeration</p></td>
</tr>
<tr class="even">
-<td><p>class <code class="ph codeph">gemfire::DistributedSystem</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::DistributedSystem</code></p></td>
<td><p>Sealed class <code class="ph codeph">Distr</code>ibutedSystem</p></td>
</tr>
<tr class="odd">
-<td><p>class <code class="ph codeph">gemfire::EntryEvent</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::EntryEvent</code></p></td>
<td><p>Sealed class <code class="ph codeph">EntryEvent</code></p></td>
</tr>
<tr class="even">
-<td><p>class <code class="ph codeph">gemfire::Exception</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::Exception</code></p></td>
<td><p>Class <code class="ph codeph">GemfireException</code></p></td>
</tr>
<tr class="odd">
-<td><p>all other exceptions deriving from <code class="ph codeph">gemfire::Exception</code></p></td>
+<td><p>all other exceptions deriving from <code class="ph codeph">apache::geode::client::Exception</code></p></td>
<td><p>Corresponding exceptions deriving from <code class="ph codeph">GemfireException</code></p></td>
</tr>
<tr class="even">
-<td><p>class <code class="ph codeph">gemfire::ExpirationAction</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::ExpirationAction</code></p></td>
<td><p>enum <code class="ph codeph">ExpirationAction</code> plus static class <code class="ph codeph">Expiration</code> containing convenience methods for <code class="ph codeph">ExpirationAction</code> enumeration</p></td>
</tr>
<tr class="odd">
-<td><p>class <code class="ph codeph">gemfire::Log</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::Log</code></p></td>
<td><p>Static class <code class="ph codeph">Log</code>. The native <code class="ph codeph">Log::log</code> method is mapped to <code class="ph codeph">Log.Write</code> to avoid the conflict with the class name which is reserved for the constructors of Log class. The various loglevel <code class="ph codeph">Throw</code> or <code class="ph codeph">Catch</code> methods are not implemented, since they are redundant to <code class="ph codeph">Log::Log</code> , <code class="ph codeph">Log::LogThrow</code>, and <code class="ph codeph">Log::LogCatch</code> methods that take <code class="ph codeph">LogLevel</code> as a parameter.</p></td>
</tr>
<tr class="even">
-<td><p>enum <code class="ph codeph">gemfire::MemberType</code></p></td>
+<td><p>enum <code class="ph codeph">apache::geode::client::MemberType</code></p></td>
<td><p>enum <code class="ph codeph">MemberType</code></p></td>
</tr>
<tr class="odd">
-<td><p>abstract class <code class="ph codeph">gemfire::PersistanceManager</code></p></td>
+<td><p>abstract class <code class="ph codeph">apache::geode::client::PersistanceManager</code></p></td>
<td><p>Not provided. You can register a C++ implementation using <code class="ph codeph">AttributesFactory.SetPersistenceManager</code> but you cannot implement a new one in .NET</p></td>
</tr>
<tr class="even">
-<td><p>class <code class="ph codeph">gemfire::Properties</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::Properties</code></p></td>
<td><p>Sealed class <code class="ph codeph">Properties</code></p></td>
</tr>
<tr class="odd">
-<td><p>class <code class="ph codeph">gemfire::Properties::Visitor</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::Properties::Visitor</code></p></td>
<td><p>Delegate <code class="ph codeph">PropertiesVisitor</code></p></td>
</tr>
<tr class="even">
-<td><p>abstract class <code class="ph codeph">gemfire::Region</code></p></td>
+<td><p>abstract class <code class="ph codeph">apache::geode::client::Region</code></p></td>
<td><p>Class <code class="ph codeph">IRegion</code></p></td>
</tr>
<tr class="odd">
-<td><p>class <code class="ph codeph">gemfire::RegionAttributes</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::RegionAttributes</code></p></td>
<td><p>Sealed class <code class="ph codeph">RegionAttributes</code></p></td>
</tr>
<tr class="even">
-<td><p>class <code class="ph codeph">gemfire::ScopeType</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::ScopeType</code></p></td>
<td><p>enum <code class="ph codeph">ScopeType</code> plus static class <code class="ph codeph">Scope</code> containing convenience methods for <code class="ph codeph">ScopeType</code> enumeration+</p></td>
</tr>
<tr class="odd">
-<td><p>abstract class <code class="ph codeph">gemfire::Serializable</code></p></td>
+<td><p>abstract class <code class="ph codeph">apache::geode::client::Serializable</code></p></td>
<td><p>Two options:</p>
<ul>
<li><p>Interface <code class="ph codeph">IPdxSerializable</code></p></li>
@@ -159,11 +159,11 @@ Wherever the native C++ class methods use pass-by-reference semantics to return
</ul></td>
</tr>
<tr class="even">
-<td><p>class <code class="ph codeph">gemfire::SystemProperties</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::SystemProperties</code></p></td>
<td><p>Sealed class <code class="ph codeph">SystemProperties</code></p></td>
</tr>
<tr class="odd">
-<td><p>class <code class="ph codeph">gemfire::UserData</code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::UserData</code></p></td>
<td><p>Two options:</p>
<ul>
<li><p>Interface <code class="ph codeph">IPdxSerializable</code></p></li>
@@ -171,7 +171,7 @@ Wherever the native C++ class methods use pass-by-reference semantics to return
</ul></td>
</tr>
<tr class="even">
-<td><p>class <code class="ph codeph">gemfire::VectorT<T></code></p></td>
+<td><p>class <code class="ph codeph">apache::geode::client::VectorT<T></code></p></td>
<td><p>Array of the given type, such as T[]</p></td>
</tr>
</tbody>
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/creating-a-cache.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/creating-a-cache.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/creating-a-cache.html.md.erb
index 5c63bf1..36bb7ad 100644
--- a/docs/geode-native-docs/dotnet-caching-api/creating-a-cache.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/creating-a-cache.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-You create a cache using the Geode `CacheFactory.Create` call. Cache creation initializes the distributed system and creates the cache using your `geode.properties` and `cache.xml` file settings and any additional properties you provide to the call.
+Create a cache using the `CacheFactory.Create` call. Cache creation initializes the distributed system and creates the cache using the `geode.properties` and `cache.xml` file settings and any additional properties you provide to the call.
See [Setting System and Cache Properties](../setting-properties/chapter-overview.html#system_and_cache_properties) and see [Cache Initialization File](../cache-init-file/chapter-overview.html#chapter-overview).
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/creating-a-region.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/creating-a-region.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/creating-a-region.html.md.erb
index 961549f..5c422e8 100644
--- a/docs/geode-native-docs/dotnet-caching-api/creating-a-region.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/creating-a-region.html.md.erb
@@ -19,15 +19,15 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-To create a region, you create a `RegionFactory` using the `RegionShortcut` that most closely fits your region configuration.
+To create a region, use `RegionFactory` with the `RegionShortcut` that most closely fits the region configuration.
-From that point, you customize the settings for region attributes as needed.
+From that point, customize the settings for region attributes as needed.
-Creating a region using the native client API only creates a proxy client side region. A corresponding region with the same name and path must also exist on the servers that have been configured for client connections and upon which the client will perform its operations.
+Creating a region using the client API only creates a proxy client side region. A corresponding region with the same name and path must also exist on the servers that have been configured for client connections and upon which the client will perform its operations.
## Creating a CACHING\_PROXY Region
-This example creates a region using a CACHING\_PROXY RegionShortcut with no further modifications:
+This example creates a region using the CACHING\_PROXY shortcut with no further modifications:
``` pre
RegionFactory regionFactory =
@@ -39,12 +39,12 @@ IRegion<string, string> region = regionFactory
## Creating a CACHING\_PROXY Region with LRU
-This example creates a region based on the CACHING\_PROXY RegionShortcut with two additional region attributes settings. For information on the settings, see [Region Attributes Descriptions](../client-cache/region-attributes-desc.html#region-attributes-desc).
+This example creates a region based on the CACHING\_PROXY shortcut, modifying values for two region attributes. For information on the settings, see [Region Attributes Descriptions](../client-cache/region-attributes-desc.html#region-attributes-desc).
``` pre
RegionFactory regionFactory =
cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY);
-// Create the example Region programmatically.
+
IRegion<string, string> region = regionFactory
.SetLruEntriesLimit(20000)
.SetInitialCapacity(20000)
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/csharp-dotnet-api.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/csharp-dotnet-api.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/csharp-dotnet-api.html.md.erb
index 6872a9c..71bd750 100644
--- a/docs/geode-native-docs/dotnet-caching-api/csharp-dotnet-api.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/csharp-dotnet-api.html.md.erb
@@ -1,5 +1,5 @@
---
-title: About the Native Client .NET API
+title: About the .NET Client API
---
<!--
@@ -19,13 +19,14 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-The Microsoft .NET Framework interface for the Apache Geode native client provides complete access to the native client C++ functionality from any .NET Framework language (C\#, C++/CLI, VB.NET, and J\#). This enables clients using C\# and other .NET languages to use the capabilities provided by the Geode C++ API.
-The Geode native client uses a set of assemblies managed by the C++ Common Language Infrastructure (C++ CLI). C++ CLI includes the libraries and objects necessary for common language types, and it is the framework for .NET applications.
+The Microsoft .NET Framework interface for the client provides complete access to the C++ client functionality from any .NET Framework language (C\#, C++/CLI, VB.NET, and J\#). This enables clients using C\# and other .NET languages to use the capabilities provided by the C++ API.
-The .NET API for the native client adds .NET Framework CLI language binding for the Geode native client product.
+The .NET client uses a set of assemblies managed by the C++ Common Language Infrastructure (C++ CLI). C++ CLI includes the libraries and objects necessary for common language types, and it is the framework for .NET applications.
-Using C\#, you can write callbacks and define user objects in the cache. The following figure shows an overview of how a C\# application accesses the native client C++ API functionality through C++/CLI .
+The .NET API adds .NET Framework CLI language binding for the native client product.
+
+Using C\#, you can write callbacks and define user objects in the cache. The following figure shows an overview of how a C\# application accesses the C++ client API functionality through C++/CLI .
<a id="concept_A97823CFEA20400BBB135AC964746850__fig_D025097BFCEA4D7ABDB173AD6ABE099D"></a>
<span class="figtitleprefix">Figure: </span>C\# .NET Application Accessing the C++ API
@@ -35,12 +36,9 @@ Using C\#, you can write callbacks and define user objects in the cache. The fol
**Note:**
This chapter uses C\# as the reference language, but other .NET languages work the same way.
-The Geode .NET API is provided in the `GemStone::GemFire::Cache::Generic` namespace. This namespace allows you to manage your cache, regions, and data using the .NET Generics APIs.
-
-Use the Geode .NET API to programmatically create, populate, and manage a Geode distributed system.
+The .NET API is provided in the `Apache.Geode.Client` namespace. This namespace allows you to manage your cache, regions, and data.
+Use the Geode .NET API to programmatically create, populate, and manage a distributed system.
**Note:**
The .NET library is thread-safe except where otherwise indicated in the API documentation.
-For complete information on the APIs, see the .NET API documentation at [http://gemfire-apis.docs.pivotal.io](http://gemfire-apis.docs.pivotal.io). For general information on .NET, see the Microsoft developer\u2019s network website.
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/csharp-dotnet-naming-conventions.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/csharp-dotnet-naming-conventions.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/csharp-dotnet-naming-conventions.html.md.erb
index ac6d4b1..203af8e 100644
--- a/docs/geode-native-docs/dotnet-caching-api/csharp-dotnet-naming-conventions.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/csharp-dotnet-naming-conventions.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Unless noted, the .NET API classes and functions have the same names as their C++ counterparts in the namespace `GemStone::GemFire::Cache`. In .NET, all method names start with a capital letter.
+Unless noted, the .NET API classes and functions have the same names as their C++ counterparts in the namespace `Apache.Geode.Client`. In .NET, all method names start with a capital letter.
The .NET interface names match those of comparable C++ interfaces, but with an \u2019I\u2019 prepended to satisfy .NET naming conventions. For example, the .NET equivalent of the C++ `CacheLoader` interface is `ICacheLoader`.
@@ -27,6 +27,6 @@ The name of the Geode `Serializable` interface is `IGFSerializable` because `ISe
Where possible, get\* and set\* functions are replaced by .NET properties.
-You can implement the Geode .NET interfaces. You cannot extend any of the classes because they are marked as sealed.
+You can implement the .NET interfaces. You cannot extend any of the classes because they are marked as sealed.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/data-serialization-apis.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/data-serialization-apis.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/data-serialization-apis.html.md.erb
index 1c8a5d3..c706983 100644
--- a/docs/geode-native-docs/dotnet-caching-api/data-serialization-apis.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/data-serialization-apis.html.md.erb
@@ -23,14 +23,14 @@ Use either `IPdxSerializable` or `IGFSerializable` for each region. Do not mix t
For more information on these options, see [Data Serialization](dotnet-data-serialization.html#concept_28A7797A0342447ABF6A5014E0DCB05F).
-- **IPdxSerializable interface**. Provides a flexible way to serialize your domain objects for cache storage and transfer to the servers. This is a Geode built-in serialization framework. See [Data Serialization](dotnet-data-serialization.html#concept_28A7797A0342447ABF6A5014E0DCB05F).
+- **IPdxSerializable interface**. Provides a flexible way to serialize your domain objects for cache storage and transfer to the servers. This is a Geode built-in serialization framework.
- **IPdxReader**. Supplies operations for reading data from Geode IPDXSerializable types.
- **IPdxWriter**. Provides operations for writing data into Geode IPDXSerializable types.
- **IPdxInstance**. Instance of a PDX serialized object that you can use to access the object\u2019s data without having to deserialize the object first.
- **IPdxInstanceFactory**. Allows you to build an IPdxInstance using raw data.
- **IPdxTypeMapper interface**. Allows you to map .NET type names to Java type names when using PDX serialization.
-- **IGFSerializable interface**. Superclass of one set of user objects that can be serialized and stored in the cache. These are Geode built-in serializable types. See [Data Serialization](dotnet-data-serialization.html#concept_28A7797A0342447ABF6A5014E0DCB05F).
-- **Serializable class**. Wraps the native C++ `gemfire::Serializable` objects as managed `IGFSerializable` objects. Whenever native C++ clients and .NET clients interoperate and are part of the same distributed system, the user-defined types that are put by the native C++ clients that have not been defined in .NET are returned as objects of this class.
+- **IGFSerializable interface**. Superclass of one set of user objects that can be serialized and stored in the cache. These are Geode built-in serializable types.
+- **Serializable class**. Wraps the C++ `apache::geode::client::Serializable` objects as managed `IGFSerializable` objects. Whenever C++ clients and .NET clients interoperate and are part of the same distributed system, the user-defined types that are put by the C++ clients that have not been defined in .NET are returned as objects of this class.
The API contains overloads for most Region methods and other methods that take `Serializable` as a value and that are more optimized than the more generic `IGFSerializable` overloads. The application prefers using these overloads whenever the base class of an object is `Serializable`.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/dotnet-accessing-an-entry.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/dotnet-accessing-an-entry.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/dotnet-accessing-an-entry.html.md.erb
index 98b338b..6e6eb8e 100644
--- a/docs/geode-native-docs/dotnet-caching-api/dotnet-accessing-an-entry.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/dotnet-accessing-an-entry.html.md.erb
@@ -25,15 +25,12 @@ If the value is not available locally, it is requested from the server. If the s
## Using the Region API to Retrieve Values From the Cache
-Here, the program retrieves two entries from the region.
+Here, the code fragment accomplishes entry retrieval in two ways.
``` pre
string value1 = region1["Key1"];
string value2 = region1["Key2"];
-int valueA = region2["KeyA"];
-int valueB = region2["KeyB"];
-
string valueQ = region.Get(111, null);
string valueR = region.Get(222, null);
```
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/dotnet-adding-entry-to-cache.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/dotnet-adding-entry-to-cache.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/dotnet-adding-entry-to-cache.html.md.erb
index 2ae7260..7f219e9 100644
--- a/docs/geode-native-docs/dotnet-caching-api/dotnet-adding-entry-to-cache.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/dotnet-adding-entry-to-cache.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-You populate a native client region with cache entries by using the generic `IDictionary` API or by using the .NET `Region.Put` or the `Region.Create` API functions.
+Populate a client region with cache entries by using the generic `IDictionary` API or by using the .NET `Region.Put` or the `Region.Create` API functions.
The `Put` function places a new value into a region entry with the specified key, while the `Create` function creates a new entry in the region. The `Put` and `Create` functions provide a user-defined parameter object to any cache writer invoked in the process.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/dotnet-application-domains.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/dotnet-application-domains.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/dotnet-application-domains.html.md.erb
index fd16078..1c85072 100644
--- a/docs/geode-native-docs/dotnet-caching-api/dotnet-application-domains.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/dotnet-application-domains.html.md.erb
@@ -19,10 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Application domains, or `AppDomain`s, are units of isolation, security boundaries, and loading and unloading for applications in the .NET runtime. Multiple application domains can run in a single process. Each can have one or many threads, and a thread can switch application domains at runtime.
+Application domains, or `AppDomain`s, are units of isolation, security boundaries, and do the loading and unloading for applications in the .NET runtime. Multiple application domains can run in a single process. Each can have one or many threads, and a thread can switch application domains at runtime.
-**Note:**
-Before you use application domains with Geode, make sure you understand how to use them generally in your .NET programming.
-
-The .NET managed assemblies require interface methods invoked by the native C++ layer to be in the same `AppDomain` as that of the .NET DLL. If not, an exception is thrown because the thread is unable to cross `AppDomain` boundaries.
+The .NET managed assemblies require interface methods invoked by the C++ layer to be in the same `AppDomain` as that of the .NET DLL. If not, an exception is thrown because the thread is unable to cross `AppDomain` boundaries.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/dotnet-caching-api.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/dotnet-caching-api.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/dotnet-caching-api.html.md.erb
index 470ac77..40613e5 100644
--- a/docs/geode-native-docs/dotnet-caching-api/dotnet-caching-api.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/dotnet-caching-api.html.md.erb
@@ -1,5 +1,5 @@
---
-title: Pivotal GemFire Native Client .NET API
+title: .NET Client API
---
<!--
@@ -19,13 +19,13 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-This section describes the primary classes, usage conventions, and C++ to .NET class mappings of the native client .NET API. It demonstrates how to use the API to create caches and perform data serialization.
+This section describes the primary classes, usage conventions, and C++ to .NET class mappings of the .NET client API. It demonstrates how to use the API to create caches and perform data serialization.
-The .NET API documentation is available at [http://gemfire-apis.docs.pivotal.io](http://gemfire-apis.docs.pivotal.io).
+See the [.NET API](/releases/latest/api/dotnetdocs) documentation for API details.
-- **[About the Native Client .NET API](csharp-dotnet-api.html)**
+- **[About the .NET Client API](csharp-dotnet-api.html)**
- The Microsoft .NET Framework interface for the Apache Geode native client provides complete access to the native client C++ functionality from any .NET Framework language (C\#, C++/CLI, VB.NET, and J\#). This enables clients using C\# and other .NET languages to use the capabilities provided by the Geode C++ API.
+ The Microsoft .NET Framework interface for the client provides complete access to the C++ client functionality from any .NET Framework language (C\#, C++/CLI, VB.NET, and J\#). This enables clients using C\# and other .NET languages to use the capabilities provided by the C++ API.
- **[C++ Class to .NET Class Mappings](cpp-class-to-dotnet-class-mappings.html)**
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/dotnet-data-serialization-options.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/dotnet-data-serialization-options.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/dotnet-data-serialization-options.html.md.erb
index e39f00a..41ee4e6 100644
--- a/docs/geode-native-docs/dotnet-caching-api/dotnet-data-serialization-options.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/dotnet-data-serialization-options.html.md.erb
@@ -25,7 +25,7 @@ The options give good performance and flexibility for data storage, transfers, a
The simplest option is to use perform automatic serialization by registering the Geode .NET PDX reflection-based autoserializer in your application. When you have this registered, Geode uses it for all domain objects that are not custom serialized.
-You can also custom serialize your objects by implementing one of the Geode .NET interfaces, `GemStone::GemFire::Cache::Generic::IPdxSerializable` or `GemStone::GemFire::Cache::IGFSerializable`.
+You can also custom serialize your objects by implementing one of the Geode .NET interfaces, `Apache.Geode.Client.IPdxSerializable` or `Apache.Geode.Client.IGFSerializable`.
You also have the option of using default .NET serialization, but you cannot use it unless you also use helper classes. The helper classes you must use are `CacheableObject` and `CacheableObjectXml`.
@@ -76,6 +76,4 @@ Geode .NET PDX serialization has more bytes in overhead than Geode .NET Data ser
By default, you can use Geode delta propagation with PDX serialization. However, delta propagation will not work if you have set the Geode property read-serialized to "true". In terms of deserialization, to apply a change delta propagation requires a domain class instance and the `fromDelta` method. If you have set read-serialized to true, you will receive an `IPdxInstance` instead of a domain class instance and `IPdxInstance` does not have the `fromDelta` method required for delta propagation. You will also require the Java domain class on the server similar to the you would need the .NET PDX Delta domain class.
-For detailed information on the interfaces, see the API documentation at [http://gemfire-apis.docs.pivotal.io](http://gemfire-apis.docs.pivotal.io).
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/dotnet-data-serialization.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/dotnet-data-serialization.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/dotnet-data-serialization.html.md.erb
index ae858f0..e919bf9 100644
--- a/docs/geode-native-docs/dotnet-caching-api/dotnet-data-serialization.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/dotnet-data-serialization.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-All data that Geode moves out of the local cache must be serializable.
+All data moving out of the client cache must be serializable.
Region data that must be serializable falls under the following categories:
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/dotnet-pdx-autoserializer.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/dotnet-pdx-autoserializer.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/dotnet-pdx-autoserializer.html.md.erb
index 59cb46e..7a0075f 100644
--- a/docs/geode-native-docs/dotnet-caching-api/dotnet-pdx-autoserializer.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/dotnet-pdx-autoserializer.html.md.erb
@@ -28,7 +28,7 @@ When you register the reflection-based serializer, Geode uses it to serialize al
For example:
``` pre
- using GemStone.GemFire.Cache.Generic;
+ using Apache.Geode.Client;
...
// Register reflection-based autoserializer to serialize
// domain objects using PDX serialization
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/dotnet-pdx-serialization.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/dotnet-pdx-serialization.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/dotnet-pdx-serialization.html.md.erb
index 04df7b5..6192a3d 100644
--- a/docs/geode-native-docs/dotnet-caching-api/dotnet-pdx-serialization.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/dotnet-pdx-serialization.html.md.erb
@@ -21,8 +21,6 @@ limitations under the License.
Geode's Portable Data eXchange (PDX) is a cross-language data format that can reduce the cost of distributing and serializing your objects. PDX stores data in named fields that you can access individually, to avoid the cost of deserializing the entire data object. PDX also allows you to mix versions of objects where you have added or removed fields.
-PDX serialization is supported by C++ clients. If you have C++ clients that may receive events for a region, you can now use PDX serialization on the region's entries.
-
You have two options for Geode PDX serialization when using the .NET caching API. You can program your domain objects using the `IPdxSerializable` interface, or you can use Geode\u2019s reflection-based autoserializer.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/event-handling-apis.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/event-handling-apis.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/event-handling-apis.html.md.erb
index fabc852..c0f04c7 100644
--- a/docs/geode-native-docs/dotnet-caching-api/event-handling-apis.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/event-handling-apis.html.md.erb
@@ -24,7 +24,7 @@ Code your event handlers to do minimal work before returning control to Geode.
For example, a listener implementation may hand off the event to a thread pool that processes the event on its thread rather than the listener thread. Exceptions thrown by the listeners are caught by Geode and logged.
- **RegionEvent class**. Provides information about the event, such as what region the event originated in, whether the event originated in a cache remote to the event handler, and whether the event resulted from a distributed operation.
-- **EntryEvent class**. Provides all available information for the `RegionEvent` . It also provides entry-specific information, such as the old and new entry values and whether the event resulted from a load operation.
+- **EntryEvent class**. Provides all available information for the `RegionEvent`. It also provides entry-specific information, such as the old and new entry values and whether the event resulted from a load operation.
- **ICacheLoader application callback interface**. Loads data into a region.
- **ICacheWriter application callback interface**. Synchronously handles region and entry events before the events occur. Entry events are `create`, `update`, `invalidate`, and `destroy`. Region events are invalidate and destroy. This class has the ability to abort events.
- **ICacheListener application callback interface**. Asynchronously handles region and entry events. Listeners receive notifications when entries in a region change, or when changes occur to the region attributes themselves. Entry events are `create`, `update`, `invalidate`, and `destroy`. Region events are `invalidate` and `destroy`. Multiple events can cause concurrent invocation of `ICacheListener` methods. If event A occurs before event B, there is no guarantee that their corresponding ICacheListener method invocations will occur in the same order.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/implementing-igfserializable.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/implementing-igfserializable.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/implementing-igfserializable.html.md.erb
index 264d669..d173c29 100644
--- a/docs/geode-native-docs/dotnet-caching-api/implementing-igfserializable.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/implementing-igfserializable.html.md.erb
@@ -31,7 +31,7 @@ Examples follow the procedure.
void ToData(DataOutput output)
```
- The `ToData` function is responsible for copying all of the data fields for the object to the object stream. The `DataOutput` class represents the output stream and provides methods for writing the primitives in a network byte order. For details, see the API documentation for `DataOutput` at [http://gemfire-apis.docs.pivotal.io](http://gemfire-apis.docs.pivotal.io).
+ The `ToData` function is responsible for copying all of the data fields for the object to the object stream. The `DataOutput` class represents the output stream and provides methods for writing the primitives in a network byte order.
2. Implement the `FromData` function that consumes a data input stream and repopulates the data fields for the object:
@@ -39,13 +39,13 @@ Examples follow the procedure.
void fromData (DataInput& input)
```
- The `DataInput` class represents the input stream and provides methods for reading input elements. The `FromData` function must read the elements of the input stream in the same order that they were written by `ToData`. For more about this, see the API documentation for `DataInput` at [http://gemfire-apis.docs.pivotal.io](http://gemfire-apis.docs.pivotal.io).
+ The `DataInput` class represents the input stream and provides methods for reading input elements. The `FromData` function must read the elements of the input stream in the same order that they were written by `ToData`.
3. Implement the `ClassId` function to return an integer which is unique for your class (in the set of all of your user-defined classes).
## Simple BankAccount Class
-This example shows a simple class, `BankAccount`, that encapsulates two `ints`: `customerId` and `accountId`:
+This example shows a simple class, `BankAccount`, that encapsulates the two `ints` `customerId` and `accountId`:
``` pre
public class BankAccount
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/implementing-shared-assembly.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/implementing-shared-assembly.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/implementing-shared-assembly.html.md.erb
index 1331d0d..f506ecb 100644
--- a/docs/geode-native-docs/dotnet-caching-api/implementing-shared-assembly.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/implementing-shared-assembly.html.md.erb
@@ -21,16 +21,16 @@ limitations under the License.
Follow these steps to install the shared assembly into the Global Assembly Cache (GAC).
-1. Go to the `NativeClient_xxxx` directory.
+1. Set the directory:
``` pre
cd %GFCPP%
```
-2. Run the GAC utility to install `GemStone.GemFire.Cache.dll` into the GAC.
+2. Run the GAC utility to install `Apache.Geode.Client.dll` into the GAC.
``` pre
- gacutil.exe /if GemStone.GemFire.Cache.dll
+ gacutil.exe /if Apache.Geode.Client.dll
```
When you are ready to uninstall, use the `/u` switch. More information on the GAC utility can be found at [http://www.msdn.com](https://msdn.microsoft.com), or by using `gacutil.exe /?`.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/object-lifetimes.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/object-lifetimes.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/object-lifetimes.html.md.erb
index 7c4d6d4..67e84d3 100644
--- a/docs/geode-native-docs/dotnet-caching-api/object-lifetimes.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/object-lifetimes.html.md.erb
@@ -23,13 +23,13 @@ The .NET API provides a managed set of assemblies for the C++ API. The underlyin
The underlying C++ API employs reference counting using smart pointers for most classes. This means that all API operations with those objects return a reference to the underlying object and not a copy. Consequently, the underlying object will not be freed as long as the .NET application holds a reference to an object. In other words, the underlying object will stay in memory until the .NET object is garbage-collected. As long as a reference to an object is alive, the artifacts it maintains will also be alive.
-For example, as long as a `Region` object is not garbage-collected, then the destructor of the C++ native persistence manager (if any) for the region is not invoked.
+For example, as long as a `Region` object is not garbage-collected, then the destructor of the C++ persistence manager (if any) for the region is not invoked.
In the C++ API, the references to an object are reduced when the object goes out of scope for stack allocation, or is deleted explicitly for heap allocation. The object is destroyed when its reference count reaches zero. In the .NET API, the references are reduced when the object is garbage-collected or is explicitly disposed with the .NET `using` statement.
Because a reference to the object is returned, any change to the object also immediately changes the object as stored internally. For example, if an object is put into the cache using `Region.Put`, a reference of the object is stored in the internal structures. If you modify the object, the internal object also changes. However, it is not distributed to other members of the distributed system until another `Region.Put` is done.
-To find out if a class is reference counted, look at the API documentation for the class at [http://gemfire-apis.docs.pivotal.io](http://gemfire-apis.docs.pivotal.io). If the class is wrapped by `UMWrap` or `SBWrap`, the class is reference counted.
+To find out if a class is reference counted, look at the API documentation for the class. If the class is wrapped by `UMWrap` or `SBWrap`, the class is reference counted.
These are examples of classes that are reference counted:
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/primary-apis-cache-generic.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/primary-apis-cache-generic.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/primary-apis-cache-generic.html.md.erb
index a982720..d21feb4 100644
--- a/docs/geode-native-docs/dotnet-caching-api/primary-apis-cache-generic.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/primary-apis-cache-generic.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-These are the main APIs within `GemStone::GemFire::Cache::Generic` used for cache, region, and data entry management in Geode .NET. For details, see the .NET API documentation at [http://gemfire-apis.docs.pivotal.io](http://gemfire-apis.docs.pivotal.io).
+These are the main APIs within `Apache.Geode.Client` used for cache, region, and data entry management.
**Note:**
Declarative configuration via XML of application plug-ins such as cache listener, cache writer, cache loader and partition resolver is not supported when clients are operated in the new .NET Generic API.
@@ -30,7 +30,7 @@ Declarative configuration via XML of application plug-ins such as cache listener
- **[Region and Entry APIs](region-entry-apis.html)**
- This section describes classes for working with Geode regions and region entries.
+ This section describes classes for working with regions and region entries.
- **[Data Serialization APIs](data-serialization-apis.html)**
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/private-assembly.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/private-assembly.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/private-assembly.html.md.erb
index 9f97a39..f303669 100644
--- a/docs/geode-native-docs/dotnet-caching-api/private-assembly.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/private-assembly.html.md.erb
@@ -1,5 +1,5 @@
---
-title: Using GemStone.GemFire.Cache.dll As a Private Assembly
+title: Using Apache.Geode.Client.dll As a Private Assembly
---
<!--
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-To access `GemStone.GemFire.Cache.dll` as a private assembly, you need to specify a `.config` file for your application.
+To access `Apache.Geode.Client.dll` as a private assembly, you need to specify a `.config` file for your application.
The file needs to be the same name as your application, with a `.config` suffix. For example, the `.config` file for `main.exe` would be `main.exe.config`. The two files must reside in the same directory.
@@ -27,7 +27,7 @@ Follow these steps to create a `.config` file:
1. Copy `%GFCPP%/docs/default.exe.config` to the appropriate location.
2. Rename `default.exe.config` to the name of your application.
-3. Change the `href` attribute of the `CodeBase` element to point to your `GemStone.GemFire.Cache.dll` file. Any of three path types \u2013 http, relative, or absolute \u2013 will work.
+3. Change the `href` attribute of the `CodeBase` element to point to your `Apache.Geode.Client.dll` file. Any of three path types \u2013 http, relative, or absolute \u2013 will work.
## A Sample .config File
@@ -39,11 +39,11 @@ The following example shows an excerpt of a `.config` file. The `PublicKeyToken`
<assemblyBinding
xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="GemStone.GemFire.Cache"
+ <assemblyIdentity name="Apache.Geode.Client"
publicKeyToken="126e6338d9f55e0c"
culture="neutral" />
<codeBase version="0.0.0.0"
- href="../../bin/GemStone.GemFire.Cache.dll"/>
+ href="../../bin/Apache.Geode.Client.dll"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/problem-scenarios.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/problem-scenarios.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/problem-scenarios.html.md.erb
index 0ab9789..0d14e18 100644
--- a/docs/geode-native-docs/dotnet-caching-api/problem-scenarios.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/problem-scenarios.html.md.erb
@@ -19,23 +19,23 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-These scenarios describe processes and implementations that should be avoided when using `AppDomains`.
+These scenarios describe processes and implementations that should be avoided when using the `AppDomain` class.
## <a id="concept_025AAAF8896C4F4CB4530EE9CEEF4BAE__section_FFC3E18AD8F042DA9EFB42852242AAE0" class="no-quick-link"></a>Using Application Callbacks
-**Scenario:** A .NET thread loads the Geode DLL in application domain `AD1`. This thread may have access to the other domains in the application if code access security allows it. This thread can then call `AppDomain.CreateInstance` to create a callback object ( `ICacheListener`, `ICacheLoader`, or `ICacheWriter`) in another domain called `AD2`. If the callback object is marshaled by reference, the callback is executed in the domain where it is created (`AD2`). The thread that loads the Geode DLL in domain `AD1` runs the callback methods in the second domain, `AD2`. An exception is thrown when the callback method is invoked because the native code that invokes the callback is not allowed to cross the `AppDomain` boundary.
+**Scenario:** A .NET thread loads the Geode DLL in application domain `AD1`. This thread may have access to the other domains in the application if code access security allows it. This thread can then call `AppDomain.CreateInstance` to create a callback object ( `ICacheListener`, `ICacheLoader`, or `ICacheWriter`) in another domain called `AD2`. If the callback object is marshaled by reference, the callback is executed in the domain where it is created (`AD2`). The thread that loads the Geode DLL in domain `AD1` runs the callback methods in the second domain, `AD2`. An exception is thrown when the callback method is invoked because the code that invokes the callback is not allowed to cross the `AppDomain` boundary.
**Resolution:** When an application creates and unloads application domains it should ensure that the application domain where the Geode .NET DLL is loaded is the same domain where the application callback and `IGFSerializable` objects are created.
## <a id="concept_025AAAF8896C4F4CB4530EE9CEEF4BAE__section_9FEC4666F4FD467AA57AD70943703F00" class="no-quick-link"></a>Loading an Application DLL in Multiple AppDomains
-**Scenario:** the application loads the Geode DLL in one application domain, then reloads the Geode DLL in another application domain (with or without unloading the previous `AppDomain` ). The callbacks, as well as other interface implementations, like `IPdxSerializable` and `IGFSerializable`, throw exceptions because the native C++ code does not know about `AppDomains` and is loaded only once in the initial `AppDomain`.
+**Scenario:** The application loads the Geode DLL in one application domain, then reloads the Geode DLL in another application domain (with or without unloading the previous `AppDomain` ). The callbacks, as well as other interface implementations, like `IPdxSerializable` and `IGFSerializable`, throw exceptions because the C++ code does not know about the `AppDomain` and is loaded only once in the initial `AppDomain`.
**Resolution:** The application should always use the first `AppDomain` to load the Geode DLL, or it should not load the Geode DLL multiple times.
-## <a id="concept_025AAAF8896C4F4CB4530EE9CEEF4BAE__section_646373554C764DD3A919A906A5F05EE9" class="no-quick-link"></a>Native Client inside IIS
+## <a id="concept_025AAAF8896C4F4CB4530EE9CEEF4BAE__section_646373554C764DD3A919A906A5F05EE9" class="no-quick-link"></a>Inside IIS
-**Scenario:** When you deploy more than one web application inside an Internet Information Service (IIS), the IIS creates an appdomain subprocess for each web application in the single process, but the native client C++ cache instance remains a singleton in the process. Because of this, you can run into conflicts between cache creation and closure by the different appdomains. For example, if one appdomain calls `cache.close`, it closes the cache for the entire process. Any further cache access operations by the other appdomains return cache closed exceptions.
+**Scenario:** When you deploy more than one web application inside an Internet Information Service (IIS), the IIS creates an appdomain subprocess for each web application in the single process, but the C++ client cache instance remains a singleton in the process. Because of this, you can run into conflicts between cache creation and closure by the different appdomains. For example, if one appdomain calls `cache.close`, it closes the cache for the entire process. Any further cache access operations by the other appdomains return cache closed exceptions.
**Resolution:** `Cache create`/`close` provides reference counting of `Cache` `create` and `close`. Each process can use the counter to make sure it creates the `Cache` once and closes it once. To enable this, set the Geode system property, `appdomain-enabled` to true .
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/region-entry-apis.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/region-entry-apis.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/region-entry-apis.html.md.erb
index 61f4560..76be9aa 100644
--- a/docs/geode-native-docs/dotnet-caching-api/region-entry-apis.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/region-entry-apis.html.md.erb
@@ -19,10 +19,10 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-This section describes classes for working with Geode regions and region entries.
+This section describes classes for working with regions and region entries.
- **RegionFactory class**. Creates a `Region` instance based on the provided configuration.
-- **IRegion class**. Provides functions for managing regions and cached data. The `Region` interface implements the generic .NET `IDictionary` interface. In the Geode APIs, `IRegion` implements `IDictionary` and `Region` inherits `IRegion`, giving you access to the full range of .NET `Generic` collection functions. Use the functions in this class to perform the following actions:
+- **IRegion class**. Provides functions for managing regions and cached data. The `Region` interface implements the generic .NET `IDictionary` interface. `IRegion` implements `IDictionary` and `Region` inherits `IRegion`, giving you access to the full range of .NET `Generic` collection functions. Use the functions in this class to perform the following actions:
- Retrieve information about the region, such as its parent region and region attribute objects.
- Invalidate or destroy the region.
- Add, update, invalidate, and remove region entries.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/registering-the-type.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/registering-the-type.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/registering-the-type.html.md.erb
index beefb9a..d05eb3c 100644
--- a/docs/geode-native-docs/dotnet-caching-api/registering-the-type.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/registering-the-type.html.md.erb
@@ -39,6 +39,6 @@ A `DSFID` is an integer that returns the data serialization fixed ID type. `DSFI
If your application uses its own key types that are too complex to easily force into string, you can probably improve performance by using a custom type and implementing `HashCode` and `Equals` functions. For example, if you have hybrid data types such as floating point numbers, you can implement your own type that encapsulates the floating point number. Comparing floating point numbers in this way provides greater performance than comparing a string representation of the floating point numbers, with such noticeable improvements as faster cache access and smaller payloads.
-See [Serialization in Native Client Mode with a Java Server](../cpp-caching-api/serialization_using_serializable.html#concept_696AB5206C3E45898CC1A24CDD93D003__section_AFB685227E4048BF9FB4FD7C55AED274) for information about implementing key types for a native client that is used with a Java cache server.
+See [Serialization in Native Client Mode with a Java Server](../cpp-caching-api/serialization_using_serializable.html#concept_696AB5206C3E45898CC1A24CDD93D003__section_AFB685227E4048BF9FB4FD7C55AED274) for information about implementing key types for a client that is used with a Java cache server.
To extend a type that implements `IPdxSerializable` or `IGFSerializable` for your key, override and implement the `HashCode` and `Equals` methods in the key as needed.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/removing-entry.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/removing-entry.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/removing-entry.html.md.erb
index e7709b9..bfb7ec1 100644
--- a/docs/geode-native-docs/dotnet-caching-api/removing-entry.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/removing-entry.html.md.erb
@@ -19,20 +19,20 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-The standard `Region::Remove` API removes the entry with specified key and provides a user-defined parameter object to any `CacheWriter` or `CacheListener` invoked in the process.
+The `Region.Remove` function removes the entry with specified key and provides a user-defined parameter object to any `CacheWriter` or `CacheListener` invoked in the process.
-The `Remove` call not only removes the value, but also the key and entry from this region. The remove operation is propagated to the Geode cache server that the native client is connected to. If the destroy operation fails due to an exception on the server (for example, a `CacheServerException` or security exception), then the local entry is still removed.
+The `Remove` call not only removes the value, but also the key and entry from this region. The remove operation is propagated to the server that the client is connected to. If the destroy operation fails due to an exception on the server (for example, a `CacheServerException` or security exception), then the local entry is still removed.
-The `Remove` operation updates `CacheStatistics::LastAccessedTime`, `CacheStatistics::HitCount`, and `CacheStatistics::MissCount` for this region and the entry.
+The `Remove` operation updates `CacheStatistics.LastAccessedTime`, `CacheStatistics.HitCount`, and `CacheStatistics.MissCount` for this region and the entry.
The `Remove` API returns true if the entry (key, value) has been removed or false if the entry (key, value) has not been removed.
-## Bulk Remove Operations Using removeAll
+## Bulk Remove Operations Using RemoveAll
-You can use the `Region::removeAll` API to remove all entries for a colleciton of specified keys from the region. The effect of this call is equivalent to that of calling `destroy` on this region once for each key in the specified collection. If an entry does not exist, then that key is skipped. Note that an `EntryNotFoundException` is not thrown.
+You can use the `Region.RemoveAll` API to remove all entries for a collection of specified keys from the region. The effect of this call is equivalent to that of calling `Remove` on this region once for each key in the specified collection. If an entry does not exist, then that key is skipped. Note that an `EntryNotFoundException` is not thrown.
-The `RemoveAll` operation updates `CacheStatistics::LastAccessedTime`, `CacheStatistics::HitCount`, and `CacheStatistics::MissCount` for this region and the entries that are removed.
+The `RemoveAll` operation updates `CacheStatistics.LastAccessedTime`, `CacheStatistics.HitCount`, and `CacheStatistics.MissCount` for this region and the entries that are removed.
-The `RemoveAll` API also supports providing a callback argument to any cache loaders or cache writers that are invoked in the operation. See the Region `RemoveAll` API documentation within [http://gemfire-apis.docs.pivotal.io](http://gemfire-apis.docs.pivotal.io).
+The `RemoveAll` API also supports providing a callback argument to any cache loaders or cache writers that are invoked in the operation.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/serializable-types.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/serializable-types.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/serializable-types.html.md.erb
index 775eb80..33f0f1b 100644
--- a/docs/geode-native-docs/dotnet-caching-api/serializable-types.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/serializable-types.html.md.erb
@@ -34,4 +34,3 @@ If you have a graph of objects in which each node can be serializable, the paren
**Note:**
The Geode `IGFSerializable` interface does not support object graphs with multiple references to the same object. If your application uses these types of circular graphs, you must address this design concern explicitly.
-For more information, see the API documentation for `DataOutput` and `DataInput` at [http://gemfire-apis.docs.pivotal.io](http://gemfire-apis.docs.pivotal.io).
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/serialize-using-ipdxserializable.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/serialize-using-ipdxserializable.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/serialize-using-ipdxserializable.html.md.erb
index 78d694d..f007650 100644
--- a/docs/geode-native-docs/dotnet-caching-api/serialize-using-ipdxserializable.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/serialize-using-ipdxserializable.html.md.erb
@@ -1,5 +1,5 @@
---
-title: Serialize Using the GemFire IPdxSerializable Interface
+title: Serialize Using the IPdxSerializable Interface
---
<!--
@@ -23,10 +23,10 @@ Use this procedure to program your domain object for PDX serialization using the
**Procedure**
-1. In your domain class, implement `GemStone::GemFire::Cache::Generic::IPdxSerializable`. Example:
+1. In your domain class, implement `Apache.Geode.Client.IPdxSerializable`. Example:
``` pre
- using GemStone.GemFire.Cache.Generic;
+ using Apache.Geode.Client;
...
public class PortfolioPdx : IPdxSerializable
```
@@ -36,8 +36,8 @@ Use this procedure to program your domain object for PDX serialization using the
If you also use PDX serialization in Java for the object, serialize the object in the same way for each language. Serialize the same fields in the same order and mark the same identify fields.
3. Program the `IPdxSerializable ToData` function to serialize your object as required by your application.
- 1. Write your domain class's standard .NET data fields using the `IPdxWriter` write methods. GemFire automatically provides `IPdxWriter` to the `ToData` function for `IPdxSerializable` objects.
- 2. Call the `ToData markIdentifyField` function for each field GemFire should use to identify your object. This is used to compare objects for operations like `DISTINCT` queries. The `markIdentifyField` call must come after the associated field write methods.
+ 1. Write your domain class's standard .NET data fields using the `IPdxWriter` write methods. Geode automatically provides `IPdxWriter` to the `ToData` function for `IPdxSerializable` objects.
+ 2. Call the `ToData markIdentifyField` function for each field Geode should use to identify your object. This is used to compare objects for operations like `DISTINCT` queries. The `markIdentifyField` call must come after the associated field write methods.
Example:
@@ -75,7 +75,7 @@ Use this procedure to program your domain object for PDX serialization using the
}
```
-4. Program `IPdxSerializable FromData` to read your data fields from the serialized form into the object's fields using the `IPdxReader` read methods. GemFire automatically provides `IPdxReader` to the `FromData` function for `IPdxSerializable` objects.
+4. Program `IPdxSerializable FromData` to read your data fields from the serialized form into the object's fields using the `IPdxReader` read methods. Geode automatically provides `IPdxReader` to the `FromData` function for `IPdxSerializable` objects.
Use the same names as you did in `ToData` and call the read operations in the same order as you called the write operations in your `ToData` implementation.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/serializing-domain-objects.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/serializing-domain-objects.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/serializing-domain-objects.html.md.erb
index 65e3c02..d3e571a 100644
--- a/docs/geode-native-docs/dotnet-caching-api/serializing-domain-objects.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/serializing-domain-objects.html.md.erb
@@ -35,7 +35,7 @@ To register an `IPdxSerializer`, you can use the following code. Note that you c
Example:
``` pre
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client;
...
// Register a PdxSerializer to serialize
// domain objects using PDX serialization
http://git-wip-us.apache.org/repos/asf/geode-native/blob/226662f0/docs/geode-native-docs/dotnet-caching-api/troubleshooting-dotnet-applications.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/troubleshooting-dotnet-applications.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/troubleshooting-dotnet-applications.html.md.erb
index f652617..1604c09 100644
--- a/docs/geode-native-docs/dotnet-caching-api/troubleshooting-dotnet-applications.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/troubleshooting-dotnet-applications.html.md.erb
@@ -23,20 +23,5 @@ The .NET Framework does not find managed DLLs using the conventional `PATH` envi
The GAC utility must be run on every machine that runs the .NET code.
-If an assembly attempts to load the `GemStone.GemFire.Cache.dll` without meeting this requirement, you receive this `System.IO.FileNotFoundException`:
-
-``` pre
-{{
-
-Unhandled Exception: System.IO.FileNotFoundException: Could not load file
-or assembly 'GemStone.GemFire.Cache, Version=8.0.0.0, Culture=neutral,
-PublicKeyToken= 126e6338d9f55e0c' or one of its dependencies. The system
-cannot find the file specified.
-File name: 'GemStone.GemFire.Cache, Version=8.0.0.0, Culture=neutral,
-PublicKeyT oken=126e6338d9f55e0c'
-at HierarchicalClient.Main()
-
-}}
-```
-
+If an assembly attempts to load the `Apache.Geode.Client.dll` without meeting this requirement, a `System.IO.FileNotFoundException` will be thrown.