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.git
The following commit(s) were added to refs/heads/master by this push: new c1211c2 Updates to code that generate configuration docs (#717) c1211c2 is described below commit c1211c27491ede3db2ddf89321d1de3577a8e00b Author: Mike Walch <mwa...@apache.org> AuthorDate: Mon Oct 22 13:25:49 2018 -0400 Updates to code that generate configuration docs (#717) --- assemble/conf/accumulo.properties | 3 +-- core/pom.xml | 2 +- .../main/java/org/apache/accumulo/core/conf/ClientConfigGenerate.java | 4 ++-- .../main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/assemble/conf/accumulo.properties b/assemble/conf/accumulo.properties index c864424..d34e9dd 100644 --- a/assemble/conf/accumulo.properties +++ b/assemble/conf/accumulo.properties @@ -14,8 +14,7 @@ # limitations under the License. # This is the main configuration file for Apache Accumulo. Available configuration properties can be -# found in the Accumulo documentation on the Accumulo project website (https://accumulo.apache.org/) -# Link for Accumulo 2.0: https://accumulo.apache.org/docs/2.0/administration/properties +# found at https://accumulo.apache.org/docs/2.x/configuration/server-properties ## Sets location in HDFS where Accumulo will store data instance.volumes=hdfs://localhost:8020/accumulo diff --git a/core/pom.xml b/core/pom.xml index d9ca17a..057ae12 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -297,7 +297,7 @@ <classpathScope>test</classpathScope> <arguments> <argument>--generate-markdown</argument> - <argument>${project.build.directory}/generated-docs/properties.md</argument> + <argument>${project.build.directory}/generated-docs/server-properties.md</argument> </arguments> </configuration> </execution> diff --git a/core/src/main/java/org/apache/accumulo/core/conf/ClientConfigGenerate.java b/core/src/main/java/org/apache/accumulo/core/conf/ClientConfigGenerate.java index 691c660..f92e6bb 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/ClientConfigGenerate.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/ClientConfigGenerate.java @@ -86,8 +86,8 @@ class ClientConfigGenerate { void pageHeader() { doc.println("---"); doc.println("title: Client Properties"); - doc.println("category: development"); - doc.println("order: 9"); + doc.println("category: configuration"); + doc.println("order: 2"); doc.println("---\n"); doc.println("<!-- 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/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java index dacf09f..fcfd5da 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java @@ -62,7 +62,7 @@ class ConfigurationDocGen { void pageHeader() { doc.println("---"); doc.println("title: Server Properties"); - doc.println("category: administration"); + doc.println("category: configuration"); doc.println("order: 3"); doc.println("---\n"); doc.println("<!-- WARNING: Do not edit this file. It is a generated file"