You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@accumulo.apache.org by GitBox <gi...@apache.org> on 2018/10/22 19:49:13 UTC

[GitHub] mikewalch closed pull request #717: Updates to code that generate configuration docs

mikewalch closed pull request #717: Updates to code that generate configuration docs
URL: https://github.com/apache/accumulo/pull/717
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/assemble/conf/accumulo.properties b/assemble/conf/accumulo.properties
index c864424043..d34e9dd10e 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 d9ca17a982..057ae12358 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 691c66061f..f92e6bb338 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 @@ void beginSection(String section) {}
     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 dacf09f23f..fcfd5da9d3 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 @@ void beginTable(String name) {
   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"


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services