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 2018/10/22 17:28:37 UTC
[accumulo-website] branch master updated: Created configuration
section in docs (#123)
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
The following commit(s) were added to refs/heads/master by this push:
new 1cd420c Created configuration section in docs (#123)
1cd420c is described below
commit 1cd420c85785d29be39e9fe764f2a64f7d3061e3
Author: Mike Walch <mw...@apache.org>
AuthorDate: Mon Oct 22 13:26:59 2018 -0400
Created configuration section in docs (#123)
* Move overview, server & client properties files
---
_docs-2/administration/caching.md | 2 +-
_docs-2/administration/fate.md | 2 +-
_docs-2/administration/in-depth-install.md | 6 +++---
_docs-2/administration/monitoring-metrics.md | 2 +-
_docs-2/administration/multivolume.md | 2 +-
_docs-2/administration/replication.md | 2 +-
_docs-2/administration/scan-executors.md | 2 +-
_docs-2/administration/upgrading.md | 2 +-
.../{development => configuration}/client-properties.md | 4 ++--
.../overview.md} | 16 ++++++++--------
.../properties.md => configuration/server-properties.md} | 13 +++++++------
_docs-2/development/high_speed_ingest.md | 2 +-
_docs-2/getting-started/clients.md | 2 +-
_docs-2/getting-started/quick-install.md | 2 +-
_docs-2/getting-started/table_configuration.md | 2 +-
_docs-2/troubleshooting/tracing.md | 4 ++--
_layouts/docs-2.html | 2 +-
_plugins/links.rb | 4 ++--
contributor/making-release.md | 8 ++++----
19 files changed, 40 insertions(+), 39 deletions(-)
diff --git a/_docs-2/administration/caching.md b/_docs-2/administration/caching.md
index 78a89c2..91b673b 100644
--- a/_docs-2/administration/caching.md
+++ b/_docs-2/administration/caching.md
@@ -1,7 +1,7 @@
---
title: Caching
category: administration
-order: 9
+order: 6
---
Accumulo [tablet servers][tserver] have **block caches** that buffer data in memory to limit reads from disk.
diff --git a/_docs-2/administration/fate.md b/_docs-2/administration/fate.md
index 111dc90..0dd4920 100644
--- a/_docs-2/administration/fate.md
+++ b/_docs-2/administration/fate.md
@@ -1,7 +1,7 @@
---
title: FATE
category: administration
-order: 5
+order: 3
---
Accumulo must implement a number of distributed, multi-step operations to support
diff --git a/_docs-2/administration/in-depth-install.md b/_docs-2/administration/in-depth-install.md
index a135005..5fbda56 100644
--- a/_docs-2/administration/in-depth-install.md
+++ b/_docs-2/administration/in-depth-install.md
@@ -220,7 +220,7 @@ Specify appropriate values for the following properties in `accumulo.properties`
[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]
+some settings require a process restart to take effect. See the [configuration overview][config-mgmt]
documentation for details.
### Hostnames in configuration files
@@ -666,7 +666,7 @@ mailing lists at https://accumulo.apache.org for more info.
[quick]: {% durl getting-started/quick-install %}
[monitor]: {% durl administration/monitoring-metrics#monitor %}
-[config-mgmt]: {% durl administration/configuration-management %}
+[config-mgmt]: {% durl configuration/overview %}
[instance.zookeeper.host]: {% purl instance.zookeeper.host %}
[instance.secret]: {% purl instance.secret %}
[monitor.port.log4j]: {% purl monitor.port.log4j %}
@@ -687,4 +687,4 @@ mailing lists at https://accumulo.apache.org for more info.
[general.dynamic.classpaths]: {% purl general.dynamic.classpaths %}
[general.vfs.classpaths]: {% purl general.vfs.classpaths %}
[accumulo-client]: {% durl getting-started/clients#creating-an-accumulo-client %}
-[client-props]: {% durl development/client-properties %}
+[client-props]: {% durl configuration/client-properties %}
diff --git a/_docs-2/administration/monitoring-metrics.md b/_docs-2/administration/monitoring-metrics.md
index e91ed8b..55595ee 100644
--- a/_docs-2/administration/monitoring-metrics.md
+++ b/_docs-2/administration/monitoring-metrics.md
@@ -1,7 +1,7 @@
---
title: Monitoring & Metrics
category: administration
-order: 4
+order: 2
---
## Monitoring
diff --git a/_docs-2/administration/multivolume.md b/_docs-2/administration/multivolume.md
index a740d2b..0716408 100644
--- a/_docs-2/administration/multivolume.md
+++ b/_docs-2/administration/multivolume.md
@@ -1,7 +1,7 @@
---
title: Multi-Volume Installations
category: administration
-order: 6
+order: 4
---
This is an advanced configuration setting for very large clusters
diff --git a/_docs-2/administration/replication.md b/_docs-2/administration/replication.md
index 0699701..3bb8ff5 100644
--- a/_docs-2/administration/replication.md
+++ b/_docs-2/administration/replication.md
@@ -1,7 +1,7 @@
---
title: Replication
category: administration
-order: 8
+order: 5
---
## Overview
diff --git a/_docs-2/administration/scan-executors.md b/_docs-2/administration/scan-executors.md
index f0d1f85..f9f93c6 100644
--- a/_docs-2/administration/scan-executors.md
+++ b/_docs-2/administration/scan-executors.md
@@ -1,7 +1,7 @@
---
title: Scan Executors
category: administration
-order: 11
+order: 8
---
Accumulo scans operate by repeatedly fetching batches of data from a [tablet
diff --git a/_docs-2/administration/upgrading.md b/_docs-2/administration/upgrading.md
index 88367da..ad2e3d5 100644
--- a/_docs-2/administration/upgrading.md
+++ b/_docs-2/administration/upgrading.md
@@ -1,7 +1,7 @@
---
title: Upgrading Accumulo
category: administration
-order: 10
+order: 7
---
## Upgrading from 1.7 to 1.8
diff --git a/_docs-2/development/client-properties.md b/_docs-2/configuration/client-properties.md
similarity index 99%
rename from _docs-2/development/client-properties.md
rename to _docs-2/configuration/client-properties.md
index 4550da4..ac263c1 100644
--- a/_docs-2/development/client-properties.md
+++ b/_docs-2/configuration/client-properties.md
@@ -1,7 +1,7 @@
---
title: Client Properties
-category: development
-order: 9
+category: configuration
+order: 2
---
<!-- WARNING: Do not edit this file. It is a generated file that is copied from Accumulo build (from core/target/generated-docs) -->
diff --git a/_docs-2/administration/configuration-management.md b/_docs-2/configuration/overview.md
similarity index 92%
rename from _docs-2/administration/configuration-management.md
rename to _docs-2/configuration/overview.md
index e8826c2..12298bb 100644
--- a/_docs-2/administration/configuration-management.md
+++ b/_docs-2/configuration/overview.md
@@ -1,19 +1,19 @@
---
-title: Configuration Management
-category: administration
-order: 2
+title: Configuration Overview
+category: configuration
+order: 1
---
Configuration is managed differently for Accumulo clients and servers.
## Client Configuration
-[Accumulo clients][accumulo-client] are created using builder methods or `accumulo-client.properties`
-which is configured using [client properties][client-props].
+[Accumulo clients][accumulo-client] are created using a Java builder methods, Java properties containing
+[client properties][client-props], or an `accumulo-client.properties` file containing [client properties][client-props].
## Server Configuration
-Accumulo services (i.e master, tablet server, monitor, etc) are configured using [server properties][props] whose values can be
+Accumulo services (i.e master, tablet server, monitor, etc) are configured by [server properties][props] whose values can be
set in the following locations (with increasing precedence):
1. Default values
@@ -113,5 +113,5 @@ default | table.failures.ignore ..................... | false
```
[accumulo-client]: {% durl getting-started/clients#creating-an-accumulo-client %}
-[client-props]: {% durl development/client-properties %}
-[props]: {% durl administration/properties %}
+[client-props]: {% durl configuration/client-properties %}
+[props]: {% durl configuration/server-properties %}
diff --git a/_docs-2/administration/properties.md b/_docs-2/configuration/server-properties.md
similarity index 97%
rename from _docs-2/administration/properties.md
rename to _docs-2/configuration/server-properties.md
index e0b5db3..7c706a8 100644
--- a/_docs-2/administration/properties.md
+++ b/_docs-2/configuration/server-properties.md
@@ -1,6 +1,6 @@
---
title: Server Properties
-category: administration
+category: configuration
order: 3
---
@@ -18,7 +18,7 @@ Below are properties set in `accumulo.properties` or the Accumulo shell that con
| <a name="gc_trace_percent" class="prop"></a> gc.trace.percent | Percent of gc cycles to trace<br>**type:** FRACTION, **zk mutable:** yes, **default value:** `0.01` |
| <a name="gc_trash_ignore" class="prop"></a> gc.trash.ignore | Do not use the Trash, even if it is configured.<br>**type:** BOOLEAN, **zk mutable:** yes, **default value:** `false` |
| <a name="general_prefix" class="prop"></a> **general.*** | Properties in this category affect the behavior of accumulo overall, but do not have to be consistent throughout a cloud. |
-| <a name="general_classpaths" class="prop"></a> general.classpaths | **Deprecated.** ~~This property is deprecated. The class path should instead be configured by the launch environment (for example, accumulo-env.sh). A list of all of the places to look for a class. Order does matter, as it will look for the jar starting in the first location to the last. Supports full regex on filename alone.~~<br>~~**type:** STRING~~, ~~**zk mutable:** no~~, ~~**default value:** empty~~ |
+| <a name="general_classpaths" class="prop"></a> general.classpaths | **Deprecated.** ~~This property is deprecated since 2.0.0. The class path should instead be configured by the launch environment (for example, accumulo-env.sh). A list of all of the places to look for a class. Order does matter, as it will look for the jar starting in the first location to the last. Supports full regex on filename alone.~~<br>~~**type:** STRING~~, ~~**zk mutable:** no~~, ~~**default value:** empty~~ |
| <a name="general_custom_prefix" class="prop"></a> **general.custom.*** | Prefix to be used for user defined system-wide properties. This may be particularly useful for system-wide configuration for various user-implementations of pluggable Accumulo features, such as the balancer or volume chooser. |
| <a name="general_delegation_token_lifetime" class="prop"></a> general.delegation.token.lifetime | The length of time that delegation tokens and secret keys are valid<br>**type:** TIMEDURATION, **zk mutable:** no, **default value:** `7d` |
| <a name="general_delegation_token_update_interval" class="prop"></a> general.delegation.token.update.interval | The length of time between generation of new secret keys<br>**type:** TIMEDURATION, **zk mutable:** no, **default value:** `1d` |
@@ -41,8 +41,8 @@ Below are properties set in `accumulo.properties` or the Accumulo shell that con
| <a name="instance_crypto_opts_prefix" class="prop"></a> **instance.crypto.opts.*** | **Experimental.** Properties related to on-disk file encryption. |
| <a name="instance_crypto_opts_sensitive_prefix" class="prop"></a> **instance.crypto.opts.sensitive.*** | **Experimental.** Sensitive properties related to on-disk file encryption. |
| <a name="instance_crypto_service" class="prop"></a> instance.crypto.service | **Experimental.** The class which executes on-disk file encryption. The default does nothing. To enable encryption, replace this classname with an implementation of theorg.apache.accumulo.core.spi.crypto.CryptoService interface.<br>**type:** CLASSNAME, **zk mutable:** no, **default value:** {% jlink -f org.apache.accumulo.core.security.crypto.impl.NoCryptoService %} |
-| <a name="instance_dfs_dir" class="prop"></a> instance.dfs.dir | **Deprecated.** ~~HDFS directory in which accumulo instance will run. Do not change after accumulo is initialized.~~<br>~~**type:** ABSOLUTEPATH~~, ~~**zk mutable:** no~~, ~~**default value:** `/accumulo`~~ |
-| <a name="instance_dfs_uri" class="prop"></a> instance.dfs.uri | **Deprecated.** ~~A url accumulo should use to connect to DFS. If this is empty, accumulo will obtain this information from the hadoop configuration. This property will only be used when creating new files if instance.volumes is empty. After an upgrade to 1.6.0 Accumulo will start using absolute paths to reference files. Files created before a 1.6.0 upgrade are referenced via relative paths. Relative paths will always be r [...]
+| <a name="instance_dfs_dir" class="prop"></a> instance.dfs.dir | **Deprecated.** ~~This property is deprecated since 1.6.0. HDFS directory in which accumulo instance will run. Do not change after accumulo is initialized.~~<br>~~**type:** ABSOLUTEPATH~~, ~~**zk mutable:** no~~, ~~**default value:** `/accumulo`~~ |
+| <a name="instance_dfs_uri" class="prop"></a> instance.dfs.uri | **Deprecated.** ~~This property is deprecated since 1.6.0. A url accumulo should use to connect to DFS. If this is empty, accumulo will obtain this information from the hadoop configuration. This property will only be used when creating new files if instance.volumes is empty. After an upgrade to 1.6.0 Accumulo will start using absolute paths to reference files. Files created before a 1.6.0 upgrade are referenced via relati [...]
| <a name="instance_rpc_sasl_allowed_host_impersonation" class="prop"></a> instance.rpc.sasl.allowed.host.impersonation | One-line configuration property controlling the network locations (hostnames) that are allowed to impersonate other users<br>**type:** STRING, **zk mutable:** no, **default value:** empty |
| <a name="instance_rpc_sasl_allowed_user_impersonation" class="prop"></a> instance.rpc.sasl.allowed.user.impersonation | One-line configuration property controlling what users are allowed to impersonate other users<br>**type:** STRING, **zk mutable:** no, **default value:** empty |
| <a name="instance_rpc_sasl_enabled" class="prop"></a> instance.rpc.sasl.enabled | Configures Thrift RPCs to require SASL with GSSAPI which supports Kerberos authentication. Mutually exclusive with SSL RPC configuration.<br>**type:** BOOLEAN, **zk mutable:** no, **default value:** `false` |
@@ -84,6 +84,7 @@ Below are properties set in `accumulo.properties` or the Accumulo shell that con
| <a name="monitor_ssl_exclude_ciphers" class="prop"></a> monitor.ssl.exclude.ciphers | A comma-separated list of disallowed SSL Ciphers, see monitor.ssl.include.ciphers to allow ciphers<br>**type:** STRING, **zk mutable:** no, **default value:** empty |
| <a name="monitor_ssl_include_ciphers" class="prop"></a> monitor.ssl.include.ciphers | A comma-separated list of allows SSL Ciphers, see monitor.ssl.exclude.ciphers to disallow ciphers<br>**type:** STRING, **zk mutable:** no, **default value:** empty |
| <a name="monitor_ssl_include_protocols" class="prop"></a> monitor.ssl.include.protocols | A comma-separate list of allowed SSL protocols<br>**type:** STRING, **zk mutable:** no, **default value:** `TLSv1.2` |
+| <a name="monitor_ssl_keyPassword" class="prop"></a> monitor.ssl.keyPassword | Optional: the password for the private key in the keyStore. When not provided, this defaults to the keystore password.<br>**type:** STRING, **zk mutable:** no, **default value:** empty |
| <a name="monitor_ssl_keyStore" class="prop"></a> monitor.ssl.keyStore | The keystore for enabling monitor SSL.<br>**type:** PATH, **zk mutable:** no, **default value:** empty |
| <a name="monitor_ssl_keyStorePassword" class="prop"></a> monitor.ssl.keyStorePassword | The keystore password for enabling monitor SSL.<br>**type:** STRING, **zk mutable:** no, **default value:** empty |
| <a name="monitor_ssl_keyStoreType" class="prop"></a> monitor.ssl.keyStoreType | Type of SSL keystore<br>**type:** STRING, **zk mutable:** no, **default value:** `jks` |
@@ -173,7 +174,7 @@ Below are properties set in `accumulo.properties` or the Accumulo shell that con
| <a name="table_split_threshold" class="prop"></a> table.split.threshold | A tablet is split when the combined size of RFiles exceeds this amount.<br>**type:** BYTES, **zk mutable:** yes, **default value:** `1G` |
| <a name="table_summarizer_prefix" class="prop"></a> **table.summarizer.*** | Prefix for configuring summarizers for a table. Using this prefix multiple summarizers can be configured with options for each one. Each summarizer configured should have a unique id, this id can be anything. To add a summarizer set `table.summarizer.<unique id>=<summarizer class name>.` If the summarizer has options, then for each option set `table.summarizer.<unique id>.opt.<key>=<value>`. |
| <a name="table_suspend_duration" class="prop"></a> table.suspend.duration | For tablets belonging to this table: When a tablet server dies, allow the tablet server this duration to revive before reassigning its tablets to other tablet servers.<br>**type:** TIMEDURATION, **zk mutable:** yes, **default value:** `0s` |
-| <a name="table_walog_enabled" class="prop"></a> table.walog.enabled | **Deprecated.** ~~This setting is deprecated. Use table.durability=none instead.~~<br>~~**type:** BOOLEAN~~, ~~**zk mutable:** yes~~, ~~**default value:** `true`~~ |
+| <a name="table_walog_enabled" class="prop"></a> table.walog.enabled | **Deprecated.** ~~This setting is deprecated since 1.7.0. Use table.durability=none instead.~~<br>~~**type:** BOOLEAN~~, ~~**zk mutable:** yes~~, ~~**default value:** `true`~~ |
| <a name="trace_prefix" class="prop"></a> **trace.*** | Properties in this category affect the behavior of distributed tracing. |
| <a name="trace_password" class="prop"></a> trace.password | The password for the user used to store distributed traces<br>**type:** STRING, **zk mutable:** no, **default value:** `secret` |
| <a name="trace_port_client" class="prop"></a> trace.port.client | The listening port for the trace server<br>**type:** PORT, **zk mutable:** no, **default value:** `12234` |
@@ -242,7 +243,7 @@ Below are properties set in `accumulo.properties` or the Accumulo shell that con
| <a name="tserver_wal_blocksize" class="prop"></a> tserver.wal.blocksize | The size of the HDFS blocks used to write to the Write-Ahead log. If zero, it will be 110% of tserver.walog.max.size (that is, try to use just one block)<br>**type:** BYTES, **zk mutable:** yes, **default value:** `0` |
| <a name="tserver_wal_replication" class="prop"></a> tserver.wal.replication | The replication to use when writing the Write-Ahead log to HDFS. If zero, it will use the HDFS default replication setting.<br>**type:** COUNT, **zk mutable:** yes, **default value:** `0` |
| <a name="tserver_wal_sync" class="prop"></a> tserver.wal.sync | Use the SYNC_BLOCK create flag to sync WAL writes to disk. Prevents problems recovering from sudden system resets.<br>**type:** BOOLEAN, **zk mutable:** yes, **default value:** `true` |
-| <a name="tserver_wal_sync_method" class="prop"></a> tserver.wal.sync.method | **Deprecated.** ~~This property is deprecated. Use table.durability instead.~~<br>~~**type:** STRING~~, ~~**zk mutable:** yes~~, ~~**default value:** `hsync`~~ |
+| <a name="tserver_wal_sync_method" class="prop"></a> tserver.wal.sync.method | **Deprecated.** ~~This property is deprecated since 1.7.0. Use table.durability instead.~~<br>~~**type:** STRING~~, ~~**zk mutable:** yes~~, ~~**default value:** `hsync`~~ |
| <a name="tserver_walog_max_age" class="prop"></a> tserver.walog.max.age | The maximum age for each write-ahead log.<br>**type:** TIMEDURATION, **zk mutable:** yes, **default value:** `24h` |
| <a name="tserver_walog_max_size" class="prop"></a> tserver.walog.max.size | The maximum size for each write-ahead log. See comment for property tserver.memory.maps.max<br>**type:** BYTES, **zk mutable:** yes, **default value:** `1g` |
| <a name="tserver_walog_maximum_wait_duration" class="prop"></a> tserver.walog.maximum.wait.duration | The maximum amount of time to wait after a failure to create or write a write-ahead log.<br>**type:** TIMEDURATION, **zk mutable:** yes, **default value:** `5m` |
diff --git a/_docs-2/development/high_speed_ingest.md b/_docs-2/development/high_speed_ingest.md
index 9d07f63..ecf458b 100644
--- a/_docs-2/development/high_speed_ingest.md
+++ b/_docs-2/development/high_speed_ingest.md
@@ -114,5 +114,5 @@ and the [MapReduce example code][mapred-code].
[bulk-example]: https://github.com/apache/accumulo-examples/blob/master/docs/bulkIngest.md
[AccumuloOutputFormat]: {% jurl org.apache.accumulo.core.client.mapred.AccumuloOutputFormat %}
[AccumuloFileOutputFormat]: {% jurl org.apache.accumulo.core.client.mapred.AccumuloFileOutputFormat %}
-[mapred-docs]: {{ page.docs_baseurl }}/development/mapreduce
+[mapred-docs]: {% durl development/mapreduce %}
[mapred-code]: https://github.com/apache/accumulo-examples/blob/master/docs/mapred.md
diff --git a/_docs-2/getting-started/clients.md b/_docs-2/getting-started/clients.md
index 2943b42..b6e4e31 100644
--- a/_docs-2/getting-started/clients.md
+++ b/_docs-2/getting-started/clients.md
@@ -350,7 +350,7 @@ This page covers Accumulo client basics. Below are links to additional document
* [MapReduce] - Documentation for reading and writing to Accumulo using MapReduce.
[AccumuloClient]: {% jurl org.apache.accumulo.core.client.AccumuloClient %}
-[client-props]: {% durl development/client-properties %}
+[client-props]: {% durl configuration/client-properties %}
[auth.type]: {% purl -c auth.type %}
[auth.principal]: {% purl -c auth.principal %}
[auth.token]: {% purl -c auth.token %}
diff --git a/_docs-2/getting-started/quick-install.md b/_docs-2/getting-started/quick-install.md
index e2034a3..6785d2b 100644
--- a/_docs-2/getting-started/quick-install.md
+++ b/_docs-2/getting-started/quick-install.md
@@ -188,7 +188,7 @@ When finished, use the following commands to stop Accumulo:
* Stop Accumulo service: `accumulo-service tserver stop`
* Stop Accumulo cluster: `accumulo-cluster stop`
-[in-depth]: {{ page.docs_baseurl }}/administration/in-depth-install
+[in-depth]: {% durl administration/in-depth-install %}
[download]: https://accumulo.apache.org/downloads/
[build]: https://github.com/apache/accumulo/blob/master/README.md#building
[Zookeeper]: https://zookeeper.apache.org/
diff --git a/_docs-2/getting-started/table_configuration.md b/_docs-2/getting-started/table_configuration.md
index 03bf212..57e7aec 100644
--- a/_docs-2/getting-started/table_configuration.md
+++ b/_docs-2/getting-started/table_configuration.md
@@ -713,7 +713,7 @@ preserved.
[combiner-example]: https://github.com/apache/accumulo-examples/blob/master/docs/combiner.md
[filter]: {% jurl org.apache.accumulo.core.iterators.Filter %}
[table.majc.compaction.strategy]: {% purl table.majc.compaction.strategy %}
-[config-properties]: {{ page.docs_baseurl}}/administration/properties
+[config-properties]: {% durl configuration/server-properties %}
[Scanner]: {% jurl org.apache.accumulo.core.client.Scanner %}
[BatchScanner]: {% jurl org.apache.accumulo.core.client.BatchScanner %}
[Caching]: {% durl administration/caching %}
diff --git a/_docs-2/troubleshooting/tracing.md b/_docs-2/troubleshooting/tracing.md
index 877f7d0..7804a2d 100644
--- a/_docs-2/troubleshooting/tracing.md
+++ b/_docs-2/troubleshooting/tracing.md
@@ -27,7 +27,7 @@ The design of Accumulo's distributed tracing follows that of [Google's Dapper](h
To collect traces, Accumulo needs at least one tracer server running. If you are using `accumulo-cluster` to start your cluster,
configure your server in `conf/tracers`. The server collects traces from clients and writes them to the `trace` table. The Accumulo
-user that the tracer connects to Accumulo with can be configured with the following properties (see the [configuration management][config-mgmt]
+user that the tracer connects to Accumulo with can be configured with the following properties (see the [configuration overview][config-mgmt]
page for setting Accumulo server properties)
* [trace.user]
@@ -332,7 +332,7 @@ Time Start Service@Location Name
5+1692 tserver@localhost tablet read ahead 6
```
-[config-mgmt]: {{ page.docs_baseurl }}/administration/configuration-management
+[config-mgmt]: {% durl configuration/overview %}
[Zipkin]: https://github.com/openzipkin/zipkin
[trace.user]: {% purl trace.user %}
[trace.token.property.password]: {% purl trace.token.property.password %}
diff --git a/_layouts/docs-2.html b/_layouts/docs-2.html
index 7ffdb81..a6f66c2 100644
--- a/_layouts/docs-2.html
+++ b/_layouts/docs-2.html
@@ -8,7 +8,7 @@ skiph1fortitle: true
<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true" data-spy="affix">
<div class="panel panel-default">
{% assign mydocs = site.docs-2 | group_by: 'category' %}
- {% assign categories = "getting-started,development,security,administration,troubleshooting" | split: "," %}
+ {% assign categories = "getting-started,development,security,configuration,administration,troubleshooting" | split: "," %}
{% for pcat in categories %}
{% for dcat in mydocs %}
{% if pcat == dcat.name %}
diff --git a/_plugins/links.rb b/_plugins/links.rb
index 1043c96..2f9dc3f 100755
--- a/_plugins/links.rb
+++ b/_plugins/links.rb
@@ -108,9 +108,9 @@ def render_prop(context, text, link)
base = context.registers[:site].config['docs_baseurl']
end
prop_enc = prop.gsub('.', '_').gsub('*', 'prefix')
- url = "#{base}/administration/properties##{prop_enc}"
+ url = "#{base}/configuration/server-properties##{prop_enc}"
if type == 'client'
- url = "#{base}/development/client-properties##{prop_enc}"
+ url = "#{base}/configuration/client-properties##{prop_enc}"
end
if link
return "[#{prop}](#{url})"
diff --git a/contributor/making-release.md b/contributor/making-release.md
index 7a354c7..aa0de6b 100644
--- a/contributor/making-release.md
+++ b/contributor/making-release.md
@@ -135,9 +135,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. `properties.md` and `client-properties.md` should be copied after it is generated by the Accumulo build.
+2. `server-properties.md` and `client-properties.md` should be copied after it is generated by the Accumulo build.
- cp /path/to/accumulo/core/target/generated-docs/{,client-}properties.md /path/to/accumulo-website/_docs-2-x/administration/properties.md
+ cp /path/to/accumulo/core/target/generated-docs/*-properties.md /path/to/accumulo-website/_docs-2-x/configuration/
**For major releases,** follow the steps below to create docs for next release:
@@ -154,11 +154,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 `properties.md` and `client-properties.md`, and mirror `INSTALL.md`.
+4. Copy `server-properties.md` and `client-properties.md`, and mirror `INSTALL.md`.
Once a collection is created for a major release, developers can make documentation updates like normal website updates.
-**For 2.x minor & bugfix releases,** copy `properties.md` and `client-properties.md`, and mirror `INSTALL.md`.
+**For 2.x minor & bugfix releases,** copy `server-properties.md` and `client-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].