You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2020/04/01 19:19:00 UTC
[lucene-solr] branch jira/solr-14173-2 updated: Allow conditional
TOCs; remove remaining tocclass attributes;
fix toclevels for jekyll-asciidoc TOCs; update docs
This is an automated email from the ASF dual-hosted git repository.
ctargett pushed a commit to branch jira/solr-14173-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/solr-14173-2 by this push:
new 03f732b Allow conditional TOCs; remove remaining tocclass attributes; fix toclevels for jekyll-asciidoc TOCs; update docs
03f732b is described below
commit 03f732b16cb22db30a63e0d121bda0c93cb74542
Author: Cassandra Targett <ca...@lucidworks.com>
AuthorDate: Wed Apr 1 14:17:40 2020 -0500
Allow conditional TOCs; remove remaining tocclass attributes; fix toclevels for jekyll-asciidoc TOCs; update docs
---
solr/solr-ref-guide/build.gradle | 3 +-
solr/solr-ref-guide/build.xml | 1 -
solr/solr-ref-guide/src/_config.yml.template | 2 --
solr/solr-ref-guide/src/_layouts/page.html | 13 ++++---
.../src/analytics-expression-sources.adoc | 1 -
.../src/analytics-mapping-functions.adoc | 1 -
.../src/analytics-reduction-functions.adoc | 3 +-
solr/solr-ref-guide/src/analytics.adoc | 3 +-
.../src/cluster-node-management.adoc | 3 +-
solr/solr-ref-guide/src/collection-aliasing.adoc | 3 +-
solr/solr-ref-guide/src/collection-management.adoc | 3 +-
solr/solr-ref-guide/src/collections-api.adoc | 2 +-
.../solr-ref-guide/src/colocating-collections.adoc | 3 +-
solr/solr-ref-guide/src/configsets-api.adoc | 2 +-
solr/solr-ref-guide/src/coreadmin-api.adoc | 2 +-
solr/solr-ref-guide/src/function-queries.adoc | 1 -
solr/solr-ref-guide/src/how-to-contribute.adoc | 5 ++-
solr/solr-ref-guide/src/index.adoc | 2 +-
solr/solr-ref-guide/src/installing-solr.adoc | 2 +-
solr/solr-ref-guide/src/json-facet-api.adoc | 3 +-
.../src/major-changes-in-solr-7.adoc | 1 -
.../src/major-changes-in-solr-8.adoc | 1 -
.../src/major-changes-in-solr-9.adoc | 3 +-
solr/solr-ref-guide/src/meta-docs/jekyll.adoc | 40 ++++++++++++----------
.../src/overview-of-the-solr-admin-ui.adoc | 2 +-
.../src/package-manager-internals.adoc | 1 -
solr/solr-ref-guide/src/package-manager.adoc | 1 -
solr/solr-ref-guide/src/replica-management.adoc | 3 +-
solr/solr-ref-guide/src/schema-api.adoc | 1 -
solr/solr-ref-guide/src/shard-management.adoc | 3 +-
.../src/solr-control-script-reference.adoc | 1 -
solr/solr-ref-guide/src/solr-glossary.adoc | 2 +-
solr/solr-ref-guide/src/solr-tutorial.adoc | 1 -
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 3 +-
.../src/solrcloud-autoscaling-api.adoc | 3 +-
.../src/solrcloud-autoscaling-overview.adoc | 3 +-
.../solrcloud-autoscaling-policy-preferences.adoc | 3 +-
.../src/solrcloud-autoscaling-triggers.adoc | 1 -
.../src/stream-decorator-reference.adoc | 3 +-
.../src/stream-evaluator-reference.adoc | 3 +-
.../src/stream-source-reference.adoc | 3 +-
...ding-data-with-solr-cell-using-apache-tika.adoc | 1 -
...ta-store-data-with-the-data-import-handler.adoc | 2 +-
43 files changed, 58 insertions(+), 85 deletions(-)
diff --git a/solr/solr-ref-guide/build.gradle b/solr/solr-ref-guide/build.gradle
index 7e68894..50f056a 100644
--- a/solr/solr-ref-guide/build.gradle
+++ b/solr/solr-ref-guide/build.gradle
@@ -168,7 +168,6 @@ ext {
asciiDocAttrs = [
'common': [
'attribute-missing' : 'warn',
- 'section-toc' : '',
'icons' : 'font',
'icon-set' : 'fa',
'figure-caption!' : '',
@@ -351,4 +350,4 @@ task buildSite(type: JavaExec) {
check.dependsOn bareBonesHtmlValidation
// Do not hook site building to assemble, at least for now.
-// assemble.dependsOn buildSite
\ No newline at end of file
+// assemble.dependsOn buildSite
diff --git a/solr/solr-ref-guide/build.xml b/solr/solr-ref-guide/build.xml
index 1cfc712..6ee2396 100644
--- a/solr/solr-ref-guide/build.xml
+++ b/solr/solr-ref-guide/build.xml
@@ -209,7 +209,6 @@
doctype="book"
safemode="unsafe">
<attribute key="attribute-missing" value="warn" />
- <attribute key="section-toc" value='' />
<attribute key="icons" value="font" />
<attribute key="icon-set" value="fa" />
<attribute key="figure-caption!" value='' />
diff --git a/solr/solr-ref-guide/src/_config.yml.template b/solr/solr-ref-guide/src/_config.yml.template
index 2d89891..4d91c84 100755
--- a/solr/solr-ref-guide/src/_config.yml.template
+++ b/solr/solr-ref-guide/src/_config.yml.template
@@ -95,5 +95,3 @@ asciidoctor:
icons: "font"
source-highlighter: "rouge"
rouge-theme: "thankful-eyes"
- # NOTE: do *NOT* use an self-empty div tag (ie: <div/>) here - it will break jquery
- section-toc: "<div class=\"toc section-toc\"></div>"
diff --git a/solr/solr-ref-guide/src/_layouts/page.html b/solr/solr-ref-guide/src/_layouts/page.html
index 01fda76..394d3e0 100755
--- a/solr/solr-ref-guide/src/_layouts/page.html
+++ b/solr/solr-ref-guide/src/_layouts/page.html
@@ -2,22 +2,27 @@
layout: default
---
-{% comment %}NOTE: page_id is also definied in default.html{% endcomment %}
+{% comment %}NOTE: page_id is also defined in default.html{% endcomment %}
{% assign page_id = page.url | split: '/' | last | remove: '.html' %}
<header class="header">
<h1 class="title-main">{{ page.title }}</h1>
</header>
<div class="container-fluid">
+
+<!-- This makes the automatic TOC generation conditional.
+ Add ":page-show-toc: false" to front-matter to disable auto-TOC. -->
+ {% if page.show-toc != false %}
<nav class="toc float-right justify-content-end">
- {{page.document | tocify_asciidoc }}
-</nav>
+ {{ page.document | tocify_asciidoc }}
+ </nav>
+ {% endif %}
+
<section class="content">
{{ content }}
</section>
-
<!-- Adds tags, if any -->
<div class="tags">
{% if page.tags != null %}
diff --git a/solr/solr-ref-guide/src/analytics-expression-sources.adoc b/solr/solr-ref-guide/src/analytics-expression-sources.adoc
index c56337f..091c243 100644
--- a/solr/solr-ref-guide/src/analytics-expression-sources.adoc
+++ b/solr/solr-ref-guide/src/analytics-expression-sources.adoc
@@ -1,5 +1,4 @@
= Analytics Expression Sources
-:page-tocclass: right
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/analytics-mapping-functions.adoc b/solr/solr-ref-guide/src/analytics-mapping-functions.adoc
index 75afd7f..5733e78 100644
--- a/solr/solr-ref-guide/src/analytics-mapping-functions.adoc
+++ b/solr/solr-ref-guide/src/analytics-mapping-functions.adoc
@@ -1,5 +1,4 @@
= Analytics Mapping Functions
-:page-tocclass: right
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/analytics-reduction-functions.adoc b/solr/solr-ref-guide/src/analytics-reduction-functions.adoc
index 60c65fa..bdb5e65 100644
--- a/solr/solr-ref-guide/src/analytics-reduction-functions.adoc
+++ b/solr/solr-ref-guide/src/analytics-reduction-functions.adoc
@@ -1,6 +1,5 @@
= Analytics Reduction Functions
-:page-tocclass: right
-:page-toclevels: 2
+:toclevels: 2
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/analytics.adoc b/solr/solr-ref-guide/src/analytics.adoc
index 9ab970a..7cd452e 100644
--- a/solr/solr-ref-guide/src/analytics.adoc
+++ b/solr/solr-ref-guide/src/analytics.adoc
@@ -1,7 +1,6 @@
= Analytics Component
:page-children: analytics-expression-sources, analytics-mapping-functions, analytics-reduction-functions
-:page-tocclass: right
-:page-toclevel: 2
+:toclevels: 2
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/cluster-node-management.adoc b/solr/solr-ref-guide/src/cluster-node-management.adoc
index 7c28fc8..571666f 100644
--- a/solr/solr-ref-guide/src/cluster-node-management.adoc
+++ b/solr/solr-ref-guide/src/cluster-node-management.adoc
@@ -1,6 +1,5 @@
= Cluster and Node Managment Commands
-:page-toclevels: 1
-:page-tocclass: right
+:toclevels: 1
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/collection-aliasing.adoc b/solr/solr-ref-guide/src/collection-aliasing.adoc
index 8ec6d13..0fa2e4e 100644
--- a/solr/solr-ref-guide/src/collection-aliasing.adoc
+++ b/solr/solr-ref-guide/src/collection-aliasing.adoc
@@ -1,6 +1,5 @@
= Collection Aliasing
-:page-toclevels: 1
-:page-tocclass: right
+:toclevels: 1
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/collection-management.adoc b/solr/solr-ref-guide/src/collection-management.adoc
index 5e91271..981ad5f 100644
--- a/solr/solr-ref-guide/src/collection-management.adoc
+++ b/solr/solr-ref-guide/src/collection-management.adoc
@@ -1,6 +1,5 @@
= Collection Management Commands
-:page-toclevels: 1
-:page-tocclass: right
+:toclevels: 1
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/collections-api.adoc b/solr/solr-ref-guide/src/collections-api.adoc
index 2356793..4e4809b 100644
--- a/solr/solr-ref-guide/src/collections-api.adoc
+++ b/solr/solr-ref-guide/src/collections-api.adoc
@@ -1,6 +1,6 @@
= Collections API
:page-children: cluster-node-management, collection-management, collection-aliasing, shard-management, replica-management
-:page-toc: false
+:page-show-toc: false
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/colocating-collections.adoc b/solr/solr-ref-guide/src/colocating-collections.adoc
index 9dd064d..e8e9ce1 100644
--- a/solr/solr-ref-guide/src/colocating-collections.adoc
+++ b/solr/solr-ref-guide/src/colocating-collections.adoc
@@ -1,6 +1,5 @@
= Colocating Collections
-:page-toclevels: 1
-:page-tocclass: right
+:toclevels: 1
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/configsets-api.adoc b/solr/solr-ref-guide/src/configsets-api.adoc
index 761bc0e..2ce4839 100644
--- a/solr/solr-ref-guide/src/configsets-api.adoc
+++ b/solr/solr-ref-guide/src/configsets-api.adoc
@@ -1,5 +1,5 @@
= Configsets API
-:page-toclevels: 1
+:toclevels: 1
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/coreadmin-api.adoc b/solr/solr-ref-guide/src/coreadmin-api.adoc
index 53b3191..22b7d1c 100644
--- a/solr/solr-ref-guide/src/coreadmin-api.adoc
+++ b/solr/solr-ref-guide/src/coreadmin-api.adoc
@@ -1,5 +1,5 @@
= CoreAdmin API
-:page-toclevels: 1
+:toclevels: 1
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/function-queries.adoc b/solr/solr-ref-guide/src/function-queries.adoc
index ac276d1..13ffa46 100644
--- a/solr/solr-ref-guide/src/function-queries.adoc
+++ b/solr/solr-ref-guide/src/function-queries.adoc
@@ -1,5 +1,4 @@
= Function Queries
-:page-tocclass: right
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/how-to-contribute.adoc b/solr/solr-ref-guide/src/how-to-contribute.adoc
index eea1346..1c8ee60 100644
--- a/solr/solr-ref-guide/src/how-to-contribute.adoc
+++ b/solr/solr-ref-guide/src/how-to-contribute.adoc
@@ -1,6 +1,5 @@
= How to Contribute to Solr Documentation
-:page-tocclass: right
-:page-toclevels: 3
+:toclevels: 2
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
@@ -31,7 +30,7 @@ include::meta-docs/asciidoc-syntax.adoc[leveloffset=+2]
include::meta-docs/editing-tools.adoc[leveloffset=+2]
-== Modifying the Publication Formats
+== Modifying the HTML Templates
The Solr Reference Guide is published in HTML format, using Jekyll and some plugins.
include::meta-docs/jekyll.adoc[leveloffset=+2]
diff --git a/solr/solr-ref-guide/src/index.adoc b/solr/solr-ref-guide/src/index.adoc
index de52d4a..dd98824 100644
--- a/solr/solr-ref-guide/src/index.adoc
+++ b/solr/solr-ref-guide/src/index.adoc
@@ -20,7 +20,7 @@
errata, \
how-to-contribute
:page-notitle:
-:page-toc: false
+:page-show-toc: false
:page-layout: home
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
diff --git a/solr/solr-ref-guide/src/installing-solr.adoc b/solr/solr-ref-guide/src/installing-solr.adoc
index 2632e53..4e3872a 100644
--- a/solr/solr-ref-guide/src/installing-solr.adoc
+++ b/solr/solr-ref-guide/src/installing-solr.adoc
@@ -1,5 +1,5 @@
= Installing Solr
-:page-toclevels: 1
+:toclevels: 1
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/json-facet-api.adoc b/solr/solr-ref-guide/src/json-facet-api.adoc
index 1d2bc8a..cbd68d7 100644
--- a/solr/solr-ref-guide/src/json-facet-api.adoc
+++ b/solr/solr-ref-guide/src/json-facet-api.adoc
@@ -1,8 +1,7 @@
= JSON Facet API
-:page-tocclass: right
+:page-children: json-faceting-domain-changes
:solr-root-path: ../../
:example-source-dir: {solr-root-path}solrj/src/test/org/apache/solr/client/ref_guide_examples/
-:page-children: json-faceting-domain-changes
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/major-changes-in-solr-7.adoc b/solr/solr-ref-guide/src/major-changes-in-solr-7.adoc
index b81552d..9b23534 100644
--- a/solr/solr-ref-guide/src/major-changes-in-solr-7.adoc
+++ b/solr/solr-ref-guide/src/major-changes-in-solr-7.adoc
@@ -1,5 +1,4 @@
= Major Changes in Solr 7
-:page-tocclass: right
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/major-changes-in-solr-8.adoc b/solr/solr-ref-guide/src/major-changes-in-solr-8.adoc
index 5372bcd..b5628ce 100644
--- a/solr/solr-ref-guide/src/major-changes-in-solr-8.adoc
+++ b/solr/solr-ref-guide/src/major-changes-in-solr-8.adoc
@@ -1,5 +1,4 @@
= Major Changes in Solr 8
-:page-tocclass: right
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc
index dab1ba6..1813a56 100644
--- a/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc
+++ b/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc
@@ -1,5 +1,4 @@
= Major Changes in Solr 9
-:page-tocclass: right
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
@@ -90,7 +89,7 @@ _(raw; not yet edited)_
This embedded zookeeper should not be used in production. If you rely
upon the previous behavior, then you can change the clientPortAddress
in solr/server/solr/zoo.cfg (Robert Muir)
-
+
=== Upgrade Prerequisites in Solr 9
=== Rolling Upgrades with Solr 9
diff --git a/solr/solr-ref-guide/src/meta-docs/jekyll.adoc b/solr/solr-ref-guide/src/meta-docs/jekyll.adoc
index a169ea5..28e46b7 100644
--- a/solr/solr-ref-guide/src/meta-docs/jekyll.adoc
+++ b/solr/solr-ref-guide/src/meta-docs/jekyll.adoc
@@ -1,4 +1,4 @@
-= Making Changes to HTML Version
+= Making Changes to Jekyll
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
@@ -45,7 +45,7 @@ Front matter for Jekyll is similar to a header that defines the title of the pag
Every document that will be converted to HTML *must* include at least the page title at the top of the page. Page titles are defined with a single equal sign (`=`) followed by the title that will appear at the top of the page (such as `= Topic of the Page`).
-Many guides to Jekyll also say that defining the layout in the front matter is required. However, since we only use one layout for all pages, we have defined this as a default.
+Many guides to Jekyll also say that defining the `layout` in the front matter is required. However, since we only use one layout for all pages, we have defined this as a default.
The Solr Ref Guide uses the front matter to define some custom attributes on a per page basis:
@@ -58,19 +58,12 @@ The format for adding any parameter to the front matter is to use colons on both
==== Table of Contents
There are some optional custom attributes that can be defined in pages to affect the Table of Contents presentation in Jekyll:
-`page-toclevels`::
-Changes how "deep" the TOC will be in terms of nested section/sub-section titles (default = `2`).
-`page-tocclass`::
-Changes the CSS class applied to the TOC. The options are:
-* `normal`, the default, resulting in the class name `toc-normal` being used in the HTML.
-* `right`, to put the TOC on the right side of the page.
-* `column`, to make a very long TOC span 3 columns at the top of the page.
-`page-toc`::
-If this is `false`, then no TOCs will be generated for the page at all. The default is `true`, so can usually be left undefined.
-`\{section-toc}`::
-A special macro that can be used anywhere in a page to create an "In this Section" TOC covering only the sub-headings in the same section.
-+
-NOTE: Setting `:page-toc: false` will prevent the `section-toc` macro from working, so if you want no "top level" TOC, but you do want section TOCs, use `:page-toclevels: 0`.
+`toclevels`::
+Changes how "deep" the TOC will be in terms of nested section/sub-section titles (default = `2`). Example: `:toclevels: 1`.
+
+`page-show-toc`::
+If this is `false`, then no TOCs will be generated for the page at all. The default is `true`, so can usually be left undefined. Example `:page-show-toc: false`.
+
=== Layouts
@@ -78,19 +71,28 @@ Layouts define the "look and feel" of each page. Jekyll uses https://shopify.git
For our implementation of Jekyll, layouts are found in `solr-ref-guide/src/_layouts`.
-We currently use only the `_layouts/default.html` layout for overall page structure, and `_layouts/page.html` for the page-level content. The `page.html` layout is inserted into the `default.html` layout.
+We currently use the `_layouts/default.html` layout for overall page structure, for almost all pages and `_layouts/page.html` for the page-level content.
+The `page.html` layout is inserted into the `default.html` layout.
+
+The main page (`index.html`) of the Ref Guide uses the `_layouts/home.html` layout.
+It also still uses `_layouts/page.html` for the page-level content.
+This is done because `index.html` has some special formatting and rules for how to define the page.
=== Includes
-Include files are (usually) small files that are pulled into a layout when a page is being built. They are Liquid templates that define an area of the page. This allows flexibility across layouts - all pages can have the same header without duplicating code, but different pages could have different menu options.
+Include files are (usually) small HTML files that are pulled into a layout when a page is being built.
+ They are Liquid templates that define an area of the page.
+ This allows flexibility across layouts - all pages can have the same header without duplicating code, but different pages could have different menu options.
-Include files that we use define the top navigation, the page header, the page footer, and tables of contents.
+Include files that we use define the top navigation, the page header, and the page footer.
For our implementation of Jekyll, include files are found in `solr-ref-guide/src/_includes`.
=== Data Files
-Data files include data such as lists that should be included in each page. The left-hand navigation menu is an example of a data file. However, in our build, the navigation is built from the `page-children` hierarchies.
+Data files include data such as lists that should be included in each page.
+The left-hand navigation menu is an example of a data file.
+However, in our build, the navigation is built from the `page-children` hierarchies defined on parent pages.
For our implementation of Jekyll, data files are found in `solr-ref-guide/src/_data`.
diff --git a/solr/solr-ref-guide/src/overview-of-the-solr-admin-ui.adoc b/solr/solr-ref-guide/src/overview-of-the-solr-admin-ui.adoc
index 8f1624f..45e2aeb 100644
--- a/solr/solr-ref-guide/src/overview-of-the-solr-admin-ui.adoc
+++ b/solr/solr-ref-guide/src/overview-of-the-solr-admin-ui.adoc
@@ -1,5 +1,5 @@
= Overview of the Solr Admin UI
-:page-toc: false
+:page-show-toc: false
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/package-manager-internals.adoc b/solr/solr-ref-guide/src/package-manager-internals.adoc
index 1c73f26..19baa3d 100644
--- a/solr/solr-ref-guide/src/package-manager-internals.adoc
+++ b/solr/solr-ref-guide/src/package-manager-internals.adoc
@@ -1,5 +1,4 @@
= Package Manager Internals
-:page-tocclass: right
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/package-manager.adoc b/solr/solr-ref-guide/src/package-manager.adoc
index 57a0212..75d1150 100644
--- a/solr/solr-ref-guide/src/package-manager.adoc
+++ b/solr/solr-ref-guide/src/package-manager.adoc
@@ -1,6 +1,5 @@
= Package Management
:page-children: package-manager-internals
-:page-tocclass: right
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/replica-management.adoc b/solr/solr-ref-guide/src/replica-management.adoc
index 13ca185..cf508c3 100644
--- a/solr/solr-ref-guide/src/replica-management.adoc
+++ b/solr/solr-ref-guide/src/replica-management.adoc
@@ -1,6 +1,5 @@
= Replica Management Commands
-:page-toclevels: 1
-:page-tocclass: right
+:toclevels: 1
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/schema-api.adoc b/solr/solr-ref-guide/src/schema-api.adoc
index 60e97a6..85d8d9d 100644
--- a/solr/solr-ref-guide/src/schema-api.adoc
+++ b/solr/solr-ref-guide/src/schema-api.adoc
@@ -1,5 +1,4 @@
= Schema API
-:page-tocclass: right
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/shard-management.adoc b/solr/solr-ref-guide/src/shard-management.adoc
index 089df7d..fa0712d 100644
--- a/solr/solr-ref-guide/src/shard-management.adoc
+++ b/solr/solr-ref-guide/src/shard-management.adoc
@@ -1,6 +1,5 @@
= Shard Management Commands
-:page-toclevels: 1
-:page-tocclass: right
+:toclevels: 1
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/solr-control-script-reference.adoc b/solr/solr-ref-guide/src/solr-control-script-reference.adoc
index 9349fe5..b192f9c 100644
--- a/solr/solr-ref-guide/src/solr-control-script-reference.adoc
+++ b/solr/solr-ref-guide/src/solr-control-script-reference.adoc
@@ -1,5 +1,4 @@
= Solr Control Script Reference
-:page-tocclass: right
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/solr-glossary.adoc b/solr/solr-ref-guide/src/solr-glossary.adoc
index a451925..5c471af 100644
--- a/solr/solr-ref-guide/src/solr-glossary.adoc
+++ b/solr/solr-ref-guide/src/solr-glossary.adoc
@@ -1,5 +1,5 @@
= Solr Glossary
-:page-toc: false
+:page-show-toc: false
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/solr-tutorial.adoc b/solr/solr-ref-guide/src/solr-tutorial.adoc
index 77b0deb..f8aa8e3 100644
--- a/solr/solr-ref-guide/src/solr-tutorial.adoc
+++ b/solr/solr-ref-guide/src/solr-tutorial.adoc
@@ -1,5 +1,4 @@
= Solr Tutorial
-:page-tocclass: right
:experimental:
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
diff --git a/solr/solr-ref-guide/src/solr-upgrade-notes.adoc b/solr/solr-ref-guide/src/solr-upgrade-notes.adoc
index c3289a0..e8069f3 100644
--- a/solr/solr-ref-guide/src/solr-upgrade-notes.adoc
+++ b/solr/solr-ref-guide/src/solr-upgrade-notes.adoc
@@ -1,7 +1,6 @@
= Solr Upgrade Notes
:page-children: major-changes-in-solr-9, major-changes-in-solr-8, major-changes-in-solr-7, major-changes-from-solr-5-to-solr-6
-:page-toclevels: 3
-:page-tocclass: right
+:toclevels: 3
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/solrcloud-autoscaling-api.adoc b/solr/solr-ref-guide/src/solrcloud-autoscaling-api.adoc
index 0ae519c..4d4ff58 100644
--- a/solr/solr-ref-guide/src/solrcloud-autoscaling-api.adoc
+++ b/solr/solr-ref-guide/src/solrcloud-autoscaling-api.adoc
@@ -1,6 +1,5 @@
= Autoscaling API
-:page-toclevels: 2
-:page-tocclass: right
+:toclevels: 2
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/solrcloud-autoscaling-overview.adoc b/solr/solr-ref-guide/src/solrcloud-autoscaling-overview.adoc
index b7c438c..f6d29b5 100644
--- a/solr/solr-ref-guide/src/solrcloud-autoscaling-overview.adoc
+++ b/solr/solr-ref-guide/src/solrcloud-autoscaling-overview.adoc
@@ -1,6 +1,5 @@
= Overview of SolrCloud Autoscaling
-:page-toclevels: 1
-:page-tocclass: right
+:toclevels: 1
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/solrcloud-autoscaling-policy-preferences.adoc b/solr/solr-ref-guide/src/solrcloud-autoscaling-policy-preferences.adoc
index b1c8acd..65ca480 100644
--- a/solr/solr-ref-guide/src/solrcloud-autoscaling-policy-preferences.adoc
+++ b/solr/solr-ref-guide/src/solrcloud-autoscaling-policy-preferences.adoc
@@ -1,6 +1,5 @@
= Autoscaling Policy and Preferences
-:page-toclevels: 2
-:page-tocclass: right
+:toclevels: 2
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/solrcloud-autoscaling-triggers.adoc b/solr/solr-ref-guide/src/solrcloud-autoscaling-triggers.adoc
index bf1b969..5fa5003 100644
--- a/solr/solr-ref-guide/src/solrcloud-autoscaling-triggers.adoc
+++ b/solr/solr-ref-guide/src/solrcloud-autoscaling-triggers.adoc
@@ -1,5 +1,4 @@
= SolrCloud Autoscaling Triggers
-:page-tocclass: right
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/stream-decorator-reference.adoc b/solr/solr-ref-guide/src/stream-decorator-reference.adoc
index 7e2b3e1..834bcd2 100644
--- a/solr/solr-ref-guide/src/stream-decorator-reference.adoc
+++ b/solr/solr-ref-guide/src/stream-decorator-reference.adoc
@@ -1,6 +1,5 @@
= Stream Decorator Reference
-:page-tocclass: right
-:page-toclevels: 1
+:toclevels: 1
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/stream-evaluator-reference.adoc b/solr/solr-ref-guide/src/stream-evaluator-reference.adoc
index bb13e77..b1ef9ca 100644
--- a/solr/solr-ref-guide/src/stream-evaluator-reference.adoc
+++ b/solr/solr-ref-guide/src/stream-evaluator-reference.adoc
@@ -1,6 +1,5 @@
= Stream Evaluator Reference
-:page-tocclass: right
-:page-toclevels: 1
+:toclevels: 1
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/stream-source-reference.adoc b/solr/solr-ref-guide/src/stream-source-reference.adoc
index 54492ff..2c3d02f 100644
--- a/solr/solr-ref-guide/src/stream-source-reference.adoc
+++ b/solr/solr-ref-guide/src/stream-source-reference.adoc
@@ -1,6 +1,5 @@
= Stream Source Reference
-:page-tocclass: right
-:page-toclevels: 1
+:toclevels: 1
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/uploading-data-with-solr-cell-using-apache-tika.adoc b/solr/solr-ref-guide/src/uploading-data-with-solr-cell-using-apache-tika.adoc
index 0862e91..b4b9e17 100644
--- a/solr/solr-ref-guide/src/uploading-data-with-solr-cell-using-apache-tika.adoc
+++ b/solr/solr-ref-guide/src/uploading-data-with-solr-cell-using-apache-tika.adoc
@@ -1,5 +1,4 @@
= Uploading Data with Solr Cell using Apache Tika
-:page-tocclass: right
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
diff --git a/solr/solr-ref-guide/src/uploading-structured-data-store-data-with-the-data-import-handler.adoc b/solr/solr-ref-guide/src/uploading-structured-data-store-data-with-the-data-import-handler.adoc
index b39441a..d9f6cf8 100644
--- a/solr/solr-ref-guide/src/uploading-structured-data-store-data-with-the-data-import-handler.adoc
+++ b/solr/solr-ref-guide/src/uploading-structured-data-store-data-with-the-data-import-handler.adoc
@@ -1,5 +1,5 @@
= Uploading Structured Data Store Data with the Data Import Handler
-:page-toclevels: 1
+:toclevels: 1
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information