diff --git a/docs/aggregations.asciidoc b/docs/aggregations.asciidoc
index e16f3a3d777..07878661d29 100644
--- a/docs/aggregations.asciidoc
+++ b/docs/aggregations.asciidoc
@@ -64,12 +64,12 @@ The values are typically extracted from the fields of the document (using the fi
 
 * <<sum-aggregation-usage,Sum Aggregation Usage>>
 
+* <<t-test-aggregation-usage,T Test Aggregation Usage>>
+
 * <<top-hits-aggregation-usage,Top Hits Aggregation Usage>>
 
 * <<top-metrics-aggregation-usage,Top Metrics Aggregation Usage>>
 
-* <<t-test-aggregation-usage,T Test Aggregation Usage>>
-
 * <<value-count-aggregation-usage,Value Count Aggregation Usage>>
 
 * <<weighted-average-aggregation-usage,Weighted Average Aggregation Usage>>
@@ -108,12 +108,12 @@ include::aggregations/metric/string-stats/string-stats-aggregation-usage.asciido
 
 include::aggregations/metric/sum/sum-aggregation-usage.asciidoc[]
 
+include::aggregations/metric/t-test/t-test-aggregation-usage.asciidoc[]
+
 include::aggregations/metric/top-hits/top-hits-aggregation-usage.asciidoc[]
 
 include::aggregations/metric/top-metrics/top-metrics-aggregation-usage.asciidoc[]
 
-include::aggregations/metric/t-test/t-test-aggregation-usage.asciidoc[]
-
 include::aggregations/metric/value-count/value-count-aggregation-usage.asciidoc[]
 
 include::aggregations/metric/weighted-average/weighted-average-aggregation-usage.asciidoc[]
diff --git a/docs/query-dsl.asciidoc b/docs/query-dsl.asciidoc
index a9a75ac229d..be9da05bd0e 100644
--- a/docs/query-dsl.asciidoc
+++ b/docs/query-dsl.asciidoc
@@ -49,13 +49,13 @@ NEST exposes all of the full text queries available in Elasticsearch
 
 * <<intervals-usage,Intervals Usage>>
 
-* <<match-usage,Match Usage>>
-
 * <<match-bool-prefix-usage,Match Bool Prefix Usage>>
 
+* <<match-phrase-prefix-usage,Match Phrase Prefix Usage>>
+
 * <<match-phrase-usage,Match Phrase Usage>>
 
-* <<match-phrase-prefix-usage,Match Phrase Prefix Usage>>
+* <<match-usage,Match Usage>>
 
 * <<multi-match-usage,Multi Match Usage>>
 
@@ -71,13 +71,13 @@ include::query-dsl/full-text/common-terms/common-terms-usage.asciidoc[]
 
 include::query-dsl/full-text/intervals/intervals-usage.asciidoc[]
 
-include::query-dsl/full-text/match/match-usage.asciidoc[]
-
 include::query-dsl/full-text/match-bool-prefix/match-bool-prefix-usage.asciidoc[]
 
+include::query-dsl/full-text/match-phrase-prefix/match-phrase-prefix-usage.asciidoc[]
+
 include::query-dsl/full-text/match-phrase/match-phrase-usage.asciidoc[]
 
-include::query-dsl/full-text/match-phrase-prefix/match-phrase-prefix-usage.asciidoc[]
+include::query-dsl/full-text/match/match-usage.asciidoc[]
 
 include::query-dsl/full-text/multi-match/multi-match-usage.asciidoc[]
 
@@ -122,14 +122,14 @@ NEST exposes all of the term queries available in Elasticsearch
 
 * <<term-query-usage,Term Query Usage>>
 
+* <<terms-set-query-usage,Terms Set Query Usage>>
+
 * <<terms-list-query-usage,Terms List Query Usage>>
 
 * <<terms-lookup-query-usage,Terms Lookup Query Usage>>
 
 * <<terms-query-usage,Terms Query Usage>>
 
-* <<terms-set-query-usage,Terms Set Query Usage>>
-
 * <<wildcard-query-usage,Wildcard Query Usage>>
 
 See the Elasticsearch documentation on {ref_current}/term-level-queries.html[Term level queries] for more details.
@@ -160,14 +160,14 @@ include::query-dsl/term-level/regexp/regexp-query-usage.asciidoc[]
 
 include::query-dsl/term-level/term/term-query-usage.asciidoc[]
 
+include::query-dsl/term-level/terms-set/terms-set-query-usage.asciidoc[]
+
 include::query-dsl/term-level/terms/terms-list-query-usage.asciidoc[]
 
 include::query-dsl/term-level/terms/terms-lookup-query-usage.asciidoc[]
 
 include::query-dsl/term-level/terms/terms-query-usage.asciidoc[]
 
-include::query-dsl/term-level/terms-set/terms-set-query-usage.asciidoc[]
-
 include::query-dsl/term-level/wildcard/wildcard-query-usage.asciidoc[]
 
 [[compound-queries]]
@@ -283,10 +283,10 @@ Specialized types of queries that do not fit into other groups
 
 * <<rank-feature-query-usage,Rank Feature Query Usage>>
 
-* <<script-query-usage,Script Query Usage>>
-
 * <<script-score-query-usage,Script Score Query Usage>>
 
+* <<script-query-usage,Script Query Usage>>
+
 * <<shape-query-usage,Shape Query Usage>>
 
 See the Elasticsearch documentation on {ref_current}/specialized-queries.html[Specialized queries] for more details.
@@ -305,10 +305,10 @@ include::query-dsl/specialized/pinned/pinned-query-usage.asciidoc[]
 
 include::query-dsl/specialized/rank-feature/rank-feature-query-usage.asciidoc[]
 
-include::query-dsl/specialized/script/script-query-usage.asciidoc[]
-
 include::query-dsl/specialized/script-score/script-score-query-usage.asciidoc[]
 
+include::query-dsl/specialized/script/script-query-usage.asciidoc[]
+
 include::query-dsl/specialized/shape/shape-query-usage.asciidoc[]
 
 [[span-queries]]
diff --git a/src/DocGenerator/AsciiDoc/RawAsciidocVisitor.cs b/src/DocGenerator/AsciiDoc/RawAsciidocVisitor.cs
index 8a0c4596801..741fa761ffb 100644
--- a/src/DocGenerator/AsciiDoc/RawAsciidocVisitor.cs
+++ b/src/DocGenerator/AsciiDoc/RawAsciidocVisitor.cs
@@ -83,7 +83,7 @@ public override void VisitAttributeEntry(AttributeEntry attributeEntry)
 
 				var list = new UnorderedList();
 
-				foreach (var directory in directories)
+				foreach (var directory in directories.OrderBy(s=>s))
 				{
 					var files = Directory.EnumerateFiles(
 						Path.Combine(Program.TmpOutputDirPath, directory), "*.asciidoc", SearchOption.AllDirectories);