diff --git a/docs/geode-native-docs-cpp/configuring/sysprops.html.md.erb b/docs/geode-native-docs-cpp/configuring/sysprops.html.md.erb
index c9314f5..27037ab 100644
--- a/docs/geode-native-docs-cpp/configuring/sysprops.html.md.erb
+++ b/docs/geode-native-docs-cpp/configuring/sysprops.html.md.erb
@@ -244,21 +244,6 @@
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
-<td><code class="ph codeph">security-client-auth-factory</code></td>
-<td>Sets the key for the <code class="ph codeph">AuthInitialize</code> factory function.</td>
-<td>empty</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">security-client-auth-library</code></td>
-<td>Registers the path to the <code class="ph codeph">securityImpl.dll</code> library.</td>
-<td>empty</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">security-client-dhalgo</code></td>
-<td>Diffie-Hellman based credentials encryption is not supported.</td>
-<td>null</td>
-</tr>
 <tr class="even">
 <td><code class="ph codeph">security-client-kspath</code></td>
 <td>Path to a .PEM file, which contains the public certificates for all Geode cache servers to which the client can connect through specified endpoints.</td>
diff --git a/docs/geode-native-docs-cpp/security/security-systemprops.html.md.erb b/docs/geode-native-docs-cpp/security/security-systemprops.html.md.erb
deleted file mode 100644
index b7f73c6..0000000
--- a/docs/geode-native-docs-cpp/security/security-systemprops.html.md.erb
+++ /dev/null
@@ -1,61 +0,0 @@
----
-title:  Security-Related System Properties
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-The table describes the security-related system properties in the `geode.properties` file for native client authentication and authorization.
-
-<a id="security__section_6DC4C72A2EEB432AA40DE97D438FD1E7"></a><a id="security__table_92A6A66523764199A19BCD66BA189921"></a>
-
-<table>
-<caption><span class="tablecap">System Properties for Client Authentication and Authorization</span></caption>
-<colgroup>
-<col width="50%" />
-<col width="50%" />
-</colgroup>
-<tbody>
-<tr class="odd">
-<td><code class="ph codeph">security-client-dhalgo</code></td>
-<td>Diffie-Hellman based credentials encryption is not supported.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">security-client-kspath</code></td>
-<td>Path to a .pem file, which contains the public certificates for all <%=vars.product_name%> cache servers to which the client can connect through specified endpoints.</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">ssl-enabled</code></td>
-<td>True if SSL connection support is enabled.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">ssl-keystore</code></td>
-<td>Name of the .pem keystore file, containing the client’s private key. Not set by default. Required if <code class="ph codeph">ssl-enabled</code> is true.</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">ssl-keystore-password</code></td>
-<td>Sets the password for the private key PEM file for SSL.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">ssl-truststore</code></td>
-<td><p>Name of the .pem truststore file, containing the servers’ public certificate. Not set by default. Required if <code class="ph codeph">ssl-enabled</code> is true</p></td>
-</tr>
-</tbody>
-</table>
-
-
-
diff --git a/docs/geode-native-docs-cpp/security/sslclientserver.html.md.erb b/docs/geode-native-docs-cpp/security/sslclientserver.html.md.erb
index 763222a..1979e9f 100644
--- a/docs/geode-native-docs-cpp/security/sslclientserver.html.md.erb
+++ b/docs/geode-native-docs-cpp/security/sslclientserver.html.md.erb
@@ -53,7 +53,7 @@
 1.  On the client, set `ssl-enabled` to `true`. 
 
 1.  On the client, set `ssl-keystore` and `ssl-truststore` to point to your keystore files. Paths to the keystore and truststore are local to the client.
-See [Security-Related System Properties](security-systemprops.html#security) for a description of these properties.
+See [Security Properties](../configuring/sysprops.html#attributes-gfcpp__table_security_props) for a description of these properties.
 
 # Starting and stopping the client and server with SSL in place
 
diff --git a/docs/geode-native-docs-dotnet/configuring/sysprops.html.md.erb b/docs/geode-native-docs-dotnet/configuring/sysprops.html.md.erb
index 6191c59..d214243 100644
--- a/docs/geode-native-docs-dotnet/configuring/sysprops.html.md.erb
+++ b/docs/geode-native-docs-dotnet/configuring/sysprops.html.md.erb
@@ -244,21 +244,6 @@
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
-<td><code class="ph codeph">security-client-auth-factory</code></td>
-<td>Sets the key for the <code class="ph codeph">AuthInitialize</code> factory function.</td>
-<td>empty</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">security-client-auth-library</code></td>
-<td>Registers the path to the <code class="ph codeph">securityImpl.dll</code> library.</td>
-<td>empty</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">security-client-dhalgo</code></td>
-<td>Diffie-Hellman based credentials encryption is not supported.</td>
-<td>null</td>
-</tr>
 <tr class="even">
 <td><code class="ph codeph">security-client-kspath</code></td>
 <td>Path to a .PEM file, which contains the public certificates for all Geode cache servers to which the client can connect through specified endpoints.</td>
diff --git a/docs/geode-native-docs-dotnet/security/security-systemprops.html.md.erb b/docs/geode-native-docs-dotnet/security/security-systemprops.html.md.erb
deleted file mode 100644
index b7f73c6..0000000
--- a/docs/geode-native-docs-dotnet/security/security-systemprops.html.md.erb
+++ /dev/null
@@ -1,61 +0,0 @@
----
-title:  Security-Related System Properties
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-The table describes the security-related system properties in the `geode.properties` file for native client authentication and authorization.
-
-<a id="security__section_6DC4C72A2EEB432AA40DE97D438FD1E7"></a><a id="security__table_92A6A66523764199A19BCD66BA189921"></a>
-
-<table>
-<caption><span class="tablecap">System Properties for Client Authentication and Authorization</span></caption>
-<colgroup>
-<col width="50%" />
-<col width="50%" />
-</colgroup>
-<tbody>
-<tr class="odd">
-<td><code class="ph codeph">security-client-dhalgo</code></td>
-<td>Diffie-Hellman based credentials encryption is not supported.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">security-client-kspath</code></td>
-<td>Path to a .pem file, which contains the public certificates for all <%=vars.product_name%> cache servers to which the client can connect through specified endpoints.</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">ssl-enabled</code></td>
-<td>True if SSL connection support is enabled.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">ssl-keystore</code></td>
-<td>Name of the .pem keystore file, containing the client’s private key. Not set by default. Required if <code class="ph codeph">ssl-enabled</code> is true.</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">ssl-keystore-password</code></td>
-<td>Sets the password for the private key PEM file for SSL.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">ssl-truststore</code></td>
-<td><p>Name of the .pem truststore file, containing the servers’ public certificate. Not set by default. Required if <code class="ph codeph">ssl-enabled</code> is true</p></td>
-</tr>
-</tbody>
-</table>
-
-
-
diff --git a/docs/geode-native-docs-dotnet/security/sslclientserver.html.md.erb b/docs/geode-native-docs-dotnet/security/sslclientserver.html.md.erb
index 763222a..1979e9f 100644
--- a/docs/geode-native-docs-dotnet/security/sslclientserver.html.md.erb
+++ b/docs/geode-native-docs-dotnet/security/sslclientserver.html.md.erb
@@ -53,7 +53,7 @@
 1.  On the client, set `ssl-enabled` to `true`. 
 
 1.  On the client, set `ssl-keystore` and `ssl-truststore` to point to your keystore files. Paths to the keystore and truststore are local to the client.
-See [Security-Related System Properties](security-systemprops.html#security) for a description of these properties.
+See [Security Properties](../configuring/sysprops.html#attributes-gfcpp__table_security_props) for a description of these properties.
 
 # Starting and stopping the client and server with SSL in place