accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [accumulo-website] branch asf-site updated: Jekyll build from master:d4847f5
Date Thu, 06 Sep 2018 17:04:12 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
     new 75745a3  Jekyll build from master:d4847f5
75745a3 is described below

commit 75745a35de88796c1f07455d997108dbda7ba44a
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Thu Sep 6 12:56:32 2018 -0400

    Jekyll build from master:d4847f5
    
    Updated docs to reflect change to accumulo.properties (#106)
    
    * Migrated changes in quick-install.md & properties.md from
      Accumulo master
---
 .../administration/configuration-management.html   | 12 ++--
 docs/2.0/administration/in-depth-install.html      | 76 ++++++++--------------
 docs/2.0/administration/kerberos.html              | 34 +++-------
 docs/2.0/administration/monitoring-metrics.html    |  8 +--
 docs/2.0/administration/multivolume.html           | 10 +--
 docs/2.0/administration/properties.html            | 14 ++--
 docs/2.0/administration/replication.html           | 27 +++-----
 docs/2.0/administration/ssl.html                   |  6 +-
 docs/2.0/administration/tracing.html               | 21 ++----
 docs/2.0/getting-started/quick-install.html        | 37 ++++++++---
 docs/2.0/troubleshooting/basic.html                |  2 +-
 docs/2.0/troubleshooting/tools.html                |  2 +-
 feed.xml                                           |  4 +-
 redirects.json                                     |  2 +-
 search_data.json                                   | 24 +++----
 15 files changed, 116 insertions(+), 163 deletions(-)

diff --git a/docs/2.0/administration/configuration-management.html b/docs/2.0/administration/configuration-management.html
index 311a279..d0833fa 100644
--- a/docs/2.0/administration/configuration-management.html
+++ b/docs/2.0/administration/configuration-management.html
@@ -354,8 +354,8 @@ set in the following locations (with increasing precedence):</p>
 
 <ol>
   <li>Default values</li>
-  <li>accumulo-site.xml (overrides defaults)</li>
-  <li>Zookeeper (overrides accumulo-site.xml &amp; defaults)</li>
+  <li>accumulo.properties (overrides defaults)</li>
+  <li>Zookeeper (overrides accumulo.properties &amp; defaults)</li>
 </ol>
 
 <p>If a property is set in multiple locations, the value in the location with the highest precedence is used.</p>
@@ -367,11 +367,11 @@ set in the following locations (with increasing precedence):</p>
 <p>All <a href="/docs/2.0/administration/properties">server properties</a> have a default value that is listed for each property on the <a href="/docs/2.0/administration/properties">properties</a> page. Default values are set in the source code.
 While default values have the lowest precedence, they are usually optimal.  However, there are cases where a change can increase query and ingest performance.</p>
 
-<h3 id="accumulo-sitexml">accumulo-site.xml</h3>
+<h3 id="accumuloproperties">accumulo.properties</h3>
 
-<p>Setting <a href="/docs/2.0/administration/properties">server properties</a> in accumulo-site.xml will override their default value. If you are running Accumulo on a cluster, any updates to accumulo-site.xml must
-be synced across the cluster. Accumulo processes (master, tserver, etc) read their local accumulo-site.xml on start up so processes must be restarted to apply changes.
-Certain properties can only be set in accumulo-site.xml. These properties have <strong>zk mutable: no</strong> in their description. Setting properties in accumulo-site.xml allows you
+<p>Setting <a href="/docs/2.0/administration/properties">server properties</a> in accumulo.properties will override their default value. If you are running Accumulo on a cluster, any updates to accumulo.properties must
+be synced across the cluster. Accumulo processes (master, tserver, etc) read their local accumulo.properties on start up so processes must be restarted to apply changes.
+Certain properties can only be set in accumulo.properties. These properties have <strong>zk mutable: no</strong> in their description. Setting properties in accumulo.properties allows you
 to configure tablet servers with different settings.</p>
 
 <h3 id="zookeeper">Zookeeper</h3>
diff --git a/docs/2.0/administration/in-depth-install.html b/docs/2.0/administration/in-depth-install.html
index a5f4573..1af0d54 100644
--- a/docs/2.0/administration/in-depth-install.html
+++ b/docs/2.0/administration/in-depth-install.html
@@ -368,7 +368,7 @@ network bandwidth must be available between any two machines.</p>
 
 <p>In addition to needing access to ports associated with HDFS and ZooKeeper, Accumulo will
 use the following default ports. Please make sure that they are open, or change
-their value in accumulo-site.xml.</p>
+their value in accumulo.properties.</p>
 
 <table>
   <thead>
@@ -479,7 +479,7 @@ sync, which can cause problems with automatically timestamped data.</p>
 installed Accumulo using downstream packaging, the <code class="highlighter-rouge">conf/</code> could be something else like
 <code class="highlighter-rouge">/etc/accumulo/</code>.</p>
 
-<p>Before starting Accumulo, the configuration files <code class="highlighter-rouge">accumulo-env.sh</code> and <code class="highlighter-rouge">accumulo-site.xml</code> must
+<p>Before starting Accumulo, the configuration files <code class="highlighter-rouge">accumulo-env.sh</code> and <code class="highlighter-rouge">accumulo.properties</code> must
 exist in <code class="highlighter-rouge">conf/</code> and be properly configured. If you are using <code class="highlighter-rouge">accumulo-cluster</code> to launch
 a cluster, the <code class="highlighter-rouge">conf/</code> directory must also contain hosts file for Accumulo services (i.e <code class="highlighter-rouge">gc</code>,
 <code class="highlighter-rouge">masters</code>, <code class="highlighter-rouge">monitor</code>, <code class="highlighter-rouge">tservers</code>, <code class="highlighter-rouge">tracers</code>). You can either create these files manually or run
@@ -604,15 +604,15 @@ machine that will serve as the Accumulo master:</p>
 properly for all machines participating in the cluster. DNS can be a confusing source
 of errors.</p>
 
-<h3 id="configure-accumulo-sitexml">Configure accumulo-site.xml</h3>
+<h3 id="configure-accumuloproperties">Configure accumulo.properties</h3>
 
-<p>Specify appropriate values for the following properties in <code class="highlighter-rouge">accumulo-site.xml</code>:</p>
+<p>Specify appropriate values for the following properties in <code class="highlighter-rouge">accumulo.properties</code>:</p>
 
 <ul>
   <li><a href="/docs/2.0/administration/properties#instance_zookeeper_host">instance.zookeeper.host</a> - Enables Accumulo to find ZooKeeper. Accumulo uses ZooKeeper
 to coordinate settings between processes and helps finalize TabletServer failure.</li>
   <li><a href="/docs/2.0/administration/properties#instance_secret">instance.secret</a> - The instance needs a secret to enable secure communication between servers.
-Configure your secret and make sure that the <code class="highlighter-rouge">accumulo-site.xml</code> file is not readable to other users.
+Configure your secret and make sure that the <code class="highlighter-rouge">accumulo.properties</code> file is not readable to other users.
 For alternatives to storing the <a href="/docs/2.0/administration/properties#instance_secret">instance.secret</a> in plaintext, please read the
 <a href="#sensitive-configuration-values">Sensitive Configuration Values</a> section.</li>
 </ul>
@@ -625,7 +625,7 @@ documentation for details.</p>
 
 <p>Accumulo has a number of configuration files which can contain references to other hosts in your
 network. All of the “host” configuration files for Accumulo (<code class="highlighter-rouge">gc</code>, <code class="highlighter-rouge">masters</code>, <code class="highlighter-rouge">tservers</code>, <code class="highlighter-rouge">monitor</code>,
-<code class="highlighter-rouge">tracers</code>) as well as <code class="highlighter-rouge">instance.volumes</code> in accumulo-site.xml must contain some host reference.</p>
+<code class="highlighter-rouge">tracers</code>) as well as <code class="highlighter-rouge">instance.volumes</code> in accumulo.properties must contain some host reference.</p>
 
 <p>While IP address, short hostnames, or fully qualified domain names (FQDN) are all technically valid, it
 is good practice to always use FQDNs for both Accumulo and other processes in your Hadoop cluster.
@@ -640,13 +640,13 @@ Accumulo identifies <code class="highlighter-rouge">localhost:8020</code> as a d
 
 <h3 id="deploy-configuration">Deploy Configuration</h3>
 
-<p>Copy accumulo-env.sh and accumulo-site.xml from the <code class="highlighter-rouge">conf/</code> directory on the master to all Accumulo
+<p>Copy accumulo-env.sh and accumulo.properties from the <code class="highlighter-rouge">conf/</code> directory on the master to all Accumulo
 tablet servers.  The “host” configuration files files <code class="highlighter-rouge">accumulo-cluster</code> only need to be on servers
 where that command is run.</p>
 
 <h3 id="sensitive-configuration-values">Sensitive Configuration Values</h3>
 
-<p>Accumulo has a number of properties that can be specified via the accumulo-site.xml
+<p>Accumulo has a number of properties that can be specified via the accumulo.properties
 file which are sensitive in nature, <a href="/docs/2.0/administration/properties#instance_secret">instance.secret</a> and <code class="highlighter-rouge">trace.token.property.password</code>
 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.</p>
@@ -659,7 +659,7 @@ these classes, the feature will just be unavailable for use.</p>
 
 <p>A comma separated list of CredentialProviders can be configured using the Accumulo Property
 <a href="/docs/2.0/administration/properties#general_security_credential_provider_paths">general.security.credential.provider.paths</a>. Each configured URL will be consulted
-when the Configuration object for accumulo-site.xml is accessed.</p>
+when the Configuration object for accumulo.properties is accessed.</p>
 
 <h3 id="using-a-javakeystorecredentialprovider-for-storage">Using a JavaKeyStoreCredentialProvider for storage</h3>
 
@@ -675,12 +675,9 @@ Each entry in the KeyStore is the Accumulo Property key name. For example, to st
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>/path/to/accumulo/conf/accumulo.jceks
 </code></pre></div></div>
 
-<p>Then, accumulo-site.xml must be configured to use this KeyStore as a CredentialProvider:</p>
+<p>Then, <code class="highlighter-rouge">accumulo.properties</code> must be configured to use this KeyStore as a CredentialProvider:</p>
 
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;property&gt;</span>
-    <span class="nt">&lt;name&gt;</span>general.security.credential.provider.paths<span class="nt">&lt;/name&gt;</span>
-    <span class="nt">&lt;value&gt;</span>jceks://file/path/to/accumulo/conf/accumulo.jceks<span class="nt">&lt;/value&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>general.security.credential.provider.paths=jceks://file/path/to/accumulo/conf/accumulo.jceks
 </code></pre></div></div>
 
 <p>This configuration will then transparently extract the <a href="/docs/2.0/administration/properties#instance_secret">instance.secret</a> from
@@ -729,25 +726,18 @@ configuration will also monitor the vfs locations for changes and reload if nece
 <h5 id="classloader-contexts">ClassLoader Contexts</h5>
 
 <p>With the addition of the VFS based classloader, we introduced the notion of classloader contexts. A context is identified
-by a name and references a set of locations from which to load classes and can be specified in the accumulo-site.xml file or added
-using the <code class="highlighter-rouge">config</code> command in the shell. Below is an example for specify the app1 context in the accumulo-site.xml file:</p>
-
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;property&gt;</span>
-  <span class="nt">&lt;name&gt;</span>general.vfs.context.classpath.app1<span class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>hdfs://localhost:8020/applicationA/classpath/.*.jar,file:///opt/applicationA/lib/.*.jar<span class="nt">&lt;/value&gt;</span>
-  <span class="nt">&lt;description&gt;</span>Application A classpath, loads jars from HDFS and local file system<span class="nt">&lt;/description&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
+by a name and references a set of locations from which to load classes and can be specified in the accumulo.properties file or added
+using the <code class="highlighter-rouge">config</code> command in the shell. Below is an example for specify the app1 context in the accumulo.properties file:</p>
+
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code># Application A classpath, loads jars from HDFS and local file system
+general.vfs.context.classpath.app1=hdfs://localhost:8020/applicationA/classpath/.*.jar,file:///opt/applicationA/lib/.*.jar
 </code></pre></div></div>
 
 <p>The default behavior follows the Java ClassLoader contract in that classes, if they exists, are loaded from the parent classloader first.
 You can override this behavior by delegating to the parent classloader after looking in this classloader first. An example of this
 configuration is:</p>
 
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;property&gt;</span>
-  <span class="nt">&lt;name&gt;</span>general.vfs.context.classpath.app1.delegation=post<span class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>hdfs://localhost:8020/applicationA/classpath/.*.jar,file:///opt/applicationA/lib/.*.jar<span class="nt">&lt;/value&gt;</span>
-  <span class="nt">&lt;description&gt;</span>Application A classpath, loads jars from HDFS and local file system<span class="nt">&lt;/description&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>general.vfs.context.classpath.app1.delegation=post
 </code></pre></div></div>
 
 <p>To use contexts in your application you can set the <code class="highlighter-rouge">table.classpath.context</code> on your tables or use the <code class="highlighter-rouge">setClassLoaderContext()</code> method on Scanner
@@ -854,16 +844,10 @@ to be able to scale to using 10’s of GB of RAM and 10’s of CPU cores.</p>
 <p>Accumulo TabletServers bind certain ports on the host to accommodate remote procedure calls to/from
 other nodes. Running more than one TabletServer on a host requires that you set the environment variable
 <code class="highlighter-rouge">ACCUMULO_SERVICE_INSTANCE</code> to an instance number (i.e 1, 2) for each instance that is started. Also, set
-these properties in <code class="highlighter-rouge">accumulo-site.xml</code>:</p>
-
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="nt">&lt;property&gt;</span>
-    <span class="nt">&lt;name&gt;</span>tserver.port.search<span class="nt">&lt;/name&gt;</span>
-    <span class="nt">&lt;value&gt;</span>true<span class="nt">&lt;/value&gt;</span>
-  <span class="nt">&lt;/property&gt;</span>
-  <span class="nt">&lt;property&gt;</span>
-    <span class="nt">&lt;name&gt;</span>replication.receipt.service.port<span class="nt">&lt;/name&gt;</span>
-    <span class="nt">&lt;value&gt;</span>0<span class="nt">&lt;/value&gt;</span>
-  <span class="nt">&lt;/property&gt;</span>
+these properties in <code class="highlighter-rouge">accumulo.properties</code>:</p>
+
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>tserver.port.search=true
+replication.receipt.service.port=0
 </code></pre></div></div>
 
 <h2 id="logging">Logging</h2>
@@ -913,21 +897,15 @@ Listing volumes referenced in accumulo.metadata deletes section (volume replacem
 
 <p>After verifying the current volume is correct, shut down the cluster and transition HDFS to the HA nameservice.</p>
 
-<p>Edit <code class="highlighter-rouge">accumulo-site.xml</code> to notify accumulo that a volume is being replaced. First,
+<p>Edit <code class="highlighter-rouge">accumulo.properties</code> to notify accumulo that a volume is being replaced. First,
 add the new nameservice volume to the <code class="highlighter-rouge">instance.volumes</code> property. Next, add the
 <code class="highlighter-rouge">instance.volumes.replacements</code> property in the form of <code class="highlighter-rouge">old new</code>. It’s important to not include
 the volume that’s being replaced in <code class="highlighter-rouge">instance.volumes</code>, otherwise it’s possible accumulo could continue
 to write to the volume.</p>
 
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c">&lt;!-- instance.dfs.uri and instance.dfs.dir should not be set--&gt;</span>
-<span class="nt">&lt;property&gt;</span>
-  <span class="nt">&lt;name&gt;</span>instance.volumes<span class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>hdfs://nameservice1/accumulo<span class="nt">&lt;/value&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
-<span class="nt">&lt;property&gt;</span>
-  <span class="nt">&lt;name&gt;</span>instance.volumes.replacements<span class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>hdfs://namenode.example.com:8020/accumulo hdfs://nameservice1/accumulo<span class="nt">&lt;/value&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code># instance.dfs.uri and instance.dfs.dir should not be set
+instance.volumes=hdfs://nameservice1/accumulo
+instance.volumes.replacements=hdfs://namenode.example.com:8020/accumulo hdfs://nameservice1/accumulo
 </code></pre></div></div>
 
 <p>Run <code class="highlighter-rouge">accumulo init --add-volumes</code> and start up the accumulo cluster. Verify that the
@@ -1005,7 +983,7 @@ process kills do not show up in Accumulo or Hadoop logs.</p>
 
 <p>To calculate the max memory usage of all java virtual machine (JVM) processes
 add the maximum heap size (often limited by a -Xmx… argument, such as in
-accumulo-site.xml) and the off-heap memory usage. Off-heap memory usage
+accumulo.properties) and the off-heap memory usage. Off-heap memory usage
 includes the following:</p>
 
 <ul>
@@ -1013,7 +991,7 @@ includes the following:</p>
   <li>Code generation space, where the JVM stores just-in-time compiled code. This is typically small enough to ignore</li>
   <li>Socket buffers, where the JVM stores send and receive buffers for each socket.</li>
   <li>Thread stacks, where the JVM allocates memory to manage each thread.</li>
-  <li>Direct memory space and JNI code, where applications can allocate memory outside of the JVM-managed space. For Accumulo, this includes the native in-memory maps that are allocated with the memory.maps.max parameter in accumulo-site.xml.</li>
+  <li>Direct memory space and JNI code, where applications can allocate memory outside of the JVM-managed space. For Accumulo, this includes the native in-memory maps that are allocated with the memory.maps.max parameter in accumulo.properties.</li>
   <li>Garbage collection space, where the JVM stores information used for garbage collection.</li>
 </ul>
 
diff --git a/docs/2.0/administration/kerberos.html b/docs/2.0/administration/kerberos.html
index 0c52880..cbfb828 100644
--- a/docs/2.0/administration/kerberos.html
+++ b/docs/2.0/administration/kerberos.html
@@ -470,7 +470,7 @@ all Accumulo servers must share the same instance and realm principal components
 <h4 id="server-configuration">Server Configuration</h4>
 
 <p>A number of properties need to be changed to account to properly configure servers
-in <code class="highlighter-rouge">accumulo-site.xml</code>.</p>
+in <code class="highlighter-rouge">accumulo.properties</code>.</p>
 
 <table>
   <thead>
@@ -590,12 +590,12 @@ also be given by the <code class="highlighter-rouge">-u</code> or <code class="h
 <p>If you are enabling Kerberos on an existing cluster, you will need to reinitialize the security system in
 order to replace the existing “root” user with one that can be used with Kerberos. These steps should be
 completed after you have done the previously described configuration changes and will require access to
-a complete <code class="highlighter-rouge">accumulo-site.xml</code>, including the instance secret. Note that this process will delete all
+a complete <code class="highlighter-rouge">accumulo.properties</code>, including the instance secret. Note that this process will delete all
 existing users in the system; you will need to reassign user permissions based on Kerberos principals.</p>
 
 <ol>
   <li>Ensure Accumulo is not running.</li>
-  <li>Given the path to a <code class="highlighter-rouge">accumulo-site.xml</code> with the instance secret, run the security reset tool. If you are
+  <li>Given the path to a <code class="highlighter-rouge">accumulo.properties</code> with the instance secret, run the security reset tool. If you are
 prompted for a password you can just hit return, since it won’t be used.</li>
   <li>Start the Accumulo cluster</li>
 </ol>
@@ -632,20 +632,13 @@ access to the secret key material in order to make a secure connection to Accumu
 it can only connect to Accumulo as itself. Impersonation, in this context, refers to the ability
 of the proxy to authenticate to Accumulo as itself, but act on behalf of an Accumulo user.</p>
 
-<p>Accumulo supports basic impersonation of end-users by a third party via static rules in Accumulo’s
-site configuration file. These two properties are semi-colon separated properties which are aligned
+<p>Accumulo supports basic impersonation of end-users by a third party via static rules in
+<code class="highlighter-rouge">accumulo.properties</code>. These two properties are semi-colon separated properties which are aligned
 by index. This first element in the user impersonation property value matches the first element
 in the host impersonation property value, etc.</p>
 
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;property&gt;</span>
-  <span class="nt">&lt;name&gt;</span>instance.rpc.sasl.allowed.user.impersonation<span class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>$PROXY_USER:*<span class="nt">&lt;/value&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
-
-<span class="nt">&lt;property&gt;</span>
-  <span class="nt">&lt;name&gt;</span>instance.rpc.sasl.allowed.host.impersonation<span class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>*<span class="nt">&lt;/value&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>instance.rpc.sasl.allowed.user.impersonation=$PROXY_USER:*
+instance.rpc.sasl.allowed.host.impersonation=*
 </code></pre></div></div>
 
 <p>Here, <code class="highlighter-rouge">$PROXY_USER</code> can impersonate any user from any host.</p>
@@ -653,15 +646,8 @@ in the host impersonation property value, etc.</p>
 <p>The following is an example of specifying a subset of users <code class="highlighter-rouge">$PROXY_USER</code> can impersonate and also
 limiting the hosts from which <code class="highlighter-rouge">$PROXY_USER</code> can initiate requests from.</p>
 
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;property&gt;</span>
-  <span class="nt">&lt;name&gt;</span>instance.rpc.sasl.allowed.user.impersonation<span class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>$PROXY_USER:user1,user2;$PROXY_USER2:user2,user4<span class="nt">&lt;/value&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
-
-<span class="nt">&lt;property&gt;</span>
-  <span class="nt">&lt;name&gt;</span>instance.rpc.sasl.allowed.host.impersonation<span class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>host1.domain.com,host2.domain.com;*<span class="nt">&lt;/value&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>instance.rpc.sasl.allowed.user.impersonation=$PROXY_USER:user1,user2;$PROXY_USER2:user2,user4
+instance.rpc.sasl.allowed.host.impersonation=host1.domain.com,host2.domain.com;*
 </code></pre></div></div>
 
 <p>Here, <code class="highlighter-rouge">$PROXY_USER</code> can impersonate user1 and user2 only from host1.domain.com or host2.domain.com.
@@ -978,7 +964,7 @@ when I attempt to use the “Recent Traces” page on the Monitor UI I get a sta
 
 <p><strong>A</strong>: This indicates that the Monitor has not been able to successfully log in a client-side user to read from the <code class="highlighter-rouge">trace</code> table. Accumulo allows the TraceServer to rely on the property <code class="highlighter-rouge">general.kerberos.keytab</code> as a fallback when logging in the trace user if the <code class="highlighter-rouge">trace.token.property.keytab</code> property isn’t defined. Some earlier versions of Accumulo did not do t [...]
 
-<p>Ensure you have set <code class="highlighter-rouge">trace.token.property.keytab</code> to point to a keytab for the principal defined in <code class="highlighter-rouge">trace.user</code> in the <code class="highlighter-rouge">accumulo-site.xml</code> file for the Monitor, since that should work in all versions of Accumulo.</p>
+<p>Ensure you have set <code class="highlighter-rouge">trace.token.property.keytab</code> to point to a keytab for the principal defined in <code class="highlighter-rouge">trace.user</code> in the <code class="highlighter-rouge">accumulo.properties</code> file for the Monitor, since that should work in all versions of Accumulo.</p>
 
 
 
diff --git a/docs/2.0/administration/monitoring-metrics.html b/docs/2.0/administration/monitoring-metrics.html
index f968725..3dd2b3c 100644
--- a/docs/2.0/administration/monitoring-metrics.html
+++ b/docs/2.0/administration/monitoring-metrics.html
@@ -377,7 +377,7 @@ is strongly recommended that the Monitor is not exposed to any publicly-accessib
 
 <h3 id="ssl">SSL</h3>
 
-<p>SSL may be enabled for the monitor page by setting the following properties in the <code class="highlighter-rouge">accumulo-site.xml</code> file:</p>
+<p>SSL may be enabled for the monitor page by setting the following properties in the <code class="highlighter-rouge">accumulo.properties</code> file:</p>
 
 <ul>
   <li><a href="/docs/2.0/administration/properties#monitor_ssl_keyStore">monitor.ssl.keyStore</a></li>
@@ -388,10 +388,10 @@ is strongly recommended that the Monitor is not exposed to any publicly-accessib
 
 <p>If the Accumulo conf directory has been configured (in particular the <code class="highlighter-rouge">accumulo-env.sh</code> file must be set up), the 
 <code class="highlighter-rouge">accumulo-util gen-monitor-cert</code> command can be used to create the keystore and truststore files with random passwords. The command
-will print out the properties that need to be added to the <code class="highlighter-rouge">accumulo-site.xml</code> file. The stores can also be generated manually with the
+will print out the properties that need to be added to the <code class="highlighter-rouge">accumulo.properties</code> file. The stores can also be generated manually with the
 Java <code class="highlighter-rouge">keytool</code> command, whose usage can be seen in the <code class="highlighter-rouge">accumulo-util</code> script.</p>
 
-<p>If desired, the SSL ciphers allowed for connections can be controlled via the following properties in <code class="highlighter-rouge">accumulo-site.xml</code>:</p>
+<p>If desired, the SSL ciphers allowed for connections can be controlled via the following properties in <code class="highlighter-rouge">accumulo.properties</code>:</p>
 
 <ul>
   <li><a href="/docs/2.0/administration/properties#monitor_ssl_include_ciphers">monitor.ssl.include.ciphers</a></li>
@@ -410,7 +410,7 @@ An Accumulo user name and password must be entered for access to the shell.</p>
 <h3 id="legacy-metrics">Legacy Metrics</h3>
 
 <p>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 <a href="/docs/2.0/administration/properties#general_legacy_metrics">general.legacy.metrics</a> to <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo-site.xml</code> and placing the <code class="highlighter-rouge">accumulo-metrics.xml</code>
+be enabled by setting <a href="/docs/2.0/administration/properties#general_legacy_metrics">general.legacy.metrics</a> to <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo.properties</code> and placing the <code class="highlighter-rouge">accumulo-metrics.xml</code>
 configuration file on the classpath (which is typically done by placing the file in the <code class="highlighter-rouge">conf/</code> directory). A template for
 <code class="highlighter-rouge">accumulo-metrics.xml</code> can be found in <code class="highlighter-rouge">conf/templates</code> of the Accumulo tarball.</p>
 
diff --git a/docs/2.0/administration/multivolume.html b/docs/2.0/administration/multivolume.html
index 937cba0..4b18b74 100644
--- a/docs/2.0/administration/multivolume.html
+++ b/docs/2.0/administration/multivolume.html
@@ -364,10 +364,7 @@ servers.  The configuration <a href="/docs/2.0/administration/properties#instanc
 comma-separated list, using full URI references to different NameNode
 servers:</p>
 
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;property&gt;</span>
-    <span class="nt">&lt;name&gt;</span>instance.volumes<span class="nt">&lt;/name&gt;</span>
-    <span class="nt">&lt;value&gt;</span>hdfs://ns1:9001,hdfs://ns2:9001<span class="nt">&lt;/value&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>instance.volumes=hdfs://ns1:9001,hdfs://ns2:9001
 </code></pre></div></div>
 
 <p>The introduction of multiple volume support in 1.6 changed the way Accumulo
@@ -386,10 +383,7 @@ 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.</p>
 
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;property&gt;</span>
-    <span class="nt">&lt;name&gt;</span>instance.volumes.replacements<span class="nt">&lt;/name&gt;</span>
-    <span class="nt">&lt;value&gt;</span>hdfs://ns1:9001 hdfs://nsA:9001, hdfs://ns2:9001 hdfs://nsB:9001<span class="nt">&lt;/value&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code>instance.volumes.replacements=hdfs://ns1:9001 hdfs://nsA:9001, hdfs://ns2:9001 hdfs://nsB:9001
 </code></pre></div></div>
 
 <p>Using viewfs or HA namenode, introduced in Hadoop 2, offers another option for
diff --git a/docs/2.0/administration/properties.html b/docs/2.0/administration/properties.html
index 6dc33e4..d0ebec3 100644
--- a/docs/2.0/administration/properties.html
+++ b/docs/2.0/administration/properties.html
@@ -342,7 +342,7 @@
 
     <!-- WARNING: Do not edit this file. It is a generated file that is copied from Accumulo build (from core/target/generated-docs) -->
 
-<p>Below are properties set in <code class="highlighter-rouge">accumulo-site.xml</code> or the Accumulo shell that configure Accumulo servers (i.e tablet server, master, etc):</p>
+<p>Below are properties set in <code class="highlighter-rouge">accumulo.properties</code> or the Accumulo shell that configure Accumulo servers (i.e tablet server, master, etc):</p>
 
 <table>
   <thead>
@@ -365,10 +365,6 @@
       <td>Time to wait before attempting to garbage collect any old RFiles or write-ahead logs.<br /><strong>type:</strong> TIMEDURATION, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">30s</code></td>
     </tr>
     <tr>
-      <td><a name="gc_file_archive" class="prop"></a> gc.file.archive</td>
-      <td>Archive any files/directories instead of moving to the HDFS trash or deleting.<br /><strong>type:</strong> BOOLEAN, <strong>zk mutable:</strong> yes, <strong>default value:</strong> <code class="highlighter-rouge">false</code></td>
-    </tr>
-    <tr>
       <td><a name="gc_port_client" class="prop"></a> gc.port.client</td>
       <td>The listening port for the garbage collector’s monitor service<br /><strong>type:</strong> PORT, <strong>zk mutable:</strong> yes but requires restart of the gc, <strong>default value:</strong> <code class="highlighter-rouge">9998</code></td>
     </tr>
@@ -454,7 +450,7 @@
     </tr>
     <tr>
       <td><a name="general_vfs_context_classpath_prefix" class="prop"></a> <strong>general.vfs.context.classpath.</strong>*</td>
-      <td>Properties in this category are define a classpath. These properties start  with the category prefix, followed by a context name. The value is a comma seperated list of URIs. Supports full regex on filename alone. For example, general.vfs.context.classpath.cx1=hdfs://nn1:9902/mylibdir/*.jar. You can enable post delegation for a context, which will load classes from the context first instead of the parent first. Do this by setting <code class="highlighter-rouge">general.vfs.cont [...]
+      <td>Properties in this category are define a classpath. These properties start  with the category prefix, followed by a context name. The value is a comma separated list of URIs. Supports full regex on filename alone. For example, general.vfs.context.classpath.cx1=hdfs://nn1:9902/mylibdir/*.jar. You can enable post delegation for a context, which will load classes from the context first instead of the parent first. Do this by setting <code class="highlighter-rouge">general.vfs.cont [...]
     </tr>
     <tr>
       <td><a name="instance_prefix" class="prop"></a> <strong>instance.</strong>*</td>
@@ -490,7 +486,7 @@
     </tr>
     <tr>
       <td><a name="instance_secret" class="prop"></a> instance.secret</td>
-      <td>A secret unique to a given instance that all servers must know in order to communicate with one another. It should be changed prior to the initialization of Accumulo. To change it after Accumulo has been initialized, use the ChangeSecret tool and then update accumulo-site.xml everywhere. Before using the ChangeSecret tool, make sure Accumulo is not running and you are logged in as the user that controls Accumulo files in HDFS. To use the ChangeSecret tool, run the command: ./bi [...]
+      <td>A secret unique to a given instance that all servers must know in order to communicate with one another. It should be changed prior to the initialization of Accumulo. To change it after Accumulo has been initialized, use the ChangeSecret tool and then update accumulo.properties everywhere. Before using the ChangeSecret tool, make sure Accumulo is not running and you are logged in as the user that controls Accumulo files in HDFS. To use the ChangeSecret tool, run the command: ./ [...]
     </tr>
     <tr>
       <td><a name="instance_security_authenticator" class="prop"></a> instance.security.authenticator</td>
@@ -506,11 +502,11 @@
     </tr>
     <tr>
       <td><a name="instance_volumes" class="prop"></a> instance.volumes</td>
-      <td>A comma seperated list of dfs uris to use. Files will be stored across these filesystems. If this is empty, then instance.dfs.uri will be used. After adding uris to this list, run ‘accumulo init –add-volume’ and then restart tservers. If entries are removed from this list then tservers will need to be restarted. After a uri is removed from the list Accumulo will not create new files in that location, however Accumulo can still reference files created at that location before the [...]
+      <td>A comma separated list of dfs uris to use. Files will be stored across these filesystems. If this is empty, then instance.dfs.uri will be used. After adding uris to this list, run ‘accumulo init –add-volume’ and then restart tservers. If entries are removed from this list then tservers will need to be restarted. After a uri is removed from the list Accumulo will not create new files in that location, however Accumulo can still reference files created at that location before the [...]
     </tr>
     <tr>
       <td><a name="instance_volumes_replacements" class="prop"></a> instance.volumes.replacements</td>
-      <td>Since accumulo stores absolute URIs changing the location of a namenode could prevent Accumulo from starting. The property helps deal with that situation. Provide a comma separated list of uri replacement pairs here if a namenode location changes. Each pair shold be separated with a space. For example, if hdfs://nn1 was replaced with hdfs://nnA and hdfs://nn2 was replaced with hdfs://nnB, then set this property to ‘hdfs://nn1 hdfs://nnA,hdfs://nn2 hdfs://nnB’ Replacements must  [...]
+      <td>Since accumulo stores absolute URIs changing the location of a namenode could prevent Accumulo from starting. The property helps deal with that situation. Provide a comma separated list of uri replacement pairs here if a namenode location changes. Each pair should be separated with a space. For example, if hdfs://nn1 was replaced with hdfs://nnA and hdfs://nn2 was replaced with hdfs://nnB, then set this property to ‘hdfs://nn1 hdfs://nnA,hdfs://nn2 hdfs://nnB’ Replacements must [...]
     </tr>
     <tr>
       <td><a name="instance_zookeeper_host" class="prop"></a> instance.zookeeper.host</td>
diff --git a/docs/2.0/administration/replication.html b/docs/2.0/administration/replication.html
index 00af569..c4e7180 100644
--- a/docs/2.0/administration/replication.html
+++ b/docs/2.0/administration/replication.html
@@ -387,13 +387,10 @@ into the following sections.</p>
 
 <p>Each system involved in replication (even the primary) needs a name that uniquely
 identifies it across all peers in the replication graph. This should be considered
-fixed for an instance, and set using <a href="/docs/2.0/administration/properties#replication_name">replication.name</a> in <code class="highlighter-rouge">accumulo-site.xml</code>.</p>
+fixed for an instance, and set using <a href="/docs/2.0/administration/properties#replication_name">replication.name</a> in <code class="highlighter-rouge">accumulo.properties</code>.</p>
 
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;property&gt;</span>
-    <span class="nt">&lt;name&gt;</span>replication.name<span class="nt">&lt;/name&gt;</span>
-    <span class="nt">&lt;value&gt;</span>primary<span class="nt">&lt;/value&gt;</span>
-    <span class="nt">&lt;description&gt;</span>Unique name for this system used by replication<span class="nt">&lt;/description&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code># Unique name for this system used by replication
+replication.name=primary
 </code></pre></div></div>
 
 <h3 id="instance-configuration">Instance Configuration</h3>
@@ -404,7 +401,7 @@ to connect to this remote peer. In the case of Accumulo, this additional data
 is the Accumulo instance name and ZooKeeper quorum; however, this varies on the
 replication implementation for the peer.</p>
 
-<p>These can be set in the site configuration to ease deployments; however, as they may
+<p>These can be set in <code class="highlighter-rouge">accumulo.properties</code> to ease deployments; however, as they may
 change, it can be useful to set this information using the Accumulo shell.</p>
 
 <p>To configure a peer with the name <code class="highlighter-rouge">peer1</code> which is an Accumulo system with an instance name of <code class="highlighter-rouge">accumulo_peer</code>
@@ -465,7 +462,7 @@ Monitor server, using the <code class="highlighter-rouge">Replication</code> lin
 
 <p>Depending on the schema of a table, different implementations of the <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.2/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a>
 used could be configured. The implementation is controlled via the property <a href="/docs/2.0/administration/properties#replication_work_assigner">replication.work.assigner</a>
-and the full class name for the implementation. This can be configured via the shell or <code class="highlighter-rouge">accumulo-site.xml</code>.</p>
+and the full class name for the implementation. This can be configured via the shell or <code class="highlighter-rouge">accumulo.properties</code>.</p>
 
 <p>Two implementations of <a href="https://static.javadoc.io/org.apache.accumulo/accumulo-server-base/1.9.2/org/apache/accumulo/server/replication/WorkAssigner.html">WorkAssigner</a> are provided:</p>
 
@@ -536,25 +533,19 @@ with that name as well (primary:2181 and peer:2181).</p>
 
 <p>We want to configure these systems so that <code class="highlighter-rouge">my_table</code> on <strong>primary</strong> replicates to <code class="highlighter-rouge">my_table</code> on <strong>peer</strong>.</p>
 
-<h3 id="accumulo-sitexml">accumulo-site.xml</h3>
+<h3 id="accumuloproperties">accumulo.properties</h3>
 
 <p>We can assign the “unique” name that identifies this Accumulo instance among all others that might participate
 in replication together. In this example, we will use the names provided in the description.</p>
 
 <h4 id="primary">Primary</h4>
 
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;property&gt;</span>
-  <span class="nt">&lt;name&gt;</span>replication.name<span class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>primary<span class="nt">&lt;/value&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>replication.name=primary
 </code></pre></div></div>
 
 <h4 id="peer">Peer</h4>
 
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;property&gt;</span>
-  <span class="nt">&lt;name&gt;</span>replication.name<span class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>peer<span class="nt">&lt;/value&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>replication.name=peer
 </code></pre></div></div>
 
 <h3 id="masters-and-tservers-files">masters and tservers files</h3>
@@ -564,7 +555,7 @@ a local node talking to another local node.</p>
 
 <h3 id="start-both-instances">Start both instances</h3>
 
-<p>The rest of the configuration is dynamic and is best configured on the fly (in ZooKeeper) than in accumulo-site.xml.</p>
+<p>The rest of the configuration is dynamic and is best configured on the fly (in ZooKeeper) than in accumulo.properties.</p>
 
 <h3 id="peer-1">Peer</h3>
 
diff --git a/docs/2.0/administration/ssl.html b/docs/2.0/administration/ssl.html
index 8b830a4..678fba9 100644
--- a/docs/2.0/administration/ssl.html
+++ b/docs/2.0/administration/ssl.html
@@ -366,7 +366,7 @@ included in a section below. Accumulo servers require a certificate and keystore
 in the form of Java KeyStores, to enable SSL. The following configuration assumes
 these files already exist.</p>
 
-<p>In <code class="highlighter-rouge">accumulo-site.xml</code>, the following properties are required:</p>
+<p>In <code class="highlighter-rouge">accumulo.properties</code>, the following properties are required:</p>
 
 <ul>
   <li><a href="/docs/2.0/administration/properties#rpc_javax_net_ssl_keyStore">rpc.javax.net.ssl.keyStore</a>  = <em>The path on the local filesystem to the keystore containing the server’s certificate</em></li>
@@ -377,7 +377,7 @@ these files already exist.</p>
 </ul>
 
 <p>Optionally, SSL client-authentication (two-way SSL) can also be enabled by setting
-<a href="/docs/2.0/administration/properties#instance_rpc_ssl_clientAuth">instance.rpc.ssl.clientAuth</a> <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo-site.xml</code>.
+<a href="/docs/2.0/administration/properties#instance_rpc_ssl_clientAuth">instance.rpc.ssl.clientAuth</a> <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo.properties</code>.
 This requires that each client has access to  valid certificate to set up a secure connection
 to the servers. By default, Accumulo uses one-way SSL which does not require clients to have
 their own certificate.</p>
@@ -395,7 +395,7 @@ the properties to connect to an Accumulo instance using SSL:</p>
   <li><a href="/docs/2.0/development/client-properties#ssl_truststore_password">ssl.truststore.password</a></li>
 </ul>
 
-<p>If two-way SSL is enabled for the Accumulo instance (by setting [instance.rpc.ssl.clientAuth] to <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo-site.xml</code>),
+<p>If two-way SSL is enabled for the Accumulo instance (by setting [instance.rpc.ssl.clientAuth] to <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">accumulo.properties</code>),
 Accumulo clients must also define their own certificate by setting the following properties:</p>
 
 <ul>
diff --git a/docs/2.0/administration/tracing.html b/docs/2.0/administration/tracing.html
index 9b2fb3a..0979d41 100644
--- a/docs/2.0/administration/tracing.html
+++ b/docs/2.0/administration/tracing.html
@@ -409,7 +409,7 @@ tracer.span.min.ms - minimum span length to store (in ms, default 1)
 </code></pre></div></div>
 
 <p>To configure an Accumulo client for tracing, set <a href="/docs/2.0/development/client-properties#trace_span_receivers">trace.span.receivers</a> and <a href="/docs/2.0/development/client-properties#trace_zookeeper_path">trace.zookeeper.path</a>
-in <code class="highlighter-rouge">accumulo-client.properties</code>. Also, any <a href="/docs/2.0/administration/properties#trace_span_receiver_prefix">trace.span.receiver.*</a> properties set in <code class="highlighter-rouge">accumulo-site.xml</code> should be set in
+in <code class="highlighter-rouge">accumulo-client.properties</code>. Also, any <a href="/docs/2.0/administration/properties#trace_span_receiver_prefix">trace.span.receiver.*</a> properties set in <code class="highlighter-rouge">accumulo.properties</code> should be set in
 <code class="highlighter-rouge">accumulo-client.properties</code>.</p>
 
 <p>Hadoop can also be configured to send traces to Accumulo, as of
@@ -459,12 +459,9 @@ for adding any SpanReceiver to Accumulo:</p>
 is visible to the same class loader of htrace-core.</p>
   </li>
   <li>
-    <p>Add the following to <code class="highlighter-rouge">accumulo-site.xml</code>:</p>
+    <p>Add the following to <code class="highlighter-rouge">accumulo.properties</code>:</p>
 
-    <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> &lt;property&gt;
-   &lt;name&gt;trace.span.receivers&lt;/name&gt;
-   &lt;value&gt;org.apache.accumulo.tracer.ZooTraceClient,org.apache.htrace.impl.ZipkinSpanReceiver&lt;/value&gt;
- &lt;/property&gt;
+    <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> trace.span.receivers=org.apache.accumulo.tracer.ZooTraceClient,org.apache.htrace.impl.ZipkinSpanReceiver
 </code></pre></div>    </div>
   </li>
   <li>
@@ -499,17 +496,11 @@ this is easily done by adding to your client’s pom.xml (taking care to specify
 </ol>
 
 <p>Your SpanReceiver may require additional properties, and if so these should likewise
-be placed in <code class="highlighter-rouge">accumulo-client.properties</code> (if applicable) and Accumulo’s <code class="highlighter-rouge">accumulo-site.xml</code>.
+be placed in <code class="highlighter-rouge">accumulo-client.properties</code> (if applicable) and Accumulo’s <code class="highlighter-rouge">accumulo.properties</code>.
 Two such properties for ZipkinSpanReceiver, listed with their default values, are</p>
 
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;property&gt;</span>
-  <span class="nt">&lt;name&gt;</span>trace.span.receiver.zipkin.collector-hostname<span class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>localhost<span class="nt">&lt;/value&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
-<span class="nt">&lt;property&gt;</span>
-  <span class="nt">&lt;name&gt;</span>trace.span.receiver.zipkin.collector-port<span class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>9410<span class="nt">&lt;/value&gt;</span>
-<span class="nt">&lt;/property&gt;</span>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>trace.span.receiver.zipkin.collector-hostname=localhost
+trace.span.receiver.zipkin.collector-port=9410
 </code></pre></div></div>
 
 <h3 id="instrumenting-a-client">Instrumenting a Client</h3>
diff --git a/docs/2.0/getting-started/quick-install.html b/docs/2.0/getting-started/quick-install.html
index 0a47f55..40881f6 100644
--- a/docs/2.0/getting-started/quick-install.html
+++ b/docs/2.0/getting-started/quick-install.html
@@ -370,35 +370,36 @@ For convenience, consider adding <code class="highlighter-rouge">accumulo-2.0.0/
 <p>Accumulo requires running <a href="https://zookeeper.apache.org/">Zookeeper</a> and <a href="https://hadoop.apache.org/">HDFS</a> instances which should be set up
 before configuring Accumulo.</p>
 
-<p>The primary configuration files for Accumulo are <code class="highlighter-rouge">accumulo-env.sh</code> and <code class="highlighter-rouge">accumulo-site.xml</code>
-which are located in the <code class="highlighter-rouge">conf/</code> directory.</p>
+<p>The primary configuration files for Accumulo are <code class="highlighter-rouge">accumulo.properties</code>, <code class="highlighter-rouge">accumulo-env.sh</code>,
+and <code class="highlighter-rouge">accumulo-client.properties</code> which are located in the <code class="highlighter-rouge">conf/</code> directory.</p>
 
-<p>Follow the steps below to configure <code class="highlighter-rouge">accumulo-site.xml</code>:</p>
+<p>The <code class="highlighter-rouge">accumulo.properties</code> file configures Accumulo server processes (i.e tablet server, master,
+monitor, etc). Follow these steps to set it up:</p>
 
 <ol>
   <li>
     <p>Run <code class="highlighter-rouge">accumulo-util build-native</code> to build native code.  If this command fails, disable
-native maps by setting <code class="highlighter-rouge">tserver.memory.maps.native.enabled</code> to <code class="highlighter-rouge">false</code>.</p>
+native maps by setting <a href="/docs/2.0/administration/properties#tserver_memory_maps_native_enabled">tserver.memory.maps.native.enabled</a> to <code class="highlighter-rouge">false</code>.</p>
   </li>
   <li>
-    <p>Set <code class="highlighter-rouge">instance.volumes</code> to HDFS location where Accumulo will store data. If your namenode
+    <p>Set <a href="/docs/2.0/administration/properties#instance_volumes">instance.volumes</a> to HDFS location where Accumulo will store data. If your namenode
 is running at 192.168.1.9:8020 and you want to store data in <code class="highlighter-rouge">/accumulo</code> in HDFS, then set
-<code class="highlighter-rouge">instance.volumes</code> to <code class="highlighter-rouge">hdfs://192.168.1.9:8020/accumulo</code>.</p>
+<a href="/docs/2.0/administration/properties#instance_volumes">instance.volumes</a> to <code class="highlighter-rouge">hdfs://192.168.1.9:8020/accumulo</code>.</p>
   </li>
   <li>
-    <p>Set <code class="highlighter-rouge">instance.zookeeper.host</code> to the location of your Zookeepers</p>
+    <p>Set <a href="/docs/2.0/administration/properties#instance_zookeeper_host">instance.zookeeper.host</a> to the location of your Zookeepers</p>
   </li>
   <li>
-    <p>(Optional) Change <code class="highlighter-rouge">instance.secret</code> (which is used by Accumulo processes to communicate)
+    <p>(Optional) Change <a href="/docs/2.0/administration/properties#instance_secret">instance.secret</a> (which is used by Accumulo processes to communicate)
 from the default. This value should match on all servers.</p>
   </li>
 </ol>
 
-<p>Follow the steps below to configure <code class="highlighter-rouge">accumulo-env.sh</code>:</p>
+<p>The <code class="highlighter-rouge">accumulo-env.sh</code> file sets up environment variables needed by Accumulo:</p>
 
 <ol>
   <li>
-    <p>Set <code class="highlighter-rouge">HADOOP_PREFIX</code> and <code class="highlighter-rouge">ZOOKEEPER_HOME</code> to the location of your Hadoop and Zookeeper
+    <p>Set <code class="highlighter-rouge">HADOOP_HOME</code> and <code class="highlighter-rouge">ZOOKEEPER_HOME</code> to the location of your Hadoop and Zookeeper
 installations. Accumulo will use these locations to find Hadoop and Zookeeper jars and add
 them to your <code class="highlighter-rouge">CLASSPATH</code> variable. If you you are running a vendor-specific release of
 Hadoop or Zookeeper, you may need to modify how the <code class="highlighter-rouge">CLASSPATH</code> variable is built in
@@ -445,6 +446,22 @@ in the <code class="highlighter-rouge">JAVA_OPTS</code> section of <code class="
   </li>
 </ol>
 
+<p>The <code class="highlighter-rouge">accumulo-client.properties</code> file is used by the Accumulo shell and can be passed to Accumulo
+clients to simplify connecting to Accumulo. Below are steps to configure it.</p>
+
+<ol>
+  <li>
+    <p>Set <a href="/docs/2.0/development/client-properties#instance_name">instance.name</a> and <a href="/docs/2.0/development/client-properties#instance_zookeepers">instance.zookeepers</a> to the Accumulo instance and zookeeper connection
+string of your instance.</p>
+  </li>
+  <li>
+    <p>Pick an authentication type and set <a href="/docs/2.0/development/client-properties#auth_type">auth.type</a> accordingly.  The most common <code class="highlighter-rouge">auth.type</code>
+is <code class="highlighter-rouge">password</code> which requires <a href="/docs/2.0/development/client-properties#auth_principal">auth.principal</a> to be set and <a href="/docs/2.0/development/client-properties#auth_token">auth.token</a> to be set the password
+of <code class="highlighter-rouge">auth.principal</code>. For the Accumulo shell, <code class="highlighter-rouge">auth.token</code> can be commented out and the shell will
+prompt you for the password of <code class="highlighter-rouge">auth.principal</code> at login.</p>
+  </li>
+</ol>
+
 <h2 id="initialization">Initialization</h2>
 
 <p>Accumulo needs to initialize the locations where it stores data in Zookeeper
diff --git a/docs/2.0/troubleshooting/basic.html b/docs/2.0/troubleshooting/basic.html
index 542e20f..3fc1e62 100644
--- a/docs/2.0/troubleshooting/basic.html
+++ b/docs/2.0/troubleshooting/basic.html
@@ -537,7 +537,7 @@ any one of the zookeeper servers:</p>
 <code class="highlighter-rouge">CONNECTING</code> you will need to diagnose zookeeper errors.</p>
 
 <p>Check to make sure that zookeeper is up, and that
-<code class="highlighter-rouge">accumulo-site.xml</code> has been pointed to
+<code class="highlighter-rouge">accumulo.properties</code> has been pointed to
 your zookeeper server(s).</p>
 
 <p><strong>Zookeeper is running, but it does not say CONNECTED</strong></p>
diff --git a/docs/2.0/troubleshooting/tools.html b/docs/2.0/troubleshooting/tools.html
index 467c2f7..03d8155 100644
--- a/docs/2.0/troubleshooting/tools.html
+++ b/docs/2.0/troubleshooting/tools.html
@@ -470,7 +470,7 @@ Enter the connection password:
 <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ accumulo org.apache.accumulo.server.util.CleanZookeeper
 </code></pre></div></div>
 
-<p>This command will not delete the instance pointed to by the local <code class="highlighter-rouge">accumulo-site.xml</code> file.</p>
+<p>This command will not delete the instance pointed to by the local <code class="highlighter-rouge">accumulo.properties</code> file.</p>
 
 <h2 id="dumpzookeeper--restorezookeeper">DumpZookeeper &amp; RestoreZookeeper</h2>
 
diff --git a/feed.xml b/feed.xml
index 841f2a4..f398b9a 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
 </description>
     <link>https://accumulo.apache.org/</link>
     <atom:link href="https://accumulo.apache.org/feed.xml" rel="self" type="application/rss+xml"/>
-    <pubDate>Tue, 04 Sep 2018 15:52:28 -0400</pubDate>
-    <lastBuildDate>Tue, 04 Sep 2018 15:52:28 -0400</lastBuildDate>
+    <pubDate>Thu, 06 Sep 2018 12:56:23 -0400</pubDate>
+    <lastBuildDate>Thu, 06 Sep 2018 12:56:23 -0400</lastBuildDate>
     <generator>Jekyll v3.7.3</generator>
     
     
diff --git a/redirects.json b/redirects.json
index 2ec52c0..367bed1 100644
--- a/redirects.json
+++ b/redirects.json
@@ -1 +1 @@
-{"/release_notes/1.5.1.html":"https://accumulo.apache.org/release/accumulo-1.5.1/","/release_notes/1.6.0.html":"https://accumulo.apache.org/release/accumulo-1.6.0/","/release_notes/1.6.1.html":"https://accumulo.apache.org/release/accumulo-1.6.1/","/release_notes/1.6.2.html":"https://accumulo.apache.org/release/accumulo-1.6.2/","/release_notes/1.7.0.html":"https://accumulo.apache.org/release/accumulo-1.7.0/","/release_notes/1.5.3.html":"https://accumulo.apache.org/release/accumulo-1.5.3/" [...]
\ No newline at end of file
+{"/release_notes/1.5.1.html":"https://accumulo.apache.org/release/accumulo-1.5.1/","/release_notes/1.6.0.html":"https://accumulo.apache.org/release/accumulo-1.6.0/","/release_notes/1.6.1.html":"https://accumulo.apache.org/release/accumulo-1.6.1/","/release_notes/1.6.2.html":"https://accumulo.apache.org/release/accumulo-1.6.2/","/release_notes/1.7.0.html":"https://accumulo.apache.org/release/accumulo-1.7.0/","/release_notes/1.5.3.html":"https://accumulo.apache.org/release/accumulo-1.5.3/" [...]
\ No newline at end of file
diff --git a/search_data.json b/search_data.json
index 9ab03e0..9f89f1b 100644
--- a/search_data.json
+++ b/search_data.json
@@ -9,7 +9,7 @@
   
     "docs-2-0-administration-configuration-management": {
       "title": "Configuration Management",
-      "content"	 : "Configuration is managed differently for Accumulo clients and servers.Client ConfigurationAccumulo clients are configured when the Connector is built using builder methods or accumulo-client.propertieswhich is configured using client properties.Server ConfigurationAccumulo services (i.e master, tablet server, monitor, etc) are configured using server properties whose values can beset in the following locations (with increasing precedence):  Default values  accumulo-si [...]
+      "content"	 : "Configuration is managed differently for Accumulo clients and servers.Client ConfigurationAccumulo clients are configured when the Connector is built using builder methods or accumulo-client.propertieswhich is configured using client properties.Server ConfigurationAccumulo services (i.e master, tablet server, monitor, etc) are configured using server properties whose values can beset in the following locations (with increasing precedence):  Default values  accumulo.pr [...]
       "url": " /docs/2.0/administration/configuration-management",
       "categories": "administration"
     },
@@ -23,42 +23,42 @@
   
     "docs-2-0-administration-in-depth-install": {
       "title": "In-depth Installation",
-      "content"	 : "This document provides detailed instructions for installing Accumulo. For basicinstructions, see the quick installation guide.HardwareBecause we are running essentially two or three systems simultaneously layeredacross the cluster: HDFS, Accumulo and MapReduce, it is typical for hardware toconsist of 4 to 8 cores, and 8 to 32 GB RAM. This is so each running process can haveat least one core and 2 - 4 GB each.One core running HDFS can typically keep 2 to 4 disks busy,  [...]
+      "content"	 : "This document provides detailed instructions for installing Accumulo. For basicinstructions, see the quick installation guide.HardwareBecause we are running essentially two or three systems simultaneously layeredacross the cluster: HDFS, Accumulo and MapReduce, it is typical for hardware toconsist of 4 to 8 cores, and 8 to 32 GB RAM. This is so each running process can haveat least one core and 2 - 4 GB each.One core running HDFS can typically keep 2 to 4 disks busy,  [...]
       "url": " /docs/2.0/administration/in-depth-install",
       "categories": "administration"
     },
   
     "docs-2-0-administration-kerberos": {
       "title": "Kerberos",
-      "content"	 : "OverviewKerberos is a network authentication protocol that provides a secure way forpeers to prove their identity over an unsecure network in a client-server model.A centralized key-distribution center (KDC) is the service that coordinatesauthentication between a client and a server. Clients and servers use “tickets”,obtained from the KDC via a password or a special file called a “keytab”, tocommunicate with the KDC and prove their identity. A KDC administrator mustcr [...]
+      "content"	 : "OverviewKerberos is a network authentication protocol that provides a secure way forpeers to prove their identity over an unsecure network in a client-server model.A centralized key-distribution center (KDC) is the service that coordinatesauthentication between a client and a server. Clients and servers use “tickets”,obtained from the KDC via a password or a special file called a “keytab”, tocommunicate with the KDC and prove their identity. A KDC administrator mustcr [...]
       "url": " /docs/2.0/administration/kerberos",
       "categories": "administration"
     },
   
     "docs-2-0-administration-monitoring-metrics": {
       "title": "Monitoring &amp; Metrics",
-      "content"	 : "MonitoringAccumulo MonitorThe Accumulo Monitor provides an interface for monitoring the status and health ofAccumulo components. The Accumulo Monitor provides a web UI for accessing this information athttp://_monitorhost_:9995/.Things highlighted in yellow may be in need of attention.If anything is highlighted in red on the monitor page, it is something that definitely needs attention.The Overview page contains some summary information about the Accumulo instance, inc [...]
+      "content"	 : "MonitoringAccumulo MonitorThe Accumulo Monitor provides an interface for monitoring the status and health ofAccumulo components. The Accumulo Monitor provides a web UI for accessing this information athttp://_monitorhost_:9995/.Things highlighted in yellow may be in need of attention.If anything is highlighted in red on the monitor page, it is something that definitely needs attention.The Overview page contains some summary information about the Accumulo instance, inc [...]
       "url": " /docs/2.0/administration/monitoring-metrics",
       "categories": "administration"
     },
   
     "docs-2-0-administration-multivolume": {
       "title": "Multi-Volume Installations",
-      "content"	 : "This is an advanced configuration setting for very large clustersunder a lot of write pressure.The HDFS NameNode holds all of the metadata about the files inHDFS. For fast performance, all of this information needs to be storedin memory.  A single NameNode with 64G of memory can store themetadata for tens of millions of files. However, when scaling beyond athousand nodes, an active Accumulo system can generate lots of updatesto the file system, especially when data is [...]
+      "content"	 : "This is an advanced configuration setting for very large clustersunder a lot of write pressure.The HDFS NameNode holds all of the metadata about the files inHDFS. For fast performance, all of this information needs to be storedin memory.  A single NameNode with 64G of memory can store themetadata for tens of millions of files. However, when scaling beyond athousand nodes, an active Accumulo system can generate lots of updatesto the file system, especially when data is [...]
       "url": " /docs/2.0/administration/multivolume",
       "categories": "administration"
     },
   
     "docs-2-0-administration-properties": {
       "title": "Server Properties",
-      "content"	 : "Below are properties set in accumulo-site.xml or the Accumulo shell that configure Accumulo servers (i.e tablet server, master, etc):            Property      Description                   gc.*      Properties in this category affect the behavior of the accumulo garbage collector.               gc.cycle.delay      Time between garbage collection cycles. In each cycle, old RFiles or write-ahead logs no longer in use are removed from the filesystem.type: TIMEDURATION, z [...]
+      "content"	 : "Below are properties set in accumulo.properties or the Accumulo shell that configure Accumulo servers (i.e tablet server, master, etc):            Property      Description                   gc.*      Properties in this category affect the behavior of the accumulo garbage collector.               gc.cycle.delay      Time between garbage collection cycles. In each cycle, old RFiles or write-ahead logs no longer in use are removed from the filesystem.type: TIMEDURATION, [...]
       "url": " /docs/2.0/administration/properties",
       "categories": "administration"
     },
   
     "docs-2-0-administration-replication": {
       "title": "Replication",
-      "content"	 : "OverviewReplication is a feature of Accumulo which provides a mechanism to automaticallycopy data to other systems, typically for the purpose of disaster recovery,high availability, or geographic locality. It is best to consider this featureas a framework for automatic replication instead of the ability to copy datafrom to another Accumulo instance as copying to another Accumulo cluster isonly an implementation detail. The local Accumulo cluster is hereby referredto a [...]
+      "content"	 : "OverviewReplication is a feature of Accumulo which provides a mechanism to automaticallycopy data to other systems, typically for the purpose of disaster recovery,high availability, or geographic locality. It is best to consider this featureas a framework for automatic replication instead of the ability to copy datafrom to another Accumulo instance as copying to another Accumulo cluster isonly an implementation detail. The local Accumulo cluster is hereby referredto a [...]
       "url": " /docs/2.0/administration/replication",
       "categories": "administration"
     },
@@ -72,14 +72,14 @@
   
     "docs-2-0-administration-ssl": {
       "title": "SSL",
-      "content"	 : "Accumulo, through Thrift’s TSSLTransport, provides the ability to encryptwire communication between Accumulo servers and clients using securesockets layer (SSL). SSL certificates signed by the same certificate authoritycontrol the “circle of trust” in which a secure connection can be established.Typically, each host running Accumulo processes would be given a certificatewhich identifies itself.Clients can optionally also be given a certificate, when client-auth is ena [...]
+      "content"	 : "Accumulo, through Thrift’s TSSLTransport, provides the ability to encryptwire communication between Accumulo servers and clients using securesockets layer (SSL). SSL certificates signed by the same certificate authoritycontrol the “circle of trust” in which a secure connection can be established.Typically, each host running Accumulo processes would be given a certificatewhich identifies itself.Clients can optionally also be given a certificate, when client-auth is ena [...]
       "url": " /docs/2.0/administration/ssl",
       "categories": "administration"
     },
   
     "docs-2-0-administration-tracing": {
       "title": "Tracing",
-      "content"	 : "It can be difficult to determine why some operations are taking longerthan expected. For example, you may be looking up items with very lowlatency, but sometimes the lookups take much longer. Determining thecause of the delay is difficult because the system is distributed, andthe typical lookup is fast.Accumulo has been instrumented to record the time that variousoperations take when tracing is turned on. The fact that tracing isenabled follows all the requests made o [...]
+      "content"	 : "It can be difficult to determine why some operations are taking longerthan expected. For example, you may be looking up items with very lowlatency, but sometimes the lookups take much longer. Determining thecause of the delay is difficult because the system is distributed, andthe typical lookup is fast.Accumulo has been instrumented to record the time that variousoperations take when tracing is turned on. The fact that tracing isenabled follows all the requests made o [...]
       "url": " /docs/2.0/administration/tracing",
       "categories": "administration"
     },
@@ -170,7 +170,7 @@
   
     "docs-2-0-getting-started-quick-install": {
       "title": "Quick Installation",
-      "content"	 : "This document provides basic instructions for installing Accumulo. For detailed instructions,see the in-depth installation guide.Either download or build a binary distribution of Accumulo from source code andunpack as follows.tar xzf /path/to/accumulo-2.0.0-bin.tar.gzcd accumulo-2.0.0There are four scripts in the bin directory of the tarball distribution that are usedto manage Accumulo:  accumulo - Runs Accumulo command-line tools and starts Accumulo processes  accumu [...]
+      "content"	 : "This document provides basic instructions for installing Accumulo. For detailed instructions,see the in-depth installation guide.Either download or build a binary distribution of Accumulo from source code andunpack as follows.tar xzf /path/to/accumulo-2.0.0-bin.tar.gzcd accumulo-2.0.0There are four scripts in the bin directory of the tarball distribution that are usedto manage Accumulo:  accumulo - Runs Accumulo command-line tools and starts Accumulo processes  accumu [...]
       "url": " /docs/2.0/getting-started/quick-install",
       "categories": "getting-started"
     },
@@ -212,7 +212,7 @@
   
     "docs-2-0-troubleshooting-basic": {
       "title": "Basic Troubleshooting",
-      "content"	 : "GeneralThe tablet server does not seem to be running!? What happened?Accumulo is a distributed system.  It is supposed to run on remoteequipment, across hundreds of computers.  Each program that runs onthese remote computers writes down events as they occur, into a localfile. By default, this is defined in conf/accumulo-env.sh as ACCUMULO_LOG_DIR.Look in the $ACCUMULO_LOG_DIR/tserver*.log file.  Specifically, check the end of the file.The tablet server did not start a [...]
+      "content"	 : "GeneralThe tablet server does not seem to be running!? What happened?Accumulo is a distributed system.  It is supposed to run on remoteequipment, across hundreds of computers.  Each program that runs onthese remote computers writes down events as they occur, into a localfile. By default, this is defined in conf/accumulo-env.sh as ACCUMULO_LOG_DIR.Look in the $ACCUMULO_LOG_DIR/tserver*.log file.  Specifically, check the end of the file.The tablet server did not start a [...]
       "url": " /docs/2.0/troubleshooting/basic",
       "categories": "troubleshooting"
     },
@@ -233,7 +233,7 @@
   
     "docs-2-0-troubleshooting-tools": {
       "title": "Troubleshooting Tools",
-      "content"	 : "The accumulo command can be used to run various tools and classes from the command line.RFileInfoThe rfile-info tool will examine an Accumulo storage file and print out basic metadata.$ accumulo rfile-info /accumulo/tables/1/default_tablet/A000000n.rf2013-07-16 08:17:14,778 [util.NativeCodeLoader] INFO : Loaded the native-hadoop libraryLocality group         : &amp;lt;DEFAULT&amp;gt;        Start block          : 0        Num   blocks         : 1        Index level 0  [...]
+      "content"	 : "The accumulo command can be used to run various tools and classes from the command line.RFileInfoThe rfile-info tool will examine an Accumulo storage file and print out basic metadata.$ accumulo rfile-info /accumulo/tables/1/default_tablet/A000000n.rf2013-07-16 08:17:14,778 [util.NativeCodeLoader] INFO : Loaded the native-hadoop libraryLocality group         : &amp;lt;DEFAULT&amp;gt;        Start block          : 0        Num   blocks         : 1        Index level 0  [...]
       "url": " /docs/2.0/troubleshooting/tools",
       "categories": "troubleshooting"
     },


Mime
View raw message