You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mw...@apache.org on 2017/12/07 21:47:45 UTC

[accumulo-website] 03/03: ACCUMULO-4754 Converted properties to links

This is an automated email from the ASF dual-hosted git repository.

mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git

commit 269dfb4a63a7d7a162694ab139c175807d1cb0f1
Author: Mike Walch <mw...@apache.org>
AuthorDate: Tue Dec 5 11:01:55 2017 -0500

    ACCUMULO-4754 Converted properties to links
    
    * Also renamed configuration-properties.md to properties.md
---
 _docs-2-0/administration/caching.md                |   8 +-
 .../administration/configuration-management.md     |   4 +-
 _docs-2-0/administration/in-depth-install.md       | 105 +++++++++++----------
 _docs-2-0/administration/monitoring-metrics.md     |  21 +++--
 _docs-2-0/administration/multivolume.md            |  15 +--
 .../{configuration-properties.md => properties.md} |   0
 _docs-2-0/administration/ssl.md                    |  30 +++---
 _docs-2-0/administration/tracing.md                |  32 ++++---
 _docs-2-0/development/summaries.md                 |  12 +--
 _docs-2-0/getting-started/table_configuration.md   |   4 +-
 contributor/making-release.md                      |   8 +-
 11 files changed, 133 insertions(+), 106 deletions(-)

diff --git a/_docs-2-0/administration/caching.md b/_docs-2-0/administration/caching.md
index be99cb5..7c5ce52 100644
--- a/_docs-2-0/administration/caching.md
+++ b/_docs-2-0/administration/caching.md
@@ -39,8 +39,8 @@ the following properties:
 * [tserver.cache.data.size]
 * [tserver.cache.index.size]
 
-[table.cache.block.enable]: {{ page.docs_baseurl }}/administration/configuration-properties#table_cache_block_enable
-[table.cache.index.enable]: {{ page.docs_baseurl }}/administration/configuration-properties#table_cache_index_enable
-[tserver.cache.data.size]: {{ page.docs_baseurl }}/administration/configuration-properties#tserver_cache_data_size
-[tserver.cache.index.size]: {{ page.docs_baseurl }}/administration/configuration-properties#tserver_cache_data_size
+[table.cache.block.enable]: {{ page.docs_baseurl }}/administration/properties#table_cache_block_enable
+[table.cache.index.enable]: {{ page.docs_baseurl }}/administration/properties#table_cache_index_enable
+[tserver.cache.data.size]: {{ page.docs_baseurl }}/administration/properties#tserver_cache_data_size
+[tserver.cache.index.size]: {{ page.docs_baseurl }}/administration/properties#tserver_cache_data_size
 [tableops]: {{ page.javadoc_core }}/org/apache/accumulo/core/client/admin/TableOperations.html#setProperty(java.lang.String, java.lang.String, java.lang.String)
diff --git a/_docs-2-0/administration/configuration-management.md b/_docs-2-0/administration/configuration-management.md
index 92ede68..0e6ffe2 100644
--- a/_docs-2-0/administration/configuration-management.md
+++ b/_docs-2-0/administration/configuration-management.md
@@ -104,5 +104,5 @@ default  | table.compaction.minor.logs.threshold ..... | 3
 default  | table.failures.ignore ..................... | false
 ```
 
-[props]: {{ page.docs_baseurl }}/administration/configuration-properties
-[tableprops]: {{ page.docs_baseurl }}/administration/configuration-properties#table_prefix
+[props]: {{ page.docs_baseurl }}/administration/properties
+[tableprops]: {{ page.docs_baseurl }}/administration/properties#table_prefix
diff --git a/_docs-2-0/administration/in-depth-install.md b/_docs-2-0/administration/in-depth-install.md
index ded3fec..dab8c74 100644
--- a/_docs-2-0/administration/in-depth-install.md
+++ b/_docs-2-0/administration/in-depth-install.md
@@ -37,15 +37,15 @@ their value in accumulo-site.xml.
 |Port | Description | Property Name
 |-----|-------------|--------------
 |4445 | Shutdown Port (Accumulo MiniCluster) | n/a
-|4560 | Accumulo monitor (for centralized log display) | monitor.port.log4j
-|9995 | Accumulo HTTP monitor | monitor.port.client
-|9997 | Tablet Server | tserver.port.client
-|9998 | Accumulo GC | gc.port.client
-|9999 | Master Server | master.port.client
-|12234 | Accumulo Tracer | trace.port.client
+|4560 | Accumulo monitor (for centralized log display) | [monitor.port.log4j]
+|9995 | Accumulo HTTP monitor | [monitor.port.client]
+|9997 | Tablet Server | [tserver.port.client]
+|9998 | Accumulo GC | [gc.port.client]
+|9999 | Master Server | [master.port.client]
+|12234 | Accumulo Tracer | [trace.port.client]
 |42424 | Accumulo Proxy Server | n/a
-|10001 | Master Replication service | master.replication.coordinator.port
-|10002 | TabletServer Replication service | replication.receipt.service.port
+|10001 | Master Replication service | [master.replication.coordinator.port]
+|10002 | TabletServer Replication service | [replication.receipt.service.port]
 
 In addition, the user can provide `0` and an ephemeral port will be chosen instead. This
 ephemeral port is likely to be unique and not already bound. Thus, configuring ports to
@@ -169,30 +169,30 @@ also locate the native maps shared library by setting `LD_LIBRARY_PATH`
 #### Native Maps Configuration
 
 As mentioned, Accumulo will use the native libraries if they are found in the expected
-location and `tserver.memory.maps.native.enabled` is set to `true` (which is the default).
+location and [tserver.memory.maps.native.enabled] is set to `true` (which is the default).
 Using the native maps over JVM Maps nets a noticeable improvement in ingest rates; however,
 certain configuration variables are important to modify when increasing the size of the
 native map.
 
-To adjust the size of the native map, increase the value of `tserver.memory.maps.max`.
-By default, the maximum size of the native map is 1GB. When increasing this value, it is
-also important to adjust the values of `table.compaction.minor.logs.threshold` and
-`tserver.walog.max.size`. `table.compaction.minor.logs.threshold` is the maximum
-number of write-ahead log files that a tablet can reference before they will be automatically
-minor compacted. `tserver.walog.max.size` is the maximum size of a write-ahead log.
+To adjust the size of the native map, modify the value of [tserver.memory.maps.max]. When increasing
+this value, it is also important to adjust the values below:
 
-The maximum size of the native maps for a server should be less than the product
-of the write-ahead log maximum size and minor compaction threshold for log files:
+* [table.compaction.minor.logs.threshold] - maximum number of write-ahead log files that a tablet can
+  reference before they will be automatically minor compacted
+* [tserver.walog.max.size] - maximum size of a write-ahead log.
 
-`$table.compaction.minor.logs.threshold * $tserver.walog.max.size >= $tserver.memory.maps.max`
+The maximum size of the native maps for a server should be less than the product of the write-ahead
+log maximum size and minor compaction threshold for log files:
+
+    $table.compaction.minor.logs.threshold * $tserver.walog.max.size >= $tserver.memory.maps.max
 
 This formula ensures that minor compactions won't be automatically triggered before the native
 maps can be completely saturated.
 
 Subsequently, when increasing the size of the write-ahead logs, it can also be important
 to increase the HDFS block size that Accumulo uses when creating the files for the write-ahead log.
-This is controlled via `tserver.wal.blocksize`. A basic recommendation is that when
-`tserver.walog.max.size` is larger than 2GB in size, set `tserver.wal.blocksize` to 2GB.
+This is controlled via [tserver.wal.blocksize]. A basic recommendation is that when
+[tserver.walog.max.size] is larger than 2GB in size, set [tserver.wal.blocksize] to 2GB.
 Increasing the block size to a value larger than 2GB can result in decreased write
 performance to the write-ahead log file which will slow ingest.
 
@@ -210,30 +210,14 @@ of errors.
 
 ### Configure accumulo-site.xml
 
-Specify appropriate values for the following settings in `accumulo-site.xml`:
-
-```xml
-<property>
-    <name>instance.zookeeper.host</name>
-    <value>zooserver-one:2181,zooserver-two:2181</value>
-    <description>list of zookeeper servers</description>
-</property>
-```
-
-This enables Accumulo to find ZooKeeper. Accumulo uses ZooKeeper to coordinate
-settings between processes and helps finalize TabletServer failure.
-
-```xml
-<property>
-    <name>instance.secret</name>
-    <value>DEFAULT</value>
-</property>
-```
+Specify appropriate values for the following properties in `accumulo-site.xml`:
 
-The instance needs a secret to enable secure communication between servers. Configure your
-secret and make sure that the `accumulo-site.xml` file is not readable to other users.
-For alternatives to storing the `instance.secret` in plaintext, please read the
-`Sensitive Configuration Values` section.
+* [instance.zookeeper.host] - Enables Accumulo to find ZooKeeper. Accumulo uses ZooKeeper
+  to coordinate settings between processes and helps finalize TabletServer failure.
+* [instance.secret] - The instance needs a secret to enable secure communication between servers.
+  Configure your secret and make sure that the `accumulo-site.xml` file is not readable to other users.
+  For alternatives to storing the [instance.secret] in plaintext, please read the
+  [Sensitive Configuration Values](#sensitive-configuration-values) section.
 
 Some settings can be modified via the Accumulo shell and take effect immediately, but
 some settings require a process restart to take effect. See the [configuration management][config-mgmt]
@@ -265,7 +249,7 @@ where that command is run.
 ### Sensitive Configuration Values
 
 Accumulo has a number of properties that can be specified via the accumulo-site.xml
-file which are sensitive in nature, instance.secret and trace.token.property.password
+file which are sensitive in nature, [instance.secret] and `trace.token.property.password`
 are two common examples. Both of these properties, if compromised, have the ability
 to result in data being leaked to users who should not have access to that data.
 
@@ -276,14 +260,14 @@ is a candidate for use with these CredentialProviders. For version of Hadoop whi
 these classes, the feature will just be unavailable for use.
 
 A comma separated list of CredentialProviders can be configured using the Accumulo Property
-`general.security.credential.provider.paths`. Each configured URL will be consulted
+[general.security.credential.provider.paths]. Each configured URL will be consulted
 when the Configuration object for accumulo-site.xml is accessed.
 
 ### Using a JavaKeyStoreCredentialProvider for storage
 
 One of the implementations provided in Hadoop-2.6.0 is a Java KeyStore CredentialProvider.
 Each entry in the KeyStore is the Accumulo Property key name. For example, to store the
-`instance.secret`, the following command can be used:
+[instance.secret], the following command can be used:
 
     hadoop credential create instance.secret --provider jceks://file/etc/accumulo/conf/accumulo.jceks
 
@@ -300,7 +284,7 @@ Then, accumulo-site.xml must be configured to use this KeyStore as a CredentialP
 </property>
 ```
 
-This configuration will then transparently extract the `instance.secret` from
+This configuration will then transparently extract the [instance.secret] from
 the configured KeyStore and alleviates a human readable storage of the sensitive
 property.
 
@@ -347,14 +331,14 @@ consideration. There is no enforcement of these warnings via the API.
 #### Configuring the ClassLoader
 
 Accumulo builds its Java classpath in `accumulo-env.sh`.  After an Accumulo application has started, it will load classes from the locations
-specified in the deprecated `general.classpaths` property. Additionally, Accumulo will load classes from the locations specified in the
-`general.dynamic.classpaths` property and will monitor and reload them if they change. The reloading  feature is useful during the development
+specified in the deprecated [general.classpaths] property. Additionally, Accumulo will load classes from the locations specified in the
+[general.dynamic.classpaths] property and will monitor and reload them if they change. The reloading feature is useful during the development
 and testing of iterators as new or modified iterator classes can be deployed to Accumulo without having to restart the database.
 /
 Accumulo also has an alternate configuration for the classloader which will allow it to load classes from remote locations. This mechanism
 uses Apache Commons VFS which enables locations such as http and hdfs to be used. This alternate configuration also uses the
-`general.classpaths` property in the same manner described above. It differs in that you need to configure the
-`general.vfs.classpaths` property instead of the `general.dynamic.classpath` property. As in the default configuration, this alternate
+[general.classpaths] property in the same manner described above. It differs in that you need to configure the
+[general.vfs.classpaths] property instead of the [general.dynamic.classpaths] property. As in the default configuration, this alternate
 configuration will also monitor the vfs locations for changes and reload if necessary.
 
 The Accumulo classpath can be viewed in human readable format by running `accumulo classpath -d`.
@@ -721,3 +705,22 @@ mailing lists at https://accumulo.apache.org for more info.
 [quick]: {{ page.docs_baseurl }}/getting-started/quick-install
 [monitor]: {{page.docs_baseurl}}/administration/monitoring-metrics#monitor
 [config-mgmt]: {{page.docs_baseurl}}/administration/configuration-management
+[instance.zookeeper.host]: {{ page.docs_baseurl }}/administration/properties#instance_zookeeper_host
+[instance.secret]: {{ page.docs_baseurl }}/administration/properties#instance_secret
+[monitor.port.log4j]: {{ page.docs_baseurl }}/administration/properties#monitor_port_log4j
+[monitor.port.client]: {{ page.docs_baseurl }}/administration/properties#monitor_port_client
+[tserver.port.client]: {{ page.docs_baseurl }}/administration/properties#tserver_port_client
+[gc.port.client]: {{ page.docs_baseurl }}/administration/properties#gc_port_client
+[master.port.client]: {{ page.docs_baseurl }}/administration/properties#master_port_client
+[trace.port.client]: {{ page.docs_baseurl }}/administration/properties#trace_port_client
+[master.replication.coordinator.port]: {{ page.docs_baseurl }}/administration/properties#master_replication_coordinator_port
+[replication.receipt.service.port]: {{ page.docs_baseurl }}/administration/properties#replication_receipt_service_port
+[tserver.memory.maps.native.enabled]: {{ page.docs_baseurl }}/administration/properties#tserver_memory_maps_native_enabled
+[tserver.memory.maps.max]: {{ page.docs_baseurl }}/administration/properties#tserver_memory_maps_max
+[table.compaction.minor.logs.threshold]: {{ page.docs_baseurl }}/administration/properties#table_compaction_minor_logs_threshold
+[tserver.walog.max.size]: {{ page.docs_baseurl }}/administration/properties#tserver_walog_max_size
+[tserver.wal.blocksize]: {{ page.docs_baseurl }}/administration/properties#tserver_wal_blocksize
+[general.security.credential.provider.paths]: {{ page.docs_baseurl }}/administration/properties#general_security_credential_provider_paths
+[general.classpaths]: {{ page.docs_baseurl }}/administration/properties#general_classpaths
+[general.dynamic.classpaths]: {{ page.docs_baseurl }}/administration/properties#general_dynamic_classpaths
+[general.vfs.classpaths]: {{ page.docs_baseurl }}/administration/properties#general_vfs_classpaths
diff --git a/_docs-2-0/administration/monitoring-metrics.md b/_docs-2-0/administration/monitoring-metrics.md
index d37e6a4..48e3a9d 100644
--- a/_docs-2-0/administration/monitoring-metrics.md
+++ b/_docs-2-0/administration/monitoring-metrics.md
@@ -43,10 +43,10 @@ is strongly recommended that the Monitor is not exposed to any publicly-accessib
 
 SSL may be enabled for the monitor page by setting the following properties in the `accumulo-site.xml` file:
 
-    monitor.ssl.keyStore
-    monitor.ssl.keyStorePassword
-    monitor.ssl.trustStore
-    monitor.ssl.trustStorePassword
+ * [monitor.ssl.keyStore]
+ * [monitor.ssl.keyStorePassword]
+ * [monitor.ssl.trustStore]
+ * [monitor.ssl.trustStorePassword]
 
 If the Accumulo conf directory has been configured (in particular the `accumulo-env.sh` file must be set up), the 
 `accumulo-util gen-monitor-cert` command can be used to create the keystore and truststore files with random passwords. The command
@@ -55,8 +55,8 @@ Java `keytool` command, whose usage can be seen in the `accumulo-util` script.
 
 If desired, the SSL ciphers allowed for connections can be controlled via the following properties in `accumulo-site.xml`:
 
-    monitor.ssl.include.ciphers
-    monitor.ssl.exclude.ciphers
+ * [monitor.ssl.include.ciphers]
+ * [monitor.ssl.exclude.ciphers]
 
 If SSL is enabled, the monitor URL can only be accessed via https.
 This also allows you to access the Accumulo shell through the monitor page.
@@ -70,7 +70,7 @@ Accumulo can expose metrics through a legacy metrics library and using the Hadoo
 ### Legacy Metrics
 
 Accumulo has a legacy metrics library that can be exposes metrics using JMX endpoints or file-based logging. These metrics can
-be enabled by setting `general.legacy.metrics` to `true` in `accumulo-site.xml` and placing the `accumulo-metrics.xml`
+be enabled by setting [general.legacy.metrics] to `true` in `accumulo-site.xml` and placing the `accumulo-metrics.xml`
 configuration file on the classpath (which is typically done by placing the file in the `conf/` directory). A template for
 `accumulo-metrics.xml` can be found in `conf/templates` of the Accumulo tarball.
 
@@ -98,3 +98,10 @@ the Accumulo processes log files when debugging missing metrics output.
 For additional information on configuring Metrics2, visit the [Javadoc page for Metrics2](https://hadoop.apache.org/docs/current/api/org/apache/hadoop/metrics2/package-summary.html).
 
 [tracing]: {{page.docs_baseurl}}/administration/tracing
+[monitor.ssl.keyStore]: {{ page.docs_baseurl }}/administration/properties#monitor_ssl_keyStore
+[monitor.ssl.keyStorePassword]: {{ page.docs_baseurl }}/administration/properties#monitor_ssl_keystorePassword
+[monitor.ssl.trustStore]: {{ page.docs_baseurl }}/administration/properties#monitor_ssl_trustStore
+[monitor.ssl.trustStorePassword]: {{ page.docs_baseurl }}/administration/properties#monitor_ssl_trustStorePassword
+[monitor.ssl.include.ciphers]: {{ page.docs_baseurl }}/administration/properties#monitor_ssl_include_ciphers
+[monitor.ssl.exclude.ciphers]: {{ page.docs_baseurl }}/administration/properties#monitor_ssl_exclude_ciphers
+[general.legacy.metrics]: {{ page.docs_baseurl }}/administration/properties#general_legacy_metrics
diff --git a/_docs-2-0/administration/multivolume.md b/_docs-2-0/administration/multivolume.md
index 823e0a9..d79d735 100644
--- a/_docs-2-0/administration/multivolume.md
+++ b/_docs-2-0/administration/multivolume.md
@@ -10,7 +10,7 @@ under a lot of write pressure.
 The HDFS NameNode holds all of the metadata about the files in
 HDFS. For fast performance, all of this information needs to be stored
 in memory.  A single NameNode with 64G of memory can store the
-metadata for tens of millions of files.However, when scaling beyond a
+metadata for tens of millions of files. However, when scaling beyond a
 thousand nodes, an active Accumulo system can generate lots of updates
 to the file system, especially when data is being ingested.  The large
 number of write transactions to the NameNode, and the speed of a
@@ -24,7 +24,7 @@ routinely runs in less than a minute, the NameNode is performing well.
 
 However, if you do begin to experience slow-down and poor GC
 performance, Accumulo can be configured to use multiple NameNode
-servers.  The configuration `instance.volumes` should be set to a
+servers.  The configuration [instance.volumes] should be set to a
 comma-separated list, using full URI references to different NameNode
 servers:
 
@@ -46,10 +46,10 @@ If the URI for a namenode changes (e.g. namenode was running on host1 and its
 moved to host2), then Accumulo will no longer function.  Even if Hadoop and
 Accumulo configurations are changed, the fully qualified URIs stored in
 Accumulo will still contain the old URI.  To handle this Accumulo has the
-following configuration property for replacing URI stored in its metadata.  The
-example configuration below will replace ns1 with nsA and ns2 with nsB in
-Accumulo metadata.  For this property to take affect, Accumulo will need to be
-restarted.
+configuration property [instance.volumes.replacements] for replacing URI stored
+in its metadata.  The example configuration below will replace ns1 with nsA and
+ns2 with nsB in Accumulo metadata. For this property to take affect, Accumulo will
+need to be restarted.
 
 ```xml
 <property>
@@ -71,3 +71,6 @@ You may also want to configure your cluster to use Federation,
 available in Hadoop 2.0, which allows DataNodes to respond to multiple
 NameNode servers, so you do not have to partition your DataNodes by
 NameNode.
+
+[instance.volumes]: {{ page.docs_baseurl }}/administration/properties#instance_volumes
+[instance.volumes.replacements]: {{ page.docs_baseurl }}/administration/properties#instance_volumes_replacements
diff --git a/_docs-2-0/administration/configuration-properties.md b/_docs-2-0/administration/properties.md
similarity index 100%
rename from _docs-2-0/administration/configuration-properties.md
rename to _docs-2-0/administration/properties.md
diff --git a/_docs-2-0/administration/ssl.md b/_docs-2-0/administration/ssl.md
index 9aad37e..3cb10cf 100644
--- a/_docs-2-0/administration/ssl.md
+++ b/_docs-2-0/administration/ssl.md
@@ -32,11 +32,11 @@ these files already exist.
 
 In `accumulo-site.xml`, the following properties are required:
 
-* **rpc.javax.net.ssl.keyStore**=_The path on the local filesystem to the keystore containing the server's certificate_
-* **rpc.javax.net.ssl.keyStorePassword**=_The password for the keystore containing the server's certificate_
-* **rpc.javax.net.ssl.trustStore**=_The path on the local filesystem to the keystore containing the certificate authority's public key_
-* **rpc.javax.net.ssl.trustStorePassword**=_The password for the keystore containing the certificate authority's public key_
-* **instance.rpc.ssl.enabled**=_true_
+* [rpc.javax.net.ssl.keyStore]  = _The path on the local filesystem to the keystore containing the server's certificate_
+* [rpc.javax.net.ssl.keyStorePassword] = _The password for the keystore containing the server's certificate_
+* [rpc.javax.net.ssl.trustStore] = _The path on the local filesystem to the keystore containing the certificate authority's public key_
+* [rpc.javax.net.ssl.trustStorePassword] = _The password for the keystore containing the certificate authority's public key_
+* [instance.rpc.ssl.enabled] = _true_
 
 Optionally, SSL client-authentication (two-way SSL) can also be enabled by setting
 `instance.rpc.ssl.clientAuth=true` in `accumulo-site.xml`.
@@ -52,16 +52,16 @@ the client configuration file whose default location is `~/.accumulo/config`.
 
 The following properties must be set to connect to an Accumulo instance using SSL:
 
-* **rpc.javax.net.ssl.trustStore**=_The path on the local filesystem to the keystore containing the certificate authority's public key_
-* **rpc.javax.net.ssl.trustStorePassword**=_The password for the keystore containing the certificate authority's public key_
-* **instance.rpc.ssl.enabled**=_true_
+* [rpc.javax.net.ssl.trustStore] = _The path on the local filesystem to the keystore containing the certificate authority's public key_
+* [rpc.javax.net.ssl.trustStorePassword] = _The password for the keystore containing the certificate authority's public key_
+* [instance.rpc.ssl.enabled] = _true_
 
 If two-way SSL if enabled (`instance.rpc.ssl.clientAuth=true`) for the instance, the client must also define
 their own certificate and enable client authenticate as well.
 
-* **rpc.javax.net.ssl.keyStore**=_The path on the local filesystem to the keystore containing the server's certificate_
-* **rpc.javax.net.ssl.keyStorePassword**=_The password for the keystore containing the server's certificate_
-* **instance.rpc.ssl.clientAuth**=_true_
+* [rpc.javax.net.ssl.keyStore] =_The path on the local filesystem to the keystore containing the server's certificate_
+* [rpc.javax.net.ssl.keyStorePassword] = _The password for the keystore containing the server's certificate_
+* [instance.rpc.ssl.clientAuth] = _true_
 
 ## Generating SSL material using OpenSSL
 
@@ -122,3 +122,11 @@ keytool -import -trustcacerts -alias server-crt -file server.crt -keystore serve
 
 The `server.jks` file is the Java keystore containing the certificate for a given host. The above
 methods are equivalent whether the certificate is generate for an Accumulo server or a client.
+
+[instance.secret]: {{ page.docs_baseurl }}/administration/properties#instance_secret
+[rpc.javax.net.ssl.trustStore]: {{ page.docs_baseurl }}/administration/properties#rpc_javax_net_ssl_trustStore
+[rpc.javax.net.ssl.trustStorePassword]: {{ page.docs_baseurl }}/administration/properties#rpc_javax_net_ssl_trustStorePassword
+[instance.rpc.ssl.enabled]: {{ page.docs_baseurl }}/administration/properties#instance_rpc_ssl_enabled
+[rpc.javax.net.ssl.keyStore]: {{ page.docs_baseurl }}/administration/properties#rpc_javax_net_ssl_keyStore
+[rpc.javax.net.ssl.keyStorePassword]: {{ page.docs_baseurl }}/administration/properties#rpc_javax_net_ssl_keyStorePassword
+[instance.rpc.ssl.clientAuth]: {{ page.docs_baseurl }}/administration/properties#instance_rpc_ssl_clientAuth
diff --git a/_docs-2-0/administration/tracing.md b/_docs-2-0/administration/tracing.md
index 1fbc2ac..1b78aa5 100644
--- a/_docs-2-0/administration/tracing.md
+++ b/_docs-2-0/administration/tracing.md
@@ -30,14 +30,14 @@ configure your server in `conf/tracers`. The server collects traces from clients
 user that the tracer connects to Accumulo with can be configured with the following properties (see the [configuration management][config-mgmt] 
 page for setting Accumulo server properties)
 
-    trace.user
-    trace.token.property.password
+ * [trace.user]
+ * [trace.token.property.password]
 
 Other tracer configuration properties include
 
-    trace.port.client - port tracer listens on
-    trace.table - table tracer writes to
-    trace.zookeeper.path - zookeeper path where tracers register
+ * [trace.port.client] - port tracer listens on
+ * [trace.table] - table tracer writes to
+ * [trace.zookeeper.path] - zookeeper path where tracers register
 
 The zookeeper path is configured to /tracers by default.  If
 multiple Accumulo instances are sharing the same ZooKeeper
@@ -51,12 +51,10 @@ configured is org.apache.accumulo.core.trace.ZooTraceClient, which
 sends spans to an Accumulo Tracer process, as discussed in the
 previous section. This default can be changed to a different span
 receiver, or additional span receivers can be added in a
-comma-separated list, by modifying the property
-
-    trace.span.receivers
+comma-separated list, by modifying the property [trace.span.receivers].
 
 Individual span receivers may require their own configuration
-parameters, which are grouped under the trace.span.receiver.*
+parameters, which are grouped under the [trace.span.receiver.*]
 prefix.  ZooTraceClient uses the following properties.  The first
 three properties are populated from other Accumulo properties,
 while the remaining ones should be prefixed with
@@ -71,12 +69,12 @@ trace.span.receiver. when set in the Accumulo configuration.
 
 Note that to configure an Accumulo client for tracing, including
 the Accumulo shell, the client configuration must be given the same
-trace.span.receivers, trace.span.receiver.*, and trace.zookeeper.path
+[trace.span.receivers], [trace.span.receiver.*], and [trace.zookeeper.path]
 properties as the servers have.
 
 Hadoop can also be configured to send traces to Accumulo, as of
 Hadoop 2.6.0, by setting properties in Hadoop's core-site.xml
-file.  Instead of using the trace.span.receiver.* prefix, Hadoop
+file.  Instead of using the [trace.span.receiver.*] prefix, Hadoop
 uses hadoop.htrace.*.  The Hadoop configuration does not have
 access to Accumulo's properties, so the
 hadoop.htrace.tracer.zookeeper.host property must be specified.
@@ -108,7 +106,7 @@ jars must also be placed on Hadoop's classpath.
 
 ### Adding additional SpanReceivers
 
-[Zipkin](https://github.com/openzipkin/zipkin) has a SpanReceiver supported by HTrace and popularized by Twitter
+[Zipkin] has a SpanReceiver supported by HTrace and popularized by Twitter
 that users looking for a more graphical trace display may opt to use.
 The following steps configure Accumulo to use `org.apache.htrace.impl.ZipkinSpanReceiver`
 in addition to the Accumulo's default ZooTraceClient, and they serve as a template
@@ -344,4 +342,12 @@ Time  Start  Service@Location       Name
     5+1692           tserver@localhost tablet read ahead 6
 ```
 
-[config-mgmt]: {{page.docs_baseurl}}/administration/configuration-management
+[config-mgmt]: {{ page.docs_baseurl }}/administration/configuration-management
+[Zipkin]: https://github.com/openzipkin/zipkin
+[trace.user]: {{ page.docs_baseurl }}/administration/properties#trace_user
+[trace.token.property.password]: {{ page.docs_baseurl }}/administration/properties#trace_token_property_password
+[trace.port.client]: {{ page.docs_baseurl }}/administration/properties#trace_port_client
+[trace.table]: {{ page.docs_baseurl }}/administration/properties#trace_table
+[trace.zookeeper.path]: {{ page.docs_baseurl }}/administration/properties#trace_zookeeper_path
+[trace.span.receivers]: {{ page.docs_baseurl }}/administration/properties#trace_span_receivers
+[trace.span.receiver.*]: {{ page.docs_baseurl }}/administration/properties#trace_span_receiver_prefix
diff --git a/_docs-2-0/development/summaries.md b/_docs-2-0/development/summaries.md
index 1e8a8b4..33cd9eb 100644
--- a/_docs-2-0/development/summaries.md
+++ b/_docs-2-0/development/summaries.md
@@ -48,12 +48,12 @@ information.
 
 The following tablet server and table properties configure summarization.
 
-* [tserver.cache.summary.size]({{page.docs_baseurl}}/administration/configuration-properties#tserver_cache_summary_size)
-* [tserver.summary.partition.threads]({{page.docs_baseurl}}/administration/configuration-properties#tserver_summary_partition_threads)
-* [tserver.summary.remote.threads]({{page.docs_baseurl}}/administration/configuration-properties#tserver_summary_remote_threads)
-* [tserver.summary.retrieval.threads]({{page.docs_baseurl}}/administration/configuration-properties#tserver_summary_retreival_threads)
-* [table.summarizer.*]({{page.docs_baseurl}}/administration/configuration-properties#table_summarizer_prefix)
-* [table.file.summary.maxSize]({{page.docs_baseurl}}/administration/configuration-properties#table_file_summary_maxSize)
+* [tserver.cache.summary.size]({{page.docs_baseurl}}/administration/properties#tserver_cache_summary_size)
+* [tserver.summary.partition.threads]({{page.docs_baseurl}}/administration/properties#tserver_summary_partition_threads)
+* [tserver.summary.remote.threads]({{page.docs_baseurl}}/administration/properties#tserver_summary_remote_threads)
+* [tserver.summary.retrieval.threads]({{page.docs_baseurl}}/administration/properties#tserver_summary_retreival_threads)
+* [table.summarizer.*]({{page.docs_baseurl}}/administration/properties#table_summarizer_prefix)
+* [table.file.summary.maxSize]({{page.docs_baseurl}}/administration/properties#table_file_summary_maxSize)
 
 ## Permissions
 
diff --git a/_docs-2-0/getting-started/table_configuration.md b/_docs-2-0/getting-started/table_configuration.md
index 60090df..295c0b7 100644
--- a/_docs-2-0/getting-started/table_configuration.md
+++ b/_docs-2-0/getting-started/table_configuration.md
@@ -644,8 +644,8 @@ for example code.
 [combiner]: {{ page.javadoc_core }}/org/apache/accumulo/core/iterators/Combiner.html
 [combiner-example]: https://github.com/apache/accumulo-examples/blob/master/docs/combiner.md
 [filter]: {{ page.javadoc_core }}/org/apache/accumulo/core/iterators/Filter.html
-[table.majc.compaction.strategy]: {{ page.docs_baseurl}}/administration/configuration-properties#table_majc_compaction_strategy
-[config-properties]: {{ page.docs_baseurl}}/administration/configuration-properties
+[table.majc.compaction.strategy]: {{ page.docs_baseurl}}/administration/properties#table_majc_compaction_strategy
+[config-properties]: {{ page.docs_baseurl}}/administration/properties
 [Scanner]: {{ page.javadoc_core }}/org/apache/accumulo/core/client/Scanner.html
 [BatchScanner]: {{ page.javadoc_core}}/org/apache/accumulo/core/client/BatchScanner.html
 [Caching]: {{ page.docs_baseurl }}/administration/caching
diff --git a/contributor/making-release.md b/contributor/making-release.md
index 78256e1..7b85b92 100644
--- a/contributor/making-release.md
+++ b/contributor/making-release.md
@@ -127,9 +127,9 @@ for two markdown files that should be changed in the Accumulo repo and copied/mi
 
         meld /path/to/accumulo/INSTALL.md /path/to/accumulo-website/_docs-2-x/getting-started/quick-install.md
 
-2. `configuration-properties` is copied after it is generated by the Accumulo build.
+2. `properties.md` is copied after it is generated by the Accumulo build.
 
-        cp /path/to/accumulo/core/target/generated-docs/configuration-properties.md /path/to/accumulo-website/_docs-2-x/administration/configuration-properties.md
+        cp /path/to/accumulo/core/target/generated-docs/properties.md /path/to/accumulo-website/_docs-2-x/administration/properties.md
 
 **For 2.x minor releases,** follow the steps below to create docs for next release:
 
@@ -146,11 +146,11 @@ for two markdown files that should be changed in the Accumulo repo and copied/mi
 3. Point Jekyll to the new documentation collection by modifying `collections` and `defaults` in `_config.yml`. Follow what was done for previous
    releases.
 
-4. Copy `configuration-properties` and mirror `INSTALL.md`.
+4. Copy `properties.md` and mirror `INSTALL.md`.
 
 Once a collection is created for a 2.x minor release, developers can make documentation updates like normal website updates.
 
-**For 2.x bugfix releases,** copy `configuration-properties` and mirror `INSTALL.md`.
+**For 2.x bugfix releases,** copy `properties.md` and mirror `INSTALL.md`.
 
 **For 1.x minor & bugfix releases,** copy `accumulo_user_manual.html` generated for release to the `1.x/` directory in the [accumulo-website repo][website-repo].
 

-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <co...@accumulo.apache.org>.