Apache Solr open-source search software
15556: Migrate the Ref Guide to use Antora (#605)
Houston Putmanea0e3bc85ee9
diff --git a/dev-docs/ref-guide/antora.adoc b/dev-docs/ref-guide/antora.adocnew file mode 100644index 00000000000..2f3306f35c7--- /dev/null+++ b/dev-docs/ref-guide/antora.adoc@@ -0,0 +1,70 @@+= Working with HTML Templates+:toc:+// 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+// regarding copyright ownership. The ASF licenses this file+// to you under the Apache License, Version 2.0 (the+// "License"); you may not use this file except in compliance+// with the License. You may obtain a copy of the License at+//+// http://www.apache.org/licenses/LICENSE-2.0+//+// Unless required by applicable law or agreed to in writing,+// software distributed under the License is distributed on an+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+// KIND, either express or implied. See the License for the+// specific language governing permissions and limitations+// under the License.++The Solr Ref Guide uses Antora to build the HTML version of the site.++== What is Antora?++Antora is a static site generator, meaning that it takes some set of documents and produces HTML pages.+It allows for templating of the pages, so each page has the same look and feel without having to code headers, footers, logos, etc., into every page.++Antora is an open source project, online at https://antora.org/.++== How We Use Antora++The following sections describe the main features of Antora that you will encounter while working with the Solr Ref Guide.++=== Asciidoctor+Antora uses Asciidoctor.js by default as it's content markup language.++Read more on the Solr xref:asciidoc-syntax.adoc[AsciiDoc Syntax] page, or on Antora's guide: https://docs.antora.org/antora/latest/asciidoc/asciidoc/++=== playbook.yml++The `playbook.yml` is a global configuration file that drives many of the options used when building the site.++We have template-ized `playbook.template.yml`, instead of a hardcoded `playbook.yml`.+Each gradle task that requires a `playbook.yml`, such as `gradlew buildLocalSite` or `gradlew buildOfficialSite`, will generate the `playbook.yml` that is needed based off of this template.++It is unlikely that you will manually need to edit this very often.++=== antora.yml++The `antora.yml` is a configuration file for a specific version of a component in the Antora build.+Therefore every version we release for the Solr ref-guide, or the Solr Operator ref-guide will have a separate `antora.yml`.++This is also where version-specific variables are configured, such as dependency versions (lucene, zookeeper, etc.), Solr version, and javadocs location.++The `antora.yml` that is used when building a local version of the site is not the version checked-into the repository.+Instead a local `antora.yml` is built in the `build/` directory.+The checked-in `antora.yml` is used when the official ref-guide is built.+Antora will checkout all specified branches/tags and use the antora.yml to build the ref-guide for that branch's version.++In order to test changes to the `antora.yml`, do not change this file directly.+Instead, update `antora.template.yaml`, and `gradlew buildLocalSite` will build a site with the changes.++The only reason you will likely need to change the `antora.template.yml` is if you are introducing new variables for dependency versions.++== Building the HTML Site++A Gradle target `gradlew buildLocalSite` will build the full HTML site (found in `solr/solr-ref-guide/build/site`).++This target builds the navigation for the left-hand menu, and converts all `.adoc` files to `.html`, including navigation and inter-document links.++The `checkSiteLinks` target also checks that all inter-doc and javadocs references are correct and resolvable.diff --git a/dev-docs/ref-guide/asciidoc-syntax.adoc b/dev-docs/ref-guide/asciidoc-syntax.adocindex 8031b2fdfab..866ef854757 100644--- a/dev-docs/ref-guide/asciidoc-syntax.adoc+++ b/dev-docs/ref-guide/asciidoc-syntax.adoc@@ -17,7 +17,7 @@// specific language governing permissions and limitations// under the License.-The definitive manual on AsciiDoc syntax is in the https://docs.asciidoctor.org/asciidoc/latest/[Asciidoctor documentation].+The definitive manual on AsciiDoc syntax is in the https://docs.asciidoctor.org/asciidoctor.js/latest[Asciidoctor.js documentation].To help people get started, however, here is a simpler cheat sheet.== AsciiDoc vs Asciidoctor Syntax@@ -109,49 +109,27 @@ When in doubt, choose `text`, or leave it blank.The build system has the ability to "include" snippets located in other files -- even non-AsciiDoc files such as `*.java` source code files.+These files must reside under the `examples/` directory in the same module as the page that wants to use it.+Snippets are bounded by "tag" comments placed at the start and end of the section you would like to import.Opening tags look like: `// tag::snippetName[]`.Closing tags follow the format: `// end::snippetName[]`.-Snippets can be inserted into an `.adoc` file using an `include` directive, following the format: `include::PathToFileWithSnippet[tag=snippetName]`.+Snippets can be inserted into an `.adoc` file using an `include` directive, following the format: `include::<directory-under-module>$<file-name>[tag=snippetName]`.-Note that when relative paths are provided in these directives, those paths are resolved relative to the location of the AsciiDoc file that the `include` appears in.+Note that when paths are provided in these directives, those paths are resolved relative to the module that the AsciiDoc page lives in.-Snippets can be included directly from any file in the Solr GIT repo by refering to a `solr-root-path` variable prior to the file path, for example:+For example, `modules/deployment-guide/pages/solrj.adoc` uses the `UsingSolrJRefGuideExamplesTest.java` file located under `modules/deployment-guide/examples/`.[source]--[source,java,indent=0]-----\include::{solr-root-path}core/src/java/org/apache/solr/core/SolrCore.java[tag=something]+\include::example$UsingSolrJRefGuideExamplesTest.java[tag=solrj-solrclient-timeouts]-------When building the Guide, the `solr-root-path` attribute will be automatically set correctly for the (temporary) `solr-ref-guide/build/content` directory used by Gradle.--In order for editors (such as ATOM) to be able to offer "live preview" of the `*.adoc` files using these includes, the `solr-root-path` attribute must also be set as a document level attribute in each file, with the correct relative path.--For example, `using-solrj.adoc` sets `solr-root-path` in its header, along with an `example-source-dir` attribute (that depends on `solr-root-path`) in order to reduce redundancy in the many `include::` directives it specifies.--[source]----= Using SolrJ-:solr-root-path: ../../-:example-source-dir: {solr-root-path}solrj/src/test/org/apache/solr/client/ref_guide_examples/-...-[source,java,indent=0]------\include::{example-source-dir}UsingSolrJRefGuideExamplesTest.java[tag=solrj-solrclient-timeouts]------...-[source,java,indent=0]------\include::{example-source-dir}UsingSolrJRefGuideExamplesTest.java[tag=solrj-other-apis]------...-----For more information on the `include` directive, see the documentation at https://docs.asciidoctor.org/asciidoc/latest/directives/include/.+For more information on the `include` directive, see the documentation at https://docs.antora.org/antora/latest/page/include-an-example/.=== Block Titles@@ -185,10 +163,18 @@ There are slightly different rules depending on the type of link you want to creThe build process includes a validation for internal or inter-page links, so if you can build the docs locally, you can use that to verify you constructed your link properly (or pay attention to the Jenkins build after your commit).-With all of the below examples, you can add text to display as the link title by adding a comma after the section reference followed by the display text, as in:+With all of the below examples, you can add text to display as the link title by putting the display text in brackets after the link, as in:++[source]+xref:indexing-guide:schema-api.adoc#modify-the-schema[Modify the Schema]++You can also use the title of the Page or Section you are linking to by using an empty display text.+This is useful in case the title of the page or section changes.+In that case you won't need to change the display text for every link that refers to that page/section.+See an example below:[source]-<<schema-api.adoc#modify-the-schema,Modify the Schema>>+xref:indexing-guide:schema-api.adoc#modify-the-schema[]==== Link to a Section on the Same Page@@ -230,20 +216,32 @@ Take this example from `configsets-api.adoc`:To link to this section, there are two approaches depending on where you are linking from:* From the same page, simply use the anchor name: `\<<configsets-create>>`.-* From another page, use the page name and the anchor name: `\<<configsets-api.adoc#configsets-create>>`.+* From another page, use the page name and the anchor name: `\xref:configuration-guide:configsets-api.adoc#configsets-create[]`.==== Link to Another PageTo link to _another page_ or a section on another page, you must refer to the full filename and refer to the section you want to link to.-When you want to refer the reader to another page without deep-linking to a section, Asciidoctor allows a shorthand for this: you only need to specify an empty anchor (`#`) after the file name.+When you want to refer the reader to another page without deep-linking to a section, Asciidoctor allows this by merely ommiting the `#` and section id.Example::-To construct a link to the `solr-upgrade-notes.adoc` page, we need to refer to the file name (`solr-upgrade-notes.adoc`), then use an empty anchor for the section reference.+To construct a link to the `solr-upgrade-notes.adoc` page, we need to refer to the file name (`solr-upgrade-notes.adoc`), as well as the module that the file resides in (`upgrade-notes/`).+You can determine the module that a page falls under by looking at the folder under `solr-ref-guide/modules` that it resides in.++It's preferred to also always use the page name to give the reader better context for where the link goes.As in:+[source]-For more about upgrades, see <<upgrading-solr.adoc#,Solr Upgrade Notes>>.+For more about upgrades, see xref:upgrade-notes:solr-upgrade-notes.adoc[Solr Upgrade Notes].++==== Link to Another Page in the same Module++If the page that contains the link and the page being linked to reside in the same module, there is no need to include the module name after `xref:`++Example::+To construct a link to the `major-changes-in-solr-9.adoc` page from `solr-upgrade-notes.adoc` page, we do not need to include the module name because they both reside in the `upgrade-notes` module.+++[source]+For more information on upgrading to Solr 9, see the section xref:major-changes-in-solr-9.adoc[].==== Link to a Section on Another PageLinking to a section is the same conceptually as linking to the top of a page, you just need to take a little extra care to format the anchor ID in your link reference properly.@@ -280,7 +278,7 @@ To link from to this section from another page, you would create a link structurThe link in context would look like this:+[source]-For more information, see the section <<schema-api.adoc#modify-the-schema,Modify the Schema>>.+For more information, see the section xref:indexing-guide:schema-api.adoc#modify-the-schema[Modify the Schema].More info: https://docs.asciidoctor.org/asciidoc/latest/macros/inter-document-xref/@@ -339,7 +337,11 @@ If a block image includes a title, it will be included as the text of the captioOptional attributes allow you to set the alt text, the size of the image, if it should be a link, float and alignment.-More info: https://docs.asciidoctor.org/asciidoc/latest/macros/images/+Images must be placed in the `images/` directory under the module of the pages that wish to use that image.+As you can see in the modules that exist now, the ref-guide generally includes sub-directories for each page in the module.+This allows for better management of which pages are using which images.++More info: https://docs.antora.org/antora/latest/page/images/== Tablesdiff --git a/dev-docs/ref-guide/jekyll.adoc b/dev-docs/ref-guide/jekyll.adocdeleted file mode 100644index a6b206d2b60..00000000000--- a/dev-docs/ref-guide/jekyll.adoc+++ /dev/null@@ -1,136 +0,0 @@-= Working with HTML Templates-:toc:-// 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-// regarding copyright ownership. The ASF licenses this file-// to you under the Apache License, Version 2.0 (the-// "License"); you may not use this file except in compliance-// with the License. You may obtain a copy of the License at-//-// http://www.apache.org/licenses/LICENSE-2.0-//-// Unless required by applicable law or agreed to in writing,-// software distributed under the License is distributed on an-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY-// KIND, either express or implied. See the License for the-// specific language governing permissions and limitations-// under the License.--The Solr Ref Guide uses Jekyll to build the HTML version of the site.--== What is Jekyll?--Jekyll is a static site generator, meaning that it takes some set of documents and produces HTML pages. It allows for templating of the pages, so each page has the same look and feel without having to code headers, footers, logos, etc., into every page.--Jekyll is an open source project written in Ruby, online at https://jekyllrb.com/.--== How We Use Jekyll--The following sections describe the main features of Jekyll that you will encounter while working with the Solr Ref Guide.--=== Jekyll-Asciidoctor Plugin-We use a plugin for Jekyll from the Asciidoctor project to integrate Jekyll with Asciidoc formatted content.-The source for the plugin is available at https://github.com/asciidoctor/jekyll-asciidoc.--This plugin allows us to use Asciidoctor-style variables with Jekyll.--=== _config.yml--The `_config.yml` is a global configuration file that drives many of the options used when building the site (particularly in our use of Jekyll).--We have template-ized `_config.yml`, so in our use of Jekyll you will find it in `solr/solr-ref-guide/src` as `_config.yml.template`.-This allows us to define some variables during the build and use common Solr build parameters (such as project versions).--=== Front Matter--Front matter for Jekyll is similar to a header that defines the title of the page, and other variables that may be helpful (or even required) when rendering the page.--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.--The Solr Ref Guide uses the front matter to define some custom attributes on a per-page basis:--* `page-children` - ordered list of child pages, this is used to build the site navigation menu that appears to the left of each page's content.--Other page-level elements can also be defined, such as an Asciidoctor attribute that should apply only to that page, but are not needed on a regular basis.--The format for adding any parameter to the front matter is to use colons on both sides of the parameter, followed by the value for the parameter (such as `:page-toc: false`).--==== Table of Contents-There are some optional custom attributes that can be defined in pages to affect the Table of Contents presentation in Jekyll:--`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--Layouts define the "look and feel" of each page.-Jekyll uses https://shopify.github.io/liquid/[Liquid] for page templates.--For our implementation of Jekyll, layouts are found in `solr-ref-guide/src/_layouts`.--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 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, 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 defined on parent pages.--For our implementation of Jekyll, data files are found in `solr-ref-guide/src/_data`.--=== Asciidoctor Slim Templates--Jekyll creates all of the page elements we do not define in each `.adoc` file: the header, footer, top nav, sidebar nav, and other parts of the page that we don't worry about as we write the content of a page.--Asciidoctor converts the content in each `.adoc` file into HTML and inserts it into the Jekyll page layout we have defined (see <<Layouts>>) to make the individual HTML files that make up the Ref Guide.--While we have unlimited control over styling page content via CSS, without creating custom Asciidoctor-specific plugins or templates there is little out-of-the-box control over the elements, classes, etc., that make up the HTML pages.--In order to better support HTML5, we have customized Asciidoc's default conversion with templates found in the `_templates` directory.-These templates use http://slim-lang.com/[Slim] as the template engine.--Since these templates dictate the very structure of the HTML of our content, customizing these should only be attempted in rare instances and with extensive testing for unforeseen impacts.--=== Using Bootstrap--The HTML files include https://getbootstrap.com/docs/4.1/[Bootstrap] (v4.1.3 as of April 2020, see `_includes/head.html` to confirm the Bootstrap version currently being used), so all of the components of Bootstrap are available.--The design of the Ref Guide makes extensive use of Bootstrap classes to layout the page via the Liquid templates and our customized Asciidoctor templates.--When we want to use additional components of Boostrap that require specific HTML constructs, we must define those within the page content itself (using either `<div>` elements in the content or with Asciidoctor's roles, discussed in the next section).---== Building the HTML Site--A Gradle target `gradlew checkSite` will build the full HTML site (found in `solr/solr-ref-guide/build/html-site`).--This target builds the navigation for the left-hand menu, and converts all `.adoc` files to `.html`, including navigation and inter-document links.--The `checkSite` target also checks that all inter-doc references are correct and resolvable.-See `solr/solr-ref-guide/tools/CheckLinksAndAnchors.java` for details of what that tool does to validate content.diff --git a/dev-docs/ref-guide/publish.adoc b/dev-docs/ref-guide/publish.adocdeleted file mode 100644index e136c1c5f4b..00000000000--- a/dev-docs/ref-guide/publish.adoc+++ /dev/null@@ -1,131 +0,0 @@-= Ref Guide Publication Process-:toc:-// 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-// regarding copyright ownership. The ASF licenses this file-// to you under the Apache License, Version 2.0 (the-// "License"); you may not use this file except in compliance-// with the License. You may obtain a copy of the License at-//-// http://www.apache.org/licenses/LICENSE-2.0-//-// Unless required by applicable law or agreed to in writing,-// software distributed under the License is distributed on an-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY-// KIND, either express or implied. See the License for the-// specific language governing permissions and limitations-// under the License.--This section details how to build the Guide for publication.--== Guide Publication Overview--. Build and publish the DRAFT version.-This is usually done as soon as the RC for a release is available.-. Continue to update docs as needed while Solr artifact VOTE thread is ongoing.-. After VOTE has passed, build and publish final version to overwrite DRAFT watermarked pages.--== Pre-Requisites--In order to build the Ref Guide, you must have the following:--* You have checked out the Solr source code on the machine you will be doing the release from.-* You have Subversion installed.-This is needed for committing the HTML files to the production website repo.-* All builds must be done from the release branch the Guide is for.--NOTE: Build jobs are done by https://ci-builds.apache.org/job/Solr/[Jenkins] for relevant recent branches.-The latest builds are stored in the https://nightlies.apache.org/solr/draft-guides/[ASF nightlies server].-However, these HTML pages will have the `DRAFT` status noted in them and are not suitable for final production publishing.--All dependencies for the build will be installed by Gradle, no local dependencies are required.--== Build the DRAFT Guide--The build process generates the page hierarchy and builds the HTML pages with custom templates the Solr project has defined.--To build the HTML, from the top level of the project, run:--[source,bash]-$ ./gradlew clean solr:solr-ref-guide:buildSite--This will produce pages with a DRAFT watermark across them.-While these are fine for initial DRAFT publication, see the section <<Publish the Final Guide>> for steps to produce final production-ready HTML pages.--The resulting Guide will be in `solr/solr-ref-guide/build`.-The HTML files themselves will be in `solr/solr-ref-guide/build/html-site`.--== Upload to the Website--Push the Guide directly to production via Subversion `import` from where you built it.--[source,bash]-svn -m "Add Ref Guide for Solr 7.7" import <checkoutroot>/solr/solr-ref-guide/build/html-site https://svn.apache.org/repos/infra/sites/solr/guide/7_7--Confirm you can browse to Guide manually by going to the new URL.-For example: https://solr.apache.org/guide/7_7--== Publish the Final Guide--There are two steps to publishing the Guide: first, uploading the DRAFT pages with the production-ready version; and second, updating links to point to the new Guide.--=== Update DRAFT for Release--Since the Guide has already been uploaded to SVN, you need to overwrite the existing files in svn with a version of the production version of the guide:--*Build Production Guide*--Build the Guide locally with a parameter for the Guide version.-This requires the same <<Pre-Requisites,pre-requisites>> from above.--[source,bash]-$ ./gradlew solr:solr-ref-guide:buildSite -PsolrGuideDraft=false--IMPORTANT: The `-PsolrGuideDraft` system property is optional if you build drafts locally or as pre-publication DRAFTs (i.e., not for publication).-By default the build system assumes this is a `DRAFT` build which will have a DRAFT watermark and other labels on the pages.-Including the `-PsolrGuideDraft=false` property ensures the DRAFT watermark and labels are removed from the HTML files.--*Pull Production Repo and Upload New Files*--. Checkout the directory you need to update from the svn production repo:-+-[source,bash]-$ svn co https://svn.apache.org/repos/infra/sites/solr/guide/<dir>-+-* This command checks out the Guide version directory into a local subdirectory with the same name as the version (such as "7_7"). You can provide a better name locally if you prefer by adding it to the end of the command shown above.-* Don't shortcut this and download the whole production website.-It will take an incredibly long time and that will feel like _forever_.-. Copy the files from the build location to the checked out Guide directory.-For example, if we needed to replace the Guide for Solr 7.7, we'd do `cp -r ./solr/solr-ref-guide/build/html-site 7_7/.`-. Use `svn status` to see the files modified.-If there are any pages added or deleted, use `svn add <file>` or `svn rm <file>` as needed.-. Commit the changes: `svn commit -m "Update production 7.7 Ref Guide"`--*Verify Upload Successful*--Spot-check a few pages to verify that the DRAFT watermark is gone, and also-that Solr Javadocs link back to Lucene's correctly (the UpdateRequestProcessor-page has a lot of Javadoc links).--=== Link to the New Version from Solr Website--The only edit we need to do in the website itself is adding a link to the latest guide to /solr/guide.--*Edit guide.md in staging*--. Look at https://solr.staged.apache.org/guide and see if the RM already has updated it.-If not, continue-. You can check out and push changes or edit the file directly in GitHub: https://github.com/apache/solr-site/blob/main/content/pages/guide.md by clicking the edit button and then adding a commit message.-. Verify that the staged version looks good (the link will not work in staging though)--*Publish the changes to production*--You can use your favourite git client to merge leader into branch `production`.-Or you can use GitHub website:--. Make a new pull request from https://github.com/apache/solr-site/compare/production%2E%2E%2Emain-. Note: If there are other changes staged, you will see those as well if you merge `master` into `production`-. Click the "Merge" button on the PR--The ordinary Solr release process will update the `SOLR_LATEST_RELEASE` property of the website, which will ensure that Ref Guide URLs without a version in the path (e.g., `/guide/mypage.adoc`) will automatically redirect to the latest Guide.diff --git a/gradle/documentation/pull-lucene-javadocs.gradle b/gradle/documentation/pull-lucene-javadocs.gradleindex 73700f0fc95..1172fdf7f61 100644--- a/gradle/documentation/pull-lucene-javadocs.gradle+++ b/gradle/documentation/pull-lucene-javadocs.gradle@@ -28,6 +28,8 @@ configure(project(":solr:documentation")) {// Not sure why we need this, otherwise regular JARs get sucked in, not just// javadoc-classifier JARstransitive = false+ canBeResolved = true+ canBeConsumed = true}}@@ -57,7 +59,7 @@ configure(project(":solr:documentation")) {dependsOn configurations.javadocsinputs.files configurations.javadocs- outputs.dir luceneDocsDir+ outputs.dir project.ext.luceneDocsDirdoFirst {def resolved = configurations.javadocs.resolvedConfiguration@@ -72,7 +74,7 @@ configure(project(":solr:documentation")) {def path = id.name.replaceFirst('^lucene-', '').replaceFirst('^analysis-','analysis/')project.sync {from zipTree(artifact.file)- into file("${luceneDocsDir}/${path}/")+ into file("${project.ext.luceneDocsDir}/${path}/")}}}diff --git a/gradle/validation/ecj-lint.gradle b/gradle/validation/ecj-lint.gradleindex 0a7b044eaad..8c72f9d30f9 100644--- a/gradle/validation/ecj-lint.gradle+++ b/gradle/validation/ecj-lint.gradle@@ -102,11 +102,3 @@ allprojects {check.dependsOn ecjLint}}--// This excludes solr-ref-guide from the check (excludes are not taken into account-// and linting of the ant-based task fails.-configure(project(":solr:solr-ref-guide")) {- afterEvaluate {- project.tasks.findByPath("ecjLintMain").enabled = false- }-}diff --git a/gradle/validation/rat-sources.gradle b/gradle/validation/rat-sources.gradleindex 80d90a45087..b6ba8bf6dd2 100644--- a/gradle/validation/rat-sources.gradle+++ b/gradle/validation/rat-sources.gradle@@ -46,12 +46,14 @@ allprojects {// At the module scope we only check selected file patterns as folks have various .gitignore-d resources// generated by IDEs, etc.- include "**/*.gradle"include "**/*.xml"include "**/*.md"include "**/*.py"include "**/*.sh"include "**/*.bat"+ // include build.gradle but exclude .gradle directories+ include "**/*.gradle"+ exclude ".gradle/**"// Include selected patterns from any source folders. We could make this// relative to source sets but it seems to be of little value - all our source sets@@ -80,7 +82,6 @@ allprojects {case ":":include "gradlew"include "gradlew.bat"- exclude ".gradle"exclude ".idea"exclude ".muse"exclude ".git"@@ -141,6 +142,7 @@ allprojects {case ":solr:solr-ref-guide":exclude "src/**"+ exclude "node_modules/**"breakcase ":solr:docker":diff --git a/gradle/validation/validate-source-patterns.gradle b/gradle/validation/validate-source-patterns.gradleindex 3dc22f50b0d..fa660d6cf79 100644--- a/gradle/validation/validate-source-patterns.gradle+++ b/gradle/validation/validate-source-patterns.gradle@@ -80,14 +80,11 @@ allprojects {// default excludes.exclude '**/build/**'exclude '**/.idea/**'+ exclude '**/.gradle/**'if (project == rootProject) {// ourselves :-)exclude 'gradle/validation/validate-source-patterns.gradle'-- // gradle and idea folders.- exclude '.gradle/**'- exclude '.idea/**'} else {// ignore txt files in source resources and tests.exclude 'src/**/*.txt'@@ -117,6 +114,12 @@ configure(project(':solr:server')) {}}+configure(project(':solr:solr-ref-guide')) {+ project.tasks.withType(ValidateSourcePatternsTask) {+ sourceFiles.exclude 'modules/indexing-guide/examples/stemdict.txt' // requires tabs+ sourceFiles.exclude 'node_modules/**' // slightly hackish, this downloads all of the node deps+ }+}class ValidateSourcePatternsTask extends DefaultTask {private ProgressLoggerFactory progressLoggerFactorydiff --git a/solr/.gitignore b/solr/.gitignoreindex e6e2e7e442f..d78365b46bc 100644--- a/solr/.gitignore+++ b/solr/.gitignore@@ -25,3 +25,5 @@lib/test-lib/++/solr-ref-guide/node_modules/diff --git a/solr/solr-ref-guide/README.adoc b/solr/solr-ref-guide/README.adocindex f02b5981217..ecb833dbe96 100644--- a/solr/solr-ref-guide/README.adoc+++ b/solr/solr-ref-guide/README.adoc@@ -18,11 +18,14 @@This is the source for the Solr Reference Guide.-Raw content is stored in Asciidoc (`.adoc`) formatted files in the `src/` directory.+Raw content is stored in Asciidoc (`.adoc`) formatted files in the `modules/` directory.-To build the Ref Guide, simply run `./gradlew checkSite`.+To build the Ref Guide, simply run `./gradlew buildLocalSite`.This will build the HTML files and validate that page references and internal links work properly.+You can find the home page of the generated site under `build/site/index.html`See the `../../dev-docs/ref-guide` directory for information about editing and publishing the Ref Guide.To ignore the Ref Guide steps when running gradle `assemble` or `check`, use either `-Prefguide.include=false` or `SOLR_REF_GUIDE_INCLUDE=false`.++If you want to test any changes for the Site UI files in `ui-src`, then use either `-Prefguide.buildLocalUI=false` or `SOLR_REF_GUIDE_BUILD_LOCAL_UI=false` when building the local or official site.diff --git a/solr/solr-ref-guide/antora.template.yml b/solr/solr-ref-guide/antora.template.ymlnew file mode 100644index 00000000000..0a7d8e2f33a--- /dev/null+++ b/solr/solr-ref-guide/antora.template.yml@@ -0,0 +1,36 @@+name: solr+version: '${solr_version_major}_${solr_version_minor}'+display_version: '${solr_version_major}.${solr_version_minor}'+# Marking a version as 'prerelease: true' is only needed for unpublished branches+#prerelease: true+title: Solr Reference Guide+nav:+- modules/getting-started/getting-started-nav.adoc+- modules/deployment-guide/deployment-nav.adoc+- modules/configuration-guide/config-nav.adoc+- modules/indexing-guide/indexing-nav.adoc+- modules/query-guide/querying-nav.adoc+- modules/upgrade-notes/upgrade-nav.adoc++# The asciidoc attributes must be the last entry in this file+asciidoc:+ attributes:+ idseparator: '-'+ idprefix: ''+ # 'patch-version' is the 'z' part of x.y.z semantic version+ page-solr-javadocs: '${solr_javadocs_link}'+ solr-javadocs: '${solr_javadocs_link}'+ lucene-javadocs: '${lucene_javadocs_link}'+ java-javadocs: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/+ # Some constructed links may be 404 TODO to check+ solr-docs-version: '${solr_version_major}.${solr_version_minor}'+ solr-full-version: '${solr_version}'++ dep-version-commons-codec: '${dep_version_commons_codec}'+ dep-version-dropwizard: '${dep_version_dropwizard}'+ dep-version-hadoop: '${dep_version_hadoop}'+ dep-version-log4j: '${dep_version_log4j}'+ dep-version-opennlp: '${dep_version_opennlp}'+ dep-version-tika: '${dep_version_tika}'+ dep-version-zookeeper: '${dep_version_zookeeper}'+ dep-version-lucene: '${dep_version_lucene}'diff --git a/solr/solr-ref-guide/antora.yml b/solr/solr-ref-guide/antora.ymlnew file mode 100644index 00000000000..27411b19e8e--- /dev/null+++ b/solr/solr-ref-guide/antora.yml@@ -0,0 +1,36 @@+name: solr+version: '10_0'+display_version: '10.0'+# Marking a version as 'prerelease: true' is only needed for unpublished branches+#prerelease: true+title: Solr Reference Guide+nav:+- modules/getting-started/getting-started-nav.adoc+- modules/deployment-guide/deployment-nav.adoc+- modules/configuration-guide/config-nav.adoc+- modules/indexing-guide/indexing-nav.adoc+- modules/query-guide/querying-nav.adoc+- modules/upgrade-notes/upgrade-nav.adoc++# The asciidoc attributes must be the last entry in this file+asciidoc:+ attributes:+ idseparator: '-'+ idprefix: ''+ # 'patch-version' is the 'z' part of x.y.z semantic version+ page-solr-javadocs: 'https://solr.apache.org/docs/10_0_0'+ solr-javadocs: 'https://solr.apache.org/docs/10_0_0'+ lucene-javadocs: 'https://lucene.apache.org/core/9_0_0'+ java-javadocs: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/+ # Some constructed links may be 404 TODO to check+ solr-docs-version: '10.0'+ solr-full-version: '10.0.0'++ dep-version-commons-codec: '1.13'+ dep-version-dropwizard: '4.1.5'+ dep-version-hadoop: '3.2.0'+ dep-version-log4j: '2.17.1'+ dep-version-opennlp: '1.9.1'+ dep-version-tika: '1.27'+ dep-version-zookeeper: '3.7.0'+ dep-version-lucene: '9.0.0'diff --git a/solr/solr-ref-guide/build.gradle b/solr/solr-ref-guide/build.gradleindex 74944dbf798..013f0abe5c9 100644--- a/solr/solr-ref-guide/build.gradle+++ b/solr/solr-ref-guide/build.gradle@@ -15,276 +15,473 @@* limitations under the License.*/-buildscript {- repositories {- mavenCentral()- jcenter()- }-- dependencies {- classpath "org.asciidoctor:asciidoctorj:2.5.1"- }-}+import org.apache.tools.ant.util.TeeOutputStreamplugins {- id 'java'- id 'com.github.jruby-gradle.base' version '2.0.1'+ id "com.github.node-gradle.node" version "3.1.1"}-// This project does not contribute anything to main dependencies.-versionsLock {- testProject()-}+description = 'Solr Reference Guide'-description = 'Solr reference guide'+def buildLocalUI = propertyOrEnvOrDefault("refguide.buildLocalUI", "SOLR_REF_GUIDE_BUILD_LOCAL_UI", "false").toBoolean()-// Use an internal proxy to ruby gems.-repositories {- ruby.gems()+// Attach building the ref guide to standard convention tasks. This+// can be optionally turned off (see SOLR-15670).+if (propertyOrEnvOrDefault('refguide.include', 'SOLR_REF_GUIDE_INCLUDE', "true").toBoolean()) {+ check.dependsOn 'checkSiteLinks'+ assemble.dependsOn 'buildLocalSite'}configurations {- depVerrefGuide+ officialPlaybook+ localPlaybook}dependencies {- // Dependencies to compile internal tools.- implementation('org.asciidoctor:asciidoctorj-api')- implementation('org.asciidoctor:asciidoctorj')- implementation('com.vaadin.external.google:android-json')- implementation('org.jsoup:jsoup')-- // Dependencies referenced in the guide.- depVer('commons-codec:commons-codec')- depVer('io.dropwizard.metrics:metrics-core')- depVer('org.apache.logging.log4j:log4j-core')- depVer('org.apache.opennlp:opennlp-tools')- depVer('org.apache.tika:tika-core')- depVer('org.apache.zookeeper:zookeeper')-- // jekyll dependencies: we cannot use jekyll >=4, as this version uses native lib- // ("sassc" instead of deprecated "sass") which fails to compile on some platforms.- // See https://issues.apache.org/jira/browse/SOLR-15520 for more details.- gems 'rubygems:jekyll:3.9.1'- gems 'rubygems:jekyll-asciidoc:3.0.0'-- // don't know why we have to explicitly add these deps but it doesn't resolve them- // automatically.- gems 'rubygems:tilt:2.0.10'- gems 'rubygems:slim:4.1.0'- gems 'rubygems:concurrent-ruby:1.1.9'- gems 'rubygems:http_parser.rb:0.6.0'-+ localPlaybook project(path: ":solr:documentation", configuration: 'javadocs')+ localPlaybook project(path: ":solr:documentation", configuration: 'site')+}+ext {+ antoraVersion = "3.0.1"+ rootNodeDir = "${project.rootDir}/.gradle/node"+ nodeProjectDir = file("${project.ext.rootNodeDir}/ref-guide-project")++ siteDir = "${buildDir}/site"+ antoraConfigBuildDir = "${buildDir}/antora-config"+ playbooksDir = "${project.ext.antoraConfigBuildDir}/playbooks"+ localAntoraYaml = "${project.ext.antoraConfigBuildDir}/antora.yml"+ siteStagingDir = "${buildDir}/site-staging"+ uiBuildDir = "${buildDir}/ui"+ playbookTemplate = "playbook.template.yml"+ localPlaybook = "local-playbook.yml"+ officialPlaybook = "official-playbook.yml"}-sourceSets {- refGuide {- java {- srcDirs = []- }- resources {- srcDirs = ['src']+/*+ Generating the Antora and Playbook YAML files+ */+task buildLocalAntoraYaml {+ group = 'Site - Local'+ description "Creates an local antora.yml with all variables populated. Note: This will change the antora.yml in the repo, not a build folder."++ def templateYaml = "antora.template.yml"++ inputs.file(templateYaml)+ outputs.file(project.ext.localAntoraYaml)++ doLast {+ def splitVersion = version.toString().split("\\p{Punct}")+ def props = [+ solr_version : "${splitVersion[0]}.${splitVersion[1]}.${splitVersion[2]}",+ solr_version_major : splitVersion[0],+ solr_version_minor : splitVersion[1],+ solr_version_patch : splitVersion[2],+ ]+ // Set these dependency versions as lazy gstrings so that they're resolved after evaluation.+ // These variable names must use underscores, not dashes or periods+ props.putAll([+ ["dep_version_commons_codec", "commons-codec", "commons-codec"],+ ["dep_version_dropwizard", "io.dropwizard.metrics", "metrics-core"],+ ["dep_version_hadoop", "org.apache.hadoop", "hadoop-auth"],+ ["dep_version_log4j", "org.apache.logging.log4j", "log4j-core"],+ ["dep_version_opennlp", "org.apache.opennlp", "opennlp-tools"],+ ["dep_version_tika", "org.apache.tika", "tika-core"],+ ["dep_version_zookeeper", "org.apache.zookeeper", "zookeeper"],+ ["dep_version_lucene", "org.apache.lucene", "lucene-core"],+ ].collectEntries { propKey, depGroup, depId -> [propKey, "${-> project.getVersion(depGroup, depId)}"] })++ props.putAll([+ solr_javadocs_link : "https://solr.apache.org/docs/${props.solr_version.replaceAll("\\.", "_")}",+ lucene_javadocs_link : project(':solr:documentation').luceneDocUrl,+ ])++ copy {+ from(templateYaml) {+ rename {+ "antora.yml"+ }+ }+ into project.ext.antoraConfigBuildDir++ expand(props)}}+}- main {- java {- srcDirs = ['tools']+task buildLocalAntoraPlaybookYaml(type: Copy) {+ group = 'Site - Local'+ description "Creates ${project.ext.localPlaybook} to build and test the site locally"++ from(project.ext.playbookTemplate) {+ rename {+ project.ext.localPlaybook}}+ into project.ext.playbooksDir++ def props = [+ 'site_url' : "",+ 'redirect_facility' : "static",+ 'source_url' : project.rootDir,+ 'source_branches' : "HEAD",+ 'start_path' : project.rootDir.relativePath(file(project.ext.siteStagingDir)),+ 'supplemental_files' : "${project.ext.nodeProjectDir}/node_modules/@antora/lunr-extension/supplemental_ui",+ 'site_dir' : "./" + file(project.ext.siteStagingDir).relativePath(file(project.ext.siteDir)),+ ]- test {- java {- srcDirs = []+ expand(props)+ inputs.properties(props)+}++task buildOfficialAntoraPlaybookYaml(type: Copy) {+ group = 'Site - Official'+ description "Creates ${project.ext.officialPlaybook} to build the official Solr ref-guide"++ from(project.ext.playbookTemplate) {+ rename {+ project.ext.officialPlaybook}}+ into project.ext.playbooksDir++ def props = [+ 'site_url' : "https://solr.apache.org/guide",+ 'redirect_facility' : "httpd",+ 'source_url' : "https://github.com/apache/solr.git",+ 'source_branches' : ["jira/solr-15556-antora"],+ 'start_path' : 'solr/solr-ref-guide',+ 'supplemental_files' : "${project.ext.nodeProjectDir}/node_modules/@antora/lunr-extension/supplemental_ui",+ 'site_dir' : "./" + file(project.ext.playbooksDir).relativePath(file(project.ext.siteDir)),+ ]++ expand(props)+ inputs.properties(props)}-ext {- mainPage = "index"-- // the "MAJOR.MINOR" version of solr this guide is about (guides aren't specific to BUGFIX releases)- // So on 'branch_9_9' where 'version' may be 9.9.0, 9.9.1, 9.9.9, etc..; solrDocsVersion = 9.9- solrDocsVersion = "${version}".replaceAll(/^(\d+\.\d+)(|\..*)$/, "\$1")-- // the "MAJOR_MINOR" version as a path for publishing the guide- // So on 'branch_9_9' where solrDocsVersion = 9.9; solrGuideVersionPath => 9_9- solrGuideVersionPath = "${solrDocsVersion}".replaceAll(/^(\d+)\.(\d+)$/, "\$1_\$2")-- // these will be used to dynamically build up (nearly) identical tasks with consistent names- // for building & link checking the ref guide. One using absolute URLs to javadocs, the- // other using local paths that can be validated by the link checker.- htmlSiteDetails =- [name: 'Site',- path: 'html-site',- desc: 'HTML Site for publishing to the Solr website',- props: [- htmlSolrJavadocs: "https://solr.apache.org/docs/${solrGuideVersionPath}_0/",- htmlLuceneJavadocs: project(':solr:documentation').luceneDocUrl- ]- ]- linkCheckSiteDetails =- [name: 'LocalJavadocLinksSite',- path: 'local-jdoc-links-site',- desc: 'Local Site for checking javadoc links',-- // NOTE: extra '../' because we'll in a sub-dir of buildDir that will be built later...- props: [- htmlSolrJavadocs : 'link:../' + buildDir.toPath().relativize(project(':solr:documentation').docroot.toPath()).toString().replace(File.separator, '/'),- htmlLuceneJavadocs : 'link:../' + buildDir.toPath().relativize(project(':solr:documentation').luceneDocsDir.toPath()).toString().replace(File.separator, '/'),- ]-- // TODO: (see full discussion in SOLR-15265)- // Ref guide build should really depend on those javadocs it links to - then there would be no awkwardness and, ideally,- // you could just sync the resources you need into the final structure (that's why I declared javadocs as an artifact).- // This does entail some duplication (syncing between folders) but if it's reused in different places then it's fine.- ]+dependencies {+ localPlaybook files("${project.ext.playbooksDir}/${project.ext.localPlaybook}") {+ builtBy tasks.buildLocalAntoraPlaybookYaml+ }+ officialPlaybook files("${project.ext.playbooksDir}/${project.ext.officialPlaybook}") {+ builtBy tasks.buildOfficialAntoraPlaybookYaml+ }}-// dynamically define the 2 variations of each target that we need...-[ htmlSiteDetails, linkCheckSiteDetails ].each{ details ->- final def contentDir = file("${buildDir}/${details.path}-content")- final def htmlDir = file("${buildDir}/${details.path}")+/*+ Downloading Build Tools+ */- tasks.create("prepare${details.name}Sources", PrepareSources) {- // configure task properties.- srcDir.set(project.sourceSets.refGuide.resources.srcDirs.first())- outDir.set(contentDir)+// We use Node to install and run Antora+node {+ download = true+ version = "16.13.2" // LTS- // Set these dependency versions as lazy gstrings so that they're resolved after evaluation.- def dependencyProps = [- ["ivyCommonsCodec", "commons-codec", "commons-codec"],- ["ivyDropwizardMetrics", "io.dropwizard.metrics", "metrics-core"],- ["ivyHadoop", "org.apache.hadoop", "hadoop-auth"],- ["ivyLog4j", "org.apache.logging.log4j", "log4j-core"],- ["ivyOpennlpTools", "org.apache.opennlp", "opennlp-tools"],- ["ivyTika", "org.apache.tika", "tika-core"],- ["ivyZookeeper", "org.apache.zookeeper", "zookeeper"],- ].collectEntries { propKey, depGroup, depId -> [propKey, "${ -> project.getVersion(depGroup, depId) }"] }+ // The directory where Node.js is unpacked (when download is true)+ workDir = file("${project.ext.rootNodeDir}/nodejs")- props.putAll([- htmlOutDir: "../${details.path}",- javadocLink : "https://docs.oracle.com/en/java/javase/11/docs/api/java.base/",- solrGuideDraftStatus : propertyOrDefault('solrGuideDraft', "true").toBoolean() ? "DRAFT" : "",- solrRootPath : project(':solr').projectDir.toString() + File.separator,- solrDocsVersion : project.ext['solrDocsVersion'],- solrGuideVersionPath : project.ext['solrGuideVersionPath'],- solrFullVersion: project.version,- buildDate : rootProject.ext['buildDate'],- buildYear : rootProject.ext['buildYear'],- * : details.props,- * : dependencyProps- ])+ // The directory where npm is installed (when a specific version is defined)+ npmWorkDir = file("${project.ext.rootNodeDir}/npm")++ // The directory where yarn is installed (when a Yarn task is used)+ yarnWorkDir = file("${project.ext.rootNodeDir}/yarn")++ // The Node.js project directory location+ // This is where the package.json file and node_modules directory are located+ // By default it is at the root of the current project+ nodeProjectDir = project.ext.nodeProjectDir+}++task downloadAntoraCli(type: NpmTask) {+ group = 'Build Dependency Download'+ args = ["install", "@antora/cli@${project.ext.antoraVersion}"]++ inputs.property("Antora version", project.ext.antoraVersion)+ inputs.files("${project.ext.nodeProjectDir}/package.json")+ outputs.dir("${project.ext.nodeProjectDir}/node_modules/@antora/cli")+}++task downloadAntoraSiteGenerator(type: NpmTask) {+ group = 'Build Dependency Download'+ args = ["install", "@antora/site-generator-default@${project.ext.antoraVersion}"]++ inputs.property("Antora version", project.ext.antoraVersion)+ inputs.files("${project.ext.nodeProjectDir}/package.json")+ outputs.dir("${project.ext.nodeProjectDir}/node_modules/@antora/site-generator-default")+}++task downloadAntoraLunrExtension(type: NpmTask) {+ group = 'Build Dependency Download'+ args = ["install", "@antora/lunr-extension"]++ inputs.files("${project.ext.nodeProjectDir}/package.json")+ outputs.dir("${project.ext.nodeProjectDir}/node_modules/@antora/lunr-extension")+}++task downloadAsciidoctorMathjaxExtension(type: NpmTask) {+ group = 'Build Dependency Download'+ args = ["install", "@djencks/asciidoctor-mathjax"]++ inputs.files("${project.ext.nodeProjectDir}/package.json")+ outputs.dir("${project.ext.nodeProjectDir}/node_modules/@djencks/asciidoctor-mathjax")+}++task downloadAntora {+ group = 'Build Dependency Download'+ description "Download all Antora build dependencies for site generation."++ dependsOn tasks.downloadAntoraCli+ dependsOn tasks.downloadAntoraSiteGenerator+ dependsOn tasks.downloadAntoraLunrExtension+ dependsOn tasks.downloadAsciidoctorMathjaxExtension+}++task downloadLinkValidator(type: NpmTask) {+ group = 'Build Dependency Download'+ args = ["install", "link-checker"]++ inputs.files("${project.ext.nodeProjectDir}/package.json")+ outputs.dir("${project.ext.nodeProjectDir}/node_modules/link-checker")+}++task downloadDefaultUITemplate(type: NpmTask) {+ group = 'Build Dependency Download'+ args = ["install", "gitlab:antora/antora-ui-default", "--include=dev"]++ inputs.files("${project.ext.nodeProjectDir}/package.json")+ outputs.dir("${project.ext.nodeProjectDir}/node_modules/@antora/ui-default")+}++task startUIBuildDir(type: Copy) {+ group = 'Site - UI'+ dependsOn tasks.downloadDefaultUITemplate++ // Copy the antora latest default ui into the root folder, to mimick a new checkout of the default ui+ with {+ from "${project.ext.nodeProjectDir}/node_modules/@antora/ui-default"+ duplicatesStrategy = 'EXCLUDE'}- task "build${details.name}"(type: com.github.jrubygradle.JRubyExec) {- dependsOn "prepare${details.name}Sources"- group "Documentation"- description "Builds the ${details.desc}"+ // Overwrite the parts of the UI that we have changed.+ from("${projectDir}/ui-src") {+ into "src"+ }+ duplicatesStrategy = 'INCLUDE'++ into project.ext.uiBuildDir+}- outputs.cacheIf { true }- inputs.dir contentDir- outputs.dir htmlDir+task setupUIBuildDir(type: NpmTask) {+ group = 'Site - UI'+ dependsOn tasks.startUIBuildDir+ workingDir = file(project.ext.uiBuildDir)+ args = ["install"]- script 'jekyll'- scriptArgs 'build' //, '--verbose'- workingDir contentDir+ inputs.files("${project.ext.uiBuildDir}/package.json")+ outputs.dir("${project.ext.uiBuildDir}/node_modules/")+}++// Note that Gulp must be installed in the UI Build Directory, not our project node_modules+task downloadGulp(type: NpmTask) {+ group = 'Build Dependency Download'+ dependsOn tasks.startUIBuildDir++ args = ["install", "gulp-cli", "--legacy-peer-deps"]+ execOverrides {+ // The it variable contains the `ExecSpec`+ workingDir = project.ext.uiBuildDir}- task "check${details.name}"(type: JavaExec) {- dependsOn "build${details.name}"+ inputs.property("Antora version", project.ext.antoraVersion)+ inputs.files("${project.ext.uiBuildDir}/package.json")+ outputs.dir("${project.ext.uiBuildDir}/node_modules/")+}- classpath = sourceSets.main.runtimeClasspath- main = 'org.apache.solr.guide.CheckLinksAndAnchors'- workingDir = contentDir+/*+ Build and/or validate the Site+ */++task buildUIBundle(type: NpxTask) {+ group = 'Site - UI'+ description "Creates a local UI bundle using the 'ui-src' directory. This can be used to preview UI changes with a local or official ref-guide build."++ dependsOn tasks.setupUIBuildDir+ dependsOn tasks.downloadGulp- // NOTE: even for the 'real' site, we check all relative links- // (there will just be less of them, and this way any stray hardcoded- // '../../' paths can be caught more easily)- args([ htmlDir, "-check-all-relative-links" ])+ command = "gulp"++ args = [+ "bundle",+ ]+ execOverrides {+ // The it variable contains the `ExecSpec`+ workingDir = project.ext.uiBuildDir+ }++ doLast {+ copy {+ from "${project.ext.uiBuildDir}/build/ui-bundle.zip"+ into "${buildDir}/dist"+ }+ }++ inputs.files(fileTree("${project.ext.uiBuildDir}/src"))+ outputs.file("${buildDir}/dist/ui-bundle.zip")++ doLast {+ project.logger.lifecycle("The generated ui-bundle.zip can be found at:")+ project.logger.lifecycle("\t${buildDir}/dist/ui-bundle.zip")}}-// Hook in our dependency on all top level documentation in order to check local javadoc links-checkLocalJavadocLinksSite.dependsOn ':documentation'+task setupLocalSiteStagingDir(type: Sync) {+ group = 'Site - Local'+ description "Creates a staging directory to build the local ref-guide."-// Attach building the ref guide to standard convention tasks. This-// can be optionally turned off (see SOLR-15670).-if (propertyOrEnvOrDefault('refguide.include', 'SOLR_REF_GUIDE_INCLUDE', "true").toBoolean()) {- check.dependsOn checkLocalJavadocLinksSite, checkSite- assemble.dependsOn buildSite+ dependsOn tasks.buildLocalAntoraYaml+ dependsOn configurations.localPlaybook++ from(projectDir) {+ include "modules/**"+ }+ from project.ext.localAntoraYaml+ from(project.ext.playbooksDir) {+ include project.ext.localPlaybook+ rename {+ "playbook.yml"+ }+ }++ into project.ext.siteStagingDir}-@CacheableTask-abstract class PrepareSources extends DefaultTask {- // Original Source files we'll be syncing <b>FROM</b>- @InputDirectory- @PathSensitive(PathSensitivity.RELATIVE)- abstract DirectoryProperty getSrcDir()-- // Destination folder.- @OutputDirectory- abstract DirectoryProperty getOutDir()-- /**- * Task specific props (lazy provider)- */- @Input- abstract MapProperty<String, String> getProps()-- public PrepareSources() {- // setup 'dependsOn classes, configurations.depVer' here- // so that it's not necessary for every task impl to declare redundantly- final Project p = getProject()- dependsOn(p.getConfigurations().getByName('depVer'))- dependsOn(p.getTasksByName('classes', false))+task buildLocalSite(type: NpxTask) {+ group = 'Site - Local'+ description "Creates a local build of the ref-guide."++ dependsOn tasks.downloadAntora+ dependsOn tasks.setupLocalSiteStagingDir++ command = "antora"++ // Use a local build of the Lucene and Solr javadocs for a local refGuide+ def extraArgs = [+ // This attribute should not include ":link", the other 2 should+ // This attribute should also not be relative, because it is used in multiple path directories in the site+ "--attribute", "page-solr-javadocs=${project(':solr:documentation').docroot.toPath()}",+ "--attribute", "solr-javadocs=link:../../../${file(project.ext.siteDir).relativePath(project(':solr:documentation').docroot)}",+ "--attribute", "lucene-javadocs=link:../../../${file(project.ext.siteDir).relativePath(project(':solr:documentation').luceneDocsDir)}"+ ]++ if (buildLocalUI) {+ dependsOn tasks.buildUIBundle+ extraArgs.addAll([+ "--ui-bundle-url", "${buildDir}/dist/ui-bundle.zip"+ ])+ inputs.files("${buildDir}/dist/ui-bundle.zip")+ }++ args = [+ "${project.ext.siteStagingDir}/playbook.yml",+ "--fetch"+ ] + extraArgs++ environment = ["SITE_SEARCH_ENABLED": "true"]++ inputs.files(fileTree(project.ext.siteStagingDir))+ inputs.property("Antora version", project.ext.antoraVersion)+ outputs.dir(project.ext.siteDir)++ doLast {+ project.logger.lifecycle("The generated local ref-guide can be found at:")+ project.logger.lifecycle("\t${project.ext.siteDir}")+ }+}++task checkSiteLinks(type: NpxTask) {+ group = 'Verification'+ description "Check that all links in the ref-guide, both internal and java-docs, are correct."++ dependsOn tasks.downloadLinkValidator+ dependsOn tasks.buildLocalSite++ command = "link-checker"+ args = [+ "${buildDir}/site",+ "--url-ignore", "file:/",+ "--mkdocs",+ "--allow-hash-href",+ "--disable-external",+ "--debug",+ // Ignore the java docs url in the header, since it is an absolute path+ "--url-ignore", "${project(':solr:documentation').docroot.toPath()}/index\\.html",+ "--json",+ "-v",+ ]++ def outputFile = "${buildDir}/validation/link-check.json"+ execOverrides {+ // The it variable contains the `ExecSpec`+ it.standardOutput = new TeeOutputStream(it.standardOutput, new FileOutputStream(outputFile))}- @TaskAction- public void doCopy() {- final Project p = getProject();-- // Make a local copy we'll be modifying.- final def props = this.props.get()-- final File intoDir = this.outDir.asFile.get();-- // Emit info about properties for clarity.- logger.lifecycle('Syncing source files to {} using props:\n{}',- intoDir, props.collect({ k, v -> " ${k} -> ${v}" }).join('\n'))-- // Escape all the properties, so they can be inserted into YAML templates.- final def escapedProps = props.collectEntries{k, v -> [k, v.replace("'","''")]}-- def sourceDir = srcDir.get()-- final WorkResult syncResult = p.sync({ copySpec ->- copySpec.setFilteringCharset('UTF-8');- copySpec.from(sourceDir, { raw ->- raw.exclude('**/*.template')- })-- copySpec.from(sourceDir, { templated ->- templated.include('**/*.template')- templated.rename('(.+)\\.template', '$1')- templated.expand(escapedProps)- })- copySpec.into(intoDir);- })-- setDidWork(syncResult.getDidWork());- if (syncResult.getDidWork()) {- // if sync did work, that means we need to rebuild the nav data files...- p.javaexec({ execSpec ->- execSpec.setClasspath( getProject().getConvention()- .getPlugin(JavaPluginConvention.class)- .getSourceSets().getByName("main").getRuntimeClasspath() )- execSpec.setWorkingDir( intoDir )- execSpec.setMain( 'org.apache.solr.guide.BuildNavDataFiles' )- execSpec.args([ intoDir, p.property('mainPage') ])- })+ inputs.files(fileTree(siteDir))+ outputs.file(outputFile)+}++/*+ Build and setup the official Site+ */+task setOfficialAntoraYaml {+ group = 'Site - Official'+ description "Setups the local antora.yml as the official antora.yml for this branch. Note: This will change the antora.yml in the repo, not a build folder."++ dependsOn tasks.buildLocalAntoraYaml++ inputs.file(project.ext.localAntoraYaml)+ outputs.file("antora.yml")++ doLast {+ copy {+ from project.ext.localAntoraYaml+ into projectDir}}}++task buildOfficialSite(type: NpxTask) {+ group = 'Site - Official'+ description "Creates a build of the official ref-guide. This will not include local changes."++ dependsOn tasks.downloadAntora+ dependsOn configurations.officialPlaybook++ command = "antora"++ def officialPlaybook = "${project.ext.playbooksDir}/${project.ext.officialPlaybook}"+ def extraArgs = []++ if (buildLocalUI) {+ dependsOn tasks.buildUIBundle+ extraArgs.addAll([+ "--ui-bundle-url", "${buildDir}/dist/ui-bundle.zip"+ ])+ inputs.files("${buildDir}/dist/ui-bundle.zip")+ }++ args = [+ officialPlaybook,+ ] + extraArgs++ environment = ["SITE_SEARCH_ENABLED": "true"]++ inputs.files(officialPlaybook)+ inputs.property("Antora version", project.ext.antoraVersion)+ outputs.dir(project.ext.siteDir)++ doLast {+ project.logger.lifecycle("The generated official ref-guide can be found at:")+ project.logger.lifecycle("\t${project.ext.siteDir}")+ }+}diff --git a/solr/solr-ref-guide/src/images/Solr_Logo_on_white.png b/solr/solr-ref-guide/modules/ROOT/images/Solr_Logo_on_white.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/Solr_Logo_on_white.pngrename to solr/solr-ref-guide/modules/ROOT/images/Solr_Logo_on_white.pngdiff --git a/solr/solr-ref-guide/src/images/diagrams/splitshard-seq.png b/solr/solr-ref-guide/modules/ROOT/images/diagrams/splitshard-seq.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/diagrams/splitshard-seq.pngrename to solr/solr-ref-guide/modules/ROOT/images/diagrams/splitshard-seq.pngdiff --git a/solr/solr-ref-guide/src/images/diagrams/splitshard-seq.puml b/solr/solr-ref-guide/modules/ROOT/images/diagrams/splitshard-seq.pumlsimilarity index 100%rename from solr/solr-ref-guide/src/images/diagrams/splitshard-seq.pumlrename to solr/solr-ref-guide/modules/ROOT/images/diagrams/splitshard-seq.pumldiff --git a/solr/solr-ref-guide/src/images/draft-background.png b/solr/solr-ref-guide/modules/ROOT/images/draft-background.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/draft-background.pngrename to solr/solr-ref-guide/modules/ROOT/images/draft-background.pngdiff --git a/solr/solr-ref-guide/src/images/icons/bullet_blue.gif b/solr/solr-ref-guide/modules/ROOT/images/icons/bullet_blue.gifsimilarity index 100%rename from solr/solr-ref-guide/src/images/icons/bullet_blue.gifrename to solr/solr-ref-guide/modules/ROOT/images/icons/bullet_blue.gifdiff --git a/solr/solr-ref-guide/src/images/icons/contenttypes/home_page_16.png b/solr/solr-ref-guide/modules/ROOT/images/icons/contenttypes/home_page_16.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/icons/contenttypes/home_page_16.pngrename to solr/solr-ref-guide/modules/ROOT/images/icons/contenttypes/home_page_16.pngdiff --git a/solr/solr-ref-guide/src/images/icons/emoticons/warning.png b/solr/solr-ref-guide/modules/ROOT/images/icons/emoticons/warning.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/icons/emoticons/warning.pngrename to solr/solr-ref-guide/modules/ROOT/images/icons/emoticons/warning.pngdiff --git a/solr/solr-ref-guide/src/images/icons/favicon.ico b/solr/solr-ref-guide/modules/ROOT/images/icons/favicon.icosimilarity index 100%rename from solr/solr-ref-guide/src/images/icons/favicon.icorename to solr/solr-ref-guide/modules/ROOT/images/icons/favicon.icodiff --git a/solr/solr-ref-guide/src/images/solr-sunOnly-small.png b/solr/solr-ref-guide/modules/ROOT/images/solr-sunOnly-small.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/solr-sunOnly-small.pngrename to solr/solr-ref-guide/modules/ROOT/images/solr-sunOnly-small.pngdiff --git a/solr/solr-ref-guide/src/index.adoc b/solr/solr-ref-guide/modules/ROOT/pages/index.adocsimilarity index 59%rename from solr/solr-ref-guide/src/index.adocrename to solr/solr-ref-guide/modules/ROOT/pages/index.adocindex 010cdda289f..373a39bd97f 100644--- a/solr/solr-ref-guide/src/index.adoc+++ b/solr/solr-ref-guide/modules/ROOT/pages/index.adoc@@ -1,13 +1,5 @@= Apache Solr Reference Guide-:page-children: getting-started, \- deployment-guide, \- configuration-guide, \- schema-indexing-guide, \- query-guide, \- solr-upgrade-notes-:page-notitle::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// distributed with this work for additional information@@ -28,23 +20,20 @@// This jumbotron is in a sidebar-style block instead of an open block because// an open block uses a different template that we rely on for other uses.// See also src/_templates/open.html.slim for the open block template.-[.jumbotron]+.Welcome to Apache Solr(TM)****-[.lead-homepage]-Welcome to Apache Solr(TM), the open source solution for search and analytics.+Solr is the open source solution for search and analytics.-Solr is the fast open source search platform built on Apache Lucene(TM) that provides scalable indexing and search, as well as faceting, hit highlighting and advanced analysis/tokenization capabilities.-Solr and Lucene are managed by the http://www.apache.org/[Apache Software Foundation].+A fast open source search platform built on Apache Lucene(TM), Solr provides scalable indexing and search, as well as faceting, hit highlighting and advanced analysis/tokenization capabilities.+Solr is managed by the http://www.apache.org/[Apache Software Foundation].-This Reference Guide is the official Solr documentation, written and published by Lucene/Solr committers.+This Reference Guide is the official Solr documentation, written and published by Solr committers.****-The Guide includes the following sections:-****-[.home-table,cols="1,1,1",frame=none,grid=none,stripes=none]+[cols="1,1,1",frame=none,grid=none,stripes=none]|===-^| <<getting-started.adoc#,Getting Started>> ^| <<deployment-guide.adoc#,Deployment Guide>> ^| <<configuration-guide.adoc#,Configuration Guide>>+^| xref:getting-started:introduction.adoc[Getting Started] ^| xref:deployment-guide:solr-control-script-reference.adoc[Deployment Guide] ^| xref:configuration-guide:configuration-files.adoc[Configuration Guide]| Introductory concepts and tutorials. | Installation, monitoring, scaling, and deploying to production. | Tuning Solr's configuration files for your use case.@@ -52,7 +41,7 @@ The Guide includes the following sections:[.home-table,cols="1,1,1",frame=none,grid=none,stripes=none]|===-^| <<schema-indexing-guide.adoc#,Schema & Indexing Guide>> ^| <<query-guide.adoc#,Query Guide>> ^| <<solr-upgrade-notes.adoc#,Solr Upgrade Notes>>+^| xref:indexing-guide:schema-elements.adoc[Indexing Guide] ^| xref:query-guide:common-query-parameters.adoc[Query Guide] ^| xref:upgrade-notes:solr-upgrade-notes.adoc[Upgrade Notes]| Configuring Solr's schema and indexing documents. | All aspects of Solr queries. | Change notes for Solr releases.diff --git a/solr/solr-ref-guide/modules/configuration-guide/config-nav.adoc b/solr/solr-ref-guide/modules/configuration-guide/config-nav.adocnew file mode 100644index 00000000000..2c4e942f6b0--- /dev/null+++ b/solr/solr-ref-guide/modules/configuration-guide/config-nav.adoc@@ -0,0 +1,40 @@+.Configuration Guide++* xref:configuration-files.adoc[]+* xref:property-substitution.adoc[]+* xref:core-discovery.adoc[]+* xref:configuring-solr-xml.adoc[]++* xref:configuring-solrconfig-xml.adoc[]+** xref:index-location-format.adoc[]+** xref:index-segments-merging.adoc[]+** xref:schema-factory.adoc[]+** xref:commits-transaction-logs.adoc[]+** xref:caches-warming.adoc[]+** xref:requesthandlers-searchcomponents.adoc[]+** xref:implicit-requesthandlers.adoc[]+** xref:realtime-get.adoc[]+** xref:initparams.adoc[]+** xref:requestdispatcher.adoc[]+** xref:update-request-processors.adoc[]+** xref:script-update-processor.adoc[]+** xref:codec-factory.adoc[]++* Configuration APIs+** xref:config-api.adoc[]+** xref:request-parameters-api.adoc[]+** xref:managed-resources.adoc[]+** xref:collections-api.adoc[]+** xref:configsets-api.adoc[]+** xref:coreadmin-api.adoc[]+** xref:v2-api.adoc[]++* xref:config-sets.adoc[]+* xref:resource-loading.adoc[]+* xref:solr-plugins.adoc[]+** xref:libs.adoc[]+** xref:solr-modules.adoc[]+** xref:package-manager.adoc[]+*** xref:package-manager-internals.adoc[]+** xref:cluster-plugins.adoc[]+** xref:replica-placement-plugins.adoc[]diff --git a/solr/solr-ref-guide/src/images/configuration-files/files-screen.png b/solr/solr-ref-guide/modules/configuration-guide/images/configuration-files/files-screen.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/configuration-files/files-screen.pngrename to solr/solr-ref-guide/modules/configuration-guide/images/configuration-files/files-screen.pngdiff --git a/solr/solr-ref-guide/src/images/index-segments-merging/segments_info.png b/solr/solr-ref-guide/modules/configuration-guide/images/index-segments-merging/segments_info.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/index-segments-merging/segments_info.pngrename to solr/solr-ref-guide/modules/configuration-guide/images/index-segments-merging/segments_info.pngdiff --git a/solr/solr-ref-guide/src/caches-warming.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/caches-warming.adocsimilarity index 88%rename from solr/solr-ref-guide/src/caches-warming.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/caches-warming.adocindex 0948b66ad39..23197c78879 100644--- a/solr/solr-ref-guide/src/caches-warming.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/caches-warming.adoc@@ -19,7 +19,7 @@Solr's caches provide an essential way to improve query performance.Caches can store documents, filters used in queries, and results from previous queries.-Caches are cleared after a <<commits-transaction-logs.adoc#commits,commit>> and usually need to be re-populated before their benefit can be seen again.+Caches are cleared after a xref:commits-transaction-logs.adoc#commits[commit] and usually need to be re-populated before their benefit can be seen again.To counteract this, caches can be "warmed" before a new searcher is considered opened by automatically populating the new cache with values from the old cache.Cache management is critical to a successful Solr implementation, so it should be noted that caches will need to be fine-tuned as your application grows.@@ -61,7 +61,7 @@ Generally this cache usually offers lower memory footprint, higher hit ratio, an`CaffeineCache` uses an auto-warm count that supports both integers and percentages which get evaluated relative to the current size of the cache when warming happens.-The <<plugins-stats-screen.adoc#,Plugins/Stats>> page in the Solr Admin UI will display information about the performance of all the active caches.+The xref:deployment-guide:plugins-stats-screen.adoc[] in the Solr Admin UI will display information about the performance of all the active caches.This information can help you fine-tune the sizes of the various caches appropriately for your particular application.When a Searcher terminates, a summary of its cache usage is also written to the log.@@ -86,7 +86,7 @@ The async cache provides most significant improvement with many concurrent queriHowever, the async cache will not prevent data races for time-limited queries, since those are expected to provide partial results.All caches can be disabled using the parameter `enabled` with a value of `false`.-Caches can also be disabled on a query-by-query basis with the `cache` parameter, as described in the section <<common-query-parameters.adoc#cache-local-parameter,cache Local Parameter>>.+Caches can also be disabled on a query-by-query basis with the `cache` parameter, as described in the section xref:query-guide:common-query-parameters.adoc#cache-local-parameter[cache Local Parameter].Details of each cache are described below.@@ -97,13 +97,13 @@ Unless such a set is trivially small, the set implementation is a bitset.The most typical way Solr uses the `filterCache` is to cache results of each `fq` search parameter, though there are some other cases as well.Subsequent queries using the same parameter filter query result in cache hits and rapid returns of results.-See <<common-query-parameters.adoc#fq-filter-query-parameter,fq (Filter Query) Parameter>> for a detailed discussion of `fq`.-Use of this cache can be disabled for a `fq` using the <<common-query-parameters.adoc#cache-local-parameter,`cache` local parameter>>.+See xref:query-guide:common-query-parameters.adoc#fq-filter-query-parameter[fq (Filter Query) Parameter] for a detailed discussion of `fq`.+Use of this cache can be disabled for a `fq` using the xref:query-guide:common-query-parameters.adoc#cache-local-parameter[`cache` local parameter].Another Solr feature using this cache is the `filter(...)` syntax in the default Lucene query parser.Solr also uses this cache for faceting when the configuration parameter `facet.method` is set to `fc`.-For a discussion of faceting parameters, see <<faceting.adoc#field-value-faceting-parameters,Field-Value Faceting Parameters>>.+For a discussion of faceting parameters, see xref:query-guide:faceting.adoc#field-value-faceting-parameters[Field-Value Faceting Parameters].[source,xml]----@@ -144,7 +144,7 @@ This lets you specify the maximum heap size, in megabytes, used by the contentsWhen the cache grows beyond this size, oldest accessed queries will be evicted until the heap usage of the cache decreases below the specified limit.If a `size` is specified in addition to `maxRamMB` then only the heap usage limit is respected.-Use of this cache can be disabled on a query-by-query basis in `q` using the <<common-query-parameters.adoc#cache-local-parameter,cache local parameter>>.+Use of this cache can be disabled on a query-by-query basis in `q` using the xref:query-guide:common-query-parameters.adoc#cache-local-parameter[`cache` local parameter].[source,xml]----@@ -190,8 +190,8 @@ Define it with the `regenerator` parameter as `regenerator="solr.NoOpRegenerator=== Monitoring Cache Sizes and Usage-The section <<performance-statistics-reference.adoc#cache-statistics,Cache Statistics>> describes the metrics available for each cache.-The metrics can be accessed in the <<plugins-stats-screen.adoc#,Solr Admin UI>> or in the <<metrics-reporting.adoc#metrics-api,Metrics API>>.+The section xref:deployment-guide:performance-statistics-reference.adoc#cache-statistics[Cache Statistics] describes the metrics available for each cache.+The metrics can be accessed in the xref:deployment-guide:plugins-stats-screen.adoc[] or with the xref:deployment-guide:metrics-reporting.adoc#metrics-api[Metrics API].The most important metrics to review when assessing caches are the size and the hit ratio.@@ -223,10 +223,10 @@ Sets the maximum number of clauses allowed when parsing a boolean query string.This limit only impacts boolean queries specified by a user as part of a query string, and provides per-collection controls on how complex user specified boolean queries can be.Query strings that specify more clauses than this will result in an error.-If this per-collection limit is greater than the <<configuring-solr-xml#global-maxbooleanclauses,global `maxBooleanClauses` limit>> specified in `solr.xml`, it will have no effect, as that setting also limits the size of user specified boolean queries.+If this per-collection limit is greater than the xref:configuring-solr-xml.adoc#global-maxbooleanclauses[global `maxBooleanClauses` limit] specified in `solr.xml`, it will have no effect, as that setting also limits the size of user specified boolean queries.In default configurations this property uses the value of the `solr.max.booleanClauses` system property if specified.-This is the same system property used in the <<configuring-solr-xml#global-maxbooleanclauses,global `maxBooleanClauses` setting>> in the default `solr.xml` making it easy for Solr administrators to increase both values (in all collections) without needing to search through and update the `solrconfig.xml` files in each collection.+This is the same system property used in the xref:configuring-solr-xml#global-maxbooleanclauses[global `maxBooleanClauses` setting] in the default `solr.xml` making it easy for Solr administrators to increase both values (in all collections) without needing to search through and update the `solrconfig.xml` files in each collection.[source,xml]----@@ -313,7 +313,7 @@ There are two types of events that can trigger a listener.. A `firstSearcher` event occurs when a new searcher is being prepared but there is no current registered searcher to handle requests or to gain auto-warming data from (i.e., on Solr startup).. A `newSearcher` event is fired whenever a new searcher is being prepared, such as after a commit, and there is a current searcher handling requests.-The (commented out) examples below can be found in the `solrconfig.xml` file of the `sample_techproducts_configs` <<config-sets.adoc#,configset>> included with Solr, and demonstrate using the `solr.QuerySenderListener` class to warm a set of explicit queries:+The (commented out) examples below can be found in the `solrconfig.xml` file of the `sample_techproducts_configs` xref:config-sets.adoc[configset] included with Solr, and demonstrate using the `solr.QuerySenderListener` class to warm a set of explicit queries:[source,xml]----diff --git a/solr/solr-ref-guide/src/cluster-plugins.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/cluster-plugins.adocsimilarity index 100%rename from solr/solr-ref-guide/src/cluster-plugins.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/cluster-plugins.adocdiff --git a/solr/solr-ref-guide/src/codec-factory.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/codec-factory.adocsimilarity index 92%rename from solr/solr-ref-guide/src/codec-factory.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/codec-factory.adocindex 590f73e1996..c16b59b1b54 100644--- a/solr/solr-ref-guide/src/codec-factory.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/codec-factory.adoc@@ -27,7 +27,7 @@ There are two alternatives to Lucene's default codec.The {solr-javadocs}/core/org/apache/solr/core/SchemaCodecFactory.html[`solr.SchemaCodecFactory`] supports 2 key features:-* Schema based per-fieldtype configuration for `docValuesFormat` and `postingsFormat` - see the <<field-type-definitions-and-properties.adoc#field-type-properties,Field Type Properties>> section for more details.+* Schema based per-fieldtype configuration for `docValuesFormat` and `postingsFormat` - see the xref:indexing-guide:field-type-definitions-and-properties.adoc#field-type-properties[Field Type Properties] section for more details.* A `compressionMode` option:** `BEST_SPEED` (default) is optimized for search speed performance** `BEST_COMPRESSION` is optimized for disk space usagediff --git a/solr/solr-ref-guide/src/collections-api.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/collections-api.adocsimilarity index 89%rename from solr/solr-ref-guide/src/collections-api.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/collections-api.adocindex 93a1e464864..59955461b91 100644--- a/solr/solr-ref-guide/src/collections-api.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/collections-api.adoc@@ -22,15 +22,15 @@ The Collections API is provided to allow you to control your cluster, includingBecause this API has a large number of commands and options, we've grouped the commands into the following sub-sections:-*<<cluster-node-management.adoc#,Cluster and Node Management>>*: Define properties for the entire cluster; check the status of a cluster; remove replicas from a node; utilize a newly added node; add or remove roles for a node.+*xref:deployment-guide:cluster-node-management.adoc[]*: Define properties for the entire cluster; check the status of a cluster; remove replicas from a node; utilize a newly added node; add or remove roles for a node.-*<<collection-management.adoc#,Collection Management>>*: Create, list, reload and delete collections; set collection properties; migrate documents to another collection; rebalance leaders; backup and restore collections.+*xref:deployment-guide:collection-management.adoc[]*: Create, list, reload and delete collections; set collection properties; migrate documents to another collection; rebalance leaders; backup and restore collections.-*<<alias-management.adoc#,Alias Management>>*: Create, list or delete collection aliases; set alias properties.+*xref:deployment-guide:alias-management.adoc[]*: Create, list or delete collection aliases; set alias properties.-*<<shard-management.adoc#,Shard Management>>*: Create and delete a shard; split a shard into two or more additional shards; force a shard leader.+*xref:deployment-guide:shard-management.adoc[]*: Create and delete a shard; split a shard into two or more additional shards; force a shard leader.-*<<replica-management.adoc#,Replica Management>>*: Add or delete a replica; set replica properties; move a replica to a different node.+*xref:deployment-guide:replica-management.adoc[]*: Add or delete a replica; set replica properties; move a replica to a different node.== Asynchronous Callsdiff --git a/solr/solr-ref-guide/src/commits-transaction-logs.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/commits-transaction-logs.adocsimilarity index 95%rename from solr/solr-ref-guide/src/commits-transaction-logs.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/commits-transaction-logs.adocindex 91b3bc4cf6c..da25bfc28dc 100644--- a/solr/solr-ref-guide/src/commits-transaction-logs.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/commits-transaction-logs.adoc@@ -37,7 +37,7 @@ The `_default` configset included with Solr has this section defined already, bu</config>-----Note that `<updateHandler>` configurations do not affect the higher level configuration of <<requesthandlers-searchcomponents.adoc#,request handlers>> that process client update requests.+Note that `<updateHandler>` configurations do not affect the higher level configuration of xref:requesthandlers-searchcomponents.adoc[request handlers] that process client update requests.== Commits@@ -69,9 +69,9 @@ When a client includes a `commit=true` parameter with an update request, this enIf an additional parameter `softCommit=true` is specified, then Solr performs a soft commit.This is an implementation of Near Real Time storage, a feature that boosts document visibility, since you don't have to wait for background merges and storage (to ZooKeeper, if using SolrCloud) to finish before moving on to something else.-Details about using explicit commit requests during indexing are in the section <<indexing-with-update-handlers.adoc#,Indexing with Update Handlers>>.+Details about using explicit commit requests during indexing are in the section xref:indexing-guide:indexing-with-update-handlers.adoc[Indexing with Update Handlers].-For more information about Near Real Time operations, see <<solrcloud-distributed-requests.adoc#near-real-time-nrt-use-cases,Near Real Time Use Cases>>.+For more information about Near Real Time operations, see xref:deployment-guide:solrcloud-distributed-requests.adoc#near-real-time-nrt-use-cases[Near Real Time Use Cases].=== Automatic Commits@@ -186,7 +186,7 @@ TIP: For extremely high bulk indexing, especially for the initial load if thereAn alternative to `autoCommit` is to use `commitWithin`, which can be defined when making the update request to Solr (i.e., when pushing documents), or in an update request handler.The `commitWithin` settings allow forcing document commits to happen in a defined time period.-This is used most frequently with <<solrcloud-distributed-requests.adoc#near-real-time-nrt-use-cases,Near Real Time use cases>>, and for that reason the default is to perform a soft commit.+This is used most frequently with xref:deployment-guide:solrcloud-distributed-requests.adoc#near-real-time-nrt-use-cases[Near Real Time use cases], and for that reason the default is to perform a soft commit.This does not, however, replicate new documents to follower servers in a user-managed cluster.If that's a requirement for your implementation, you can force a hard commit by adding a parameter, as in this example:@@ -221,7 +221,7 @@ Therefore it is important that hard commits be enabled when indexing.=== Transaction Log Configuration-Transaction logs are required for all SolrCloud clusters, as well as the <<realtime-get.adoc#,RealTime Get>> feature.+Transaction logs are required for all SolrCloud clusters, as well as the xref:realtime-get.adoc[] feature.It is configured in the `updateHandler` section of `solrconfig.xml`.Transaction logs are configured in `solrconfig.xml`, in a section like the following:diff --git a/solr/solr-ref-guide/src/config-api.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/config-api.adocsimilarity index 96%rename from solr/solr-ref-guide/src/config-api.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/config-api.adocindex cf5e812c5db..c9e2f90f47e 100644--- a/solr/solr-ref-guide/src/config-api.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/config-api.adoc@@ -33,7 +33,7 @@ All Config API endpoints are collection-specific, meaning this API can inspect oUse GET to retrieve and POST for executing commands.* `_collection_/config/overlay`: retrieve the details in the `configoverlay.json` only, removing any options defined in `solrconfig.xml` directly or implicitly through defaults.* `_collection_/config/params`: create parameter sets that can override or take the place of parameters defined in `solrconfig.xml`.-See <<request-parameters-api.adoc#,Request Parameters API>> for more information about this endpoint.+See xref:request-parameters-api.adoc[] for more information about this endpoint.== Retrieving the Config@@ -92,7 +92,7 @@ http://localhost:8983/api/collections/techproducts/config/requestHandler====---The output will be details of each request handler defined in `solrconfig.xml`, <<implicit-requesthandlers.adoc#,defined implicitly>> by Solr, and defined with this Config API stored in `configoverlay.json`.+The output will be details of each request handler defined in `solrconfig.xml`, xref:implicit-requesthandlers.adoc[defined implicitly] by Solr, and defined with this Config API stored in `configoverlay.json`.To see the configuration for implicit request handlers, add `expandParams=true` to the request.See the documentation for implicit request handlers linked above for examples using this command.@@ -169,7 +169,7 @@ The names of these properties are derived from their XML paths as found in `solr*Update Handler Settings*-See <<commits-transaction-logs.adoc#,Commits and Transaction Logs>> for defaults and acceptable values for these settings.+See xref:commits-transaction-logs.adoc[] for defaults and acceptable values for these settings.* `updateHandler.autoCommit.maxDocs`* `updateHandler.autoCommit.maxTime`@@ -180,7 +180,7 @@ See <<commits-transaction-logs.adoc#,Commits and Transaction Logs>> for defaults*Query Settings*-See <<caches-warming.adoc#,Caches and Query Warming>> for defaults and acceptable values for these settings.+See xref:caches-warming.adoc[] for defaults and acceptable values for these settings._Caches and Cache Sizes_@@ -217,14 +217,14 @@ _Query Sizing and Warming__Query Circuit Breakers_-See <<circuit-breakers.adoc#,Circuit Breakers in Solr>> for more details+See xref:deployment-guide:circuit-breakers.adoc[] for more details* `query.useCircuitBreakers`* `query.memoryCircuitBreakerThresholdPct`*RequestDispatcher Settings*-See <<requestdispatcher.adoc#,RequestDispatcher>> for defaults and acceptable values for these settings.+See xref:requestdispatcher.adoc[] for defaults and acceptable values for these settings.* `requestDispatcher.handleSelect`* `requestDispatcher.requestParsers.enableRemoteStreaming`@@ -587,7 +587,7 @@ If the property has already been set, this command will overwrite the previous sThe structure of the request is similar to the structure of requests using other commands, in the format of `"command":{"variable_name": "property_value"}`.You can add more than one variable at a time if necessary.-For more information about user-defined properties, see the section <<property-substitution.adoc#user-defined-properties-in-core-properties,User defined properties in core.properties>>.+For more information about user-defined properties, see the section xref:property-substitution.adoc#user-defined-properties-in-core-properties[User defined properties in core.properties].See also the section <<Creating and Updating User-Defined Properties>> below for examples of how to use this type of command.@@ -888,7 +888,7 @@ Every write operation performed through the API would 'touch' the directory andEvery core would check if the schema file, `solrconfig.xml`, or `configoverlay.json` has been modified by comparing the `znode` versions.If any have been modified, the core is reloaded.-If `params.json` is modified, the params object is just updated without a core reload (see <<request-parameters-api.adoc#,Request Parameters API>> for more information about `params.json`).+If `params.json` is modified, the params object is just updated without a core reload (see xref:request-parameters-api.adoc[] for more information about `params.json`).=== Empty Commanddiff --git a/solr/solr-ref-guide/src/config-sets.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/config-sets.adocsimilarity index 81%rename from solr/solr-ref-guide/src/config-sets.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/config-sets.adocindex ea736f97f4c..782aeab1e61 100644--- a/solr/solr-ref-guide/src/config-sets.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/config-sets.adoc@@ -16,7 +16,7 @@// specific language governing permissions and limitations// under the License.-Configsets are a set of configuration files used in a Solr installation: `solrconfig.xml`, the schema, and then <<resource-loading.adoc#,resources>> like language files, `synonyms.txt`, and others.+Configsets are a set of configuration files used in a Solr installation: `solrconfig.xml`, the schema, and xref:resource-loading.adoc[resources] like language files, `synonyms.txt`, and others.Such configuration, _configsets_, can be named and then referenced by collections or cores, allowing you to share them to avoid duplication.@@ -50,7 +50,7 @@ The structure should look something like this:----The default base directory is `$SOLR_HOME/configsets`.-This path can be configured with the `configSetBaseDir` parameter in `solr.xml` (see <<configuring-solr-xml.adoc#,Format of solr.xml>> for details).+This path can be configured with the `configSetBaseDir` parameter in `solr.xml` (see xref:configuring-solr-xml.adoc[] for details).To create a new core using a configset, pass `configSet` as one of the core properties.For example, if you do this via the CoreAdmin API:@@ -93,10 +93,10 @@ This and a couple of example configsets remain on the file system but Solr doesWhen you create a collection in SolrCloud, you can specify a named configset.If you don't, then the `_default` will be copied and given a unique name for use by the new collection.-A configset can be uploaded to ZooKeeper either via the <<configsets-api.adoc#,Configsets API>> or more directly via <<solr-control-script-reference.adoc#upload-a-configuration-set,`bin/solr zk upconfig`>>.+A configset can be uploaded to ZooKeeper either via the xref:configsets-api.adoc[] or more directly via xref:deployment-guide:solr-control-script-reference.adoc#upload-a-configuration-set[`bin/solr zk upconfig`].The Configsets API has some other operations as well, and likewise, so does the CLI.-To upload a file to a configset already stored on ZooKeeper, you can use <<solr-control-script-reference.adoc#copy-between-local-files-and-zookeeper-znodes,`bin/solr zk cp`>>.+To upload a file to a configset already stored on ZooKeeper, you can use xref:deployment-guide:solr-control-script-reference.adoc#copy-between-local-files-and-zookeeper-znodes[`bin/solr zk cp`].CAUTION: By default, ZooKeeper's file size limit is 1MB.-If your files are larger than this, you'll need to either <<zookeeper-ensemble.adoc#increasing-the-file-size-limit,increase the ZooKeeper file size limit>> or store them <<libs.adoc#lib-directives-in-solrconfig,on the filesystem>>.+If your files are larger than this, you'll need to either xref:deployment-guide:zookeeper-ensemble.adoc#increasing-the-file-size-limit[increase the ZooKeeper file size limit] or store them xref:libs.adoc#lib-directives-in-solrconfig[on the filesystem] of every node in a cluster.diff --git a/solr/solr-ref-guide/src/configsets-api.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/configsets-api.adocsimilarity index 98%rename from solr/solr-ref-guide/src/configsets-api.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/configsets-api.adocindex 87421a4c8f4..6b8d78be67c 100644--- a/solr/solr-ref-guide/src/configsets-api.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/configsets-api.adoc@@ -25,13 +25,13 @@ Using the same concept, you can create your own configsets and make them availabThis API provides a way to upload configuration files to ZooKeeper and share the same set of configuration files between two or more collections.-Once a configset has been uploaded to ZooKeeper, use the configset name when creating the collection with the <<collections-api.adoc#,Collections API>> and the collection will use your configuration files.+Once a configset has been uploaded to ZooKeeper, use the configset name when creating the collection with the xref:collections-api.adoc[] and the collection will use your configuration files.Configsets do not have to be shared between collections if they are uploaded with this API, but this API makes it easier to do so if you wish.An alternative to uploading your configsets in advance would be to put the configuration files into a directory under `server/solr/configsets` and using the directory name as the `-d` parameter when using `bin/solr create` to create a collection.NOTE: This API can only be used with Solr running in SolrCloud mode.-If you are not running Solr in SolrCloud mode but would still like to use shared configurations, please see the section <<config-sets.adoc#,Configsets>>.+If you are not running Solr in SolrCloud mode but would still like to use shared configurations, please see the section xref:config-sets.adoc[].The API works by passing commands to the `configs` endpoint.The path to the endpoint varies depending on the API being used: the v1 API uses `solr/admin/configs`, while the v2 API uses `api/cluster/configs`.diff --git a/solr/solr-ref-guide/src/configuration-files.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/configuration-files.adocsimilarity index 85%rename from solr/solr-ref-guide/src/configuration-files.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/configuration-files.adocindex 2c54c0634b5..9cb7be6e7e8 100644--- a/solr/solr-ref-guide/src/configuration-files.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/configuration-files.adoc@@ -69,18 +69,18 @@ You may see other files, but the main ones you need to know are discussed below.Inside Solr's Home, you'll find these files:* `solr.xml` specifies configuration options for your Solr server instance.-For more information on `solr.xml` see <<configuring-solr-xml.adoc#,Configuring solr.xml>>.+For more information on `solr.xml` see xref:configuring-solr-xml.adoc[].* Per Solr Core:** `core.properties` defines specific properties for each core such as its name, the collection the core belongs to, the location of the schema, and other parameters.-For more details on `core.properties`, see the section <<core-discovery.adoc#,Core Discovery>>.+For more details on `core.properties`, see the section xref:core-discovery.adoc[].** `solrconfig.xml` controls high-level behavior.You can, for example, specify an alternate location for the data directory.-For more information on `solrconfig.xml`, see <<configuring-solrconfig-xml.adoc#,Configuring solrconfig.xml>>.+For more information on `solrconfig.xml`, see xref:configuring-solrconfig-xml.adoc[].** `managed-schema.xml` or `schema.xml` describes the documents you will ask Solr to index.The schema defines a document as a collection of fields.You can define both the field types and the fields themselves.Field type definitions are powerful and include information about how Solr processes incoming field values and query values.-For more information on Solr schemas, see <<solr-schema.adoc#,Solr Schema>>.+For more information on Solr schemas, see xref:indexing-guide:schema-elements.adoc[].** `data/` contains index files.Note that the SolrCloud example does not include a `conf` directory for each Solr Core (so there is no `solrconfig.xml` or schema file).@@ -94,14 +94,14 @@ However, if you are running your own ZooKeeper ensemble, you would supply your oThe Files screen in the Admin UI lets you browse & view configuration files (such `solrconfig.xml` and the schema file) for the collection you selected..The Files Screen-image::images/configuration-files/files-screen.png[Files screen,height=400]+image::configuration-files/files-screen.png[Files screen,height=400]-If you are using <<cluster-types.adoc#solrcloud-mode,SolrCloud>>, the files displayed are the configuration files for this collection stored in ZooKeeper.+If you are using xref:deployment-guide:cluster-types.adoc#solrcloud-mode[SolrCloud], the files displayed are the configuration files for this collection stored in ZooKeeper.In user-managed clusters or single-node installations, all files in the `conf` directory are displayed.The configuration files shown may or may not be used by the collection as use of the file depends on how they are referenced in either `solrconfig.xml` or your schema.Configuration files cannot be edited with this screen, so a text editor of some kind must be used.-This screen is related to the <<schema-browser-screen.adoc#,Schema Browser Screen>>, in that they both can display information from the schema.+This screen is related to the xref:indexing-guide:schema-browser-screen.adoc[], in that they both can display information from the schema.However, the Schema Browser provides a way to drill into the analysis chain and displays linkages between field types, fields, and dynamic field rules.diff --git a/solr/solr-ref-guide/src/configuring-solr-xml.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adocsimilarity index 96%rename from solr/solr-ref-guide/src/configuring-solr-xml.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adocindex 64b8d2a5781..9f1955082da 100644--- a/solr/solr-ref-guide/src/configuring-solr-xml.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc@@ -19,7 +19,7 @@The `solr.xml` file defines some global configuration options that apply to all or many cores.This section will describe the default `solr.xml` file included with Solr and how to modify it for your needs.-For details on how to configure `core.properties`, see the section <<core-discovery.adoc#,Core Discovery>>.+For details on how to configure `core.properties`, see the section xref:core-discovery.adoc[].== Defining solr.xml@@ -183,11 +183,11 @@ Note that specifying `sharedLib` will not remove `$SOLR_HOME/lib` from Solr's cl|Optional |Default: none|===+-Takes a list of bundled <<solr-modules.adoc#,solr modules>> to add to Solr's class path+Takes a list of bundled xref:solr-modules.adoc[solr modules] to add to Solr's class pathon startup. This way of adding modules will add them to the shared class loader, making themavailable for every collection in Solr, unlike `<lib>` tag in `solrconfig.xml` which is only-for that one collection. Example value: `extracting,ltr`. See chapter-<<solr-modules.adoc#,Solr Modules>> for more details.+for that one collection. Example value: `extracting,ltr`. See the+xref:solr-modules.adoc[Solr Modules] chapter for more details.`allowPaths`::+@@ -263,7 +263,7 @@ This global limit provides a safety constraint on the total number of clauses alThis limit is enforced at multiple points in Lucene, both to prevent primitive query objects (mainly `BooleanQuery`) from being constructed with an excessive number of clauses in a way that may exhaust the JVM heap, but also to ensure that no composite query (made up of multiple primitive queries) can be executed with an excessive _total_ number of nested clauses in a way that may cause a search thread to use excessive CPU.+In default configurations this property uses the value of the `solr.max.booleanClauses` system property if specified.-This is the same system property used in the `_default` configset for the <<caches-warming.adoc#maxbooleanclauses-element,`<maxBooleanClauses>` element of `solrconfig.xml`>> making it easy for Solr administrators to increase both values (in all collections) without needing to search through and update all of their configs.+This is the same system property used in the `_default` configset for the xref:caches-warming.adoc#maxbooleanclauses-element[`<maxBooleanClauses>` element of `solrconfig.xml`] making it easy for Solr administrators to increase both values (in all collections) without needing to search through and update all of their configs.+[source,xml]----@@ -382,7 +382,7 @@ When a different machine takes over serving that core things will be much easier|Optional |Default: none|===+-Optional parameters that can be specified if you are using <<zookeeper-access-control.adoc#,ZooKeeper Access Control>>.+Optional parameters that can be specified if you are using xref:deployment-guide:zookeeper-access-control.adoc[].`distributedClusterStateUpdates`::+@@ -567,7 +567,7 @@ If only `dividend` routing is desired, `hash` may be explicitly set to the emptyThe `<metrics>` element in `solr.xml` allows you to customize the metrics reported by Solr.You can define system properties that should not be returned, or define custom suppliers and reporters.-If you would like to customize the metrics for your installation, see the section <<metrics-reporting.adoc#metrics-configuration,Metrics Configuration>>.+If you would like to customize the metrics for your installation, see the xref:deployment-guide:metrics-reporting.adoc#metrics-configuration[Metrics Configuration] section.== Substituting JVM System Properties in solr.xmldiff --git a/solr/solr-ref-guide/src/configuring-solrconfig-xml.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solrconfig-xml.adocsimilarity index 60%rename from solr/solr-ref-guide/src/configuring-solrconfig-xml.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solrconfig-xml.adocindex c91f031208b..3680b928896 100644--- a/solr/solr-ref-guide/src/configuring-solrconfig-xml.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solrconfig-xml.adoc@@ -31,7 +31,7 @@The `solrconfig.xml` file is the configuration file with the most parameters affecting Solr itself.-While configuring Solr, you'll work with `solrconfig.xml` often, either directly or via the <<config-api.adoc#,Config API>> to create "configuration overlays" (`configoverlay.json`) to override the values in `solrconfig.xml`.+While configuring Solr, you'll work with `solrconfig.xml` often, either directly or via the xref:config-api.adoc[] to create "configuration overlays" (`configoverlay.json`) to override the values in `solrconfig.xml`.In `solrconfig.xml`, you configure important features such as:@@ -49,26 +49,27 @@ The `solrconfig.xml` file is located in the `conf/` directory for each collectioSeveral well-commented example files can be found in the `server/solr/configsets/` directories demonstrating best practices for many different types of installations.Some `solrconfig.xml` aspects are documented in other sections.-See <<libs.adoc#lib-directives-in-solrconfig,lib directives in SolrConfig>>, which can be used for both Plugins and Resources.+See xref:libs.adoc#lib-directives-in-solrconfig[lib directives in SolrConfig], which can be used for both Plugins and Resources.****// This tags the below list so it can be used in the parent page section list// tag::solrconfig-sections[][cols="1,1",frame=none,grid=none,stripes=none]|===-| <<index-location-format.adoc#,Index Location and Format>>: Where and how Solr's indexes are stored.-| <<index-segments-merging.adoc#,Index Segments and Merging>>: Lucene index writers, including segment management, merges, and locks.-| <<schema-factory.adoc#,Schema Factory>>: Schema file formats.-| <<commits-transaction-logs.adoc#,Commits and Transaction Logs>>: Update requests and commit settings.-| <<caches-warming.adoc#,Caches and Query Warming>>: Caches, query warming, and query listeners.-| <<requesthandlers-searchcomponents.adoc#,Request Handlers and Search Components>>: Request processors and handlers for search features.-| <<implicit-requesthandlers.adoc#,Implicit Request Handlers>>: Request end-points automatically provided by Solr.-| <<realtime-get.adoc#,RealTime Get>>: Get the latest version of a document without opening a searcher.-| <<initparams.adoc#,InitParams>>: Default parameters for request handlers.-| <<requestdispatcher.adoc#,RequestDispatcher>>: Advanced request parsing and HTTP cache headers.-| <<update-request-processors.adoc#,Update Request Processors>>: Plugins for update requests.-| <<script-update-processor.adoc#,Script Update Processor>>: Java scripting engines during document updates.-| <<codec-factory.adoc#,Codec Factory>>: Lucene codecs when writing data to disk.+| xref:index-location-format.adoc[]: Where and how Solr's indexes are stored.+| xref:index-segments-merging.adoc[]: Lucene index writers, including segment management, merges, and locks.+| xref:schema-factory.adoc[]: Schema file formats.+| xref:commits-transaction-logs.adoc[]: Update requests and commit settings.+| xref:caches-warming.adoc[]: Caches, query warming, and query listeners.+| xref:requesthandlers-searchcomponents.adoc[]: Request processors and handlers for search features.+| xref:implicit-requesthandlers.adoc[]: Request end-points automatically provided by Solr.+| xref:realtime-get.adoc[]: Get the latest version of a document without opening a searcher.+| xref:initparams.adoc[]: Default parameters for request handlers.+| xref:requestdispatcher.adoc[]: Advanced request parsing and HTTP cache headers.+| xref:update-request-processors.adoc[]: Plugins for update requests.+| xref:script-update-processor.adoc[]: Java scripting engines during document updates.+| xref:codec-factory.adoc[]: Lucene codecs when writing data to disk.+||===//end::solrconfig-sections[]****diff --git a/solr/solr-ref-guide/src/core-discovery.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/core-discovery.adocsimilarity index 96%rename from solr/solr-ref-guide/src/core-discovery.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/core-discovery.adocindex 9a01dbbd2d9..3dab912b6ea 100644--- a/solr/solr-ref-guide/src/core-discovery.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/core-discovery.adoc@@ -117,7 +117,7 @@ The configuration file name for a given core.+The schema file name for a given core.The default is `schema.xml` but please note that if you are using a "managed schema" (the default behavior) then any value for this property which does not match the effective `managedSchemaResourceName` will be read once, backed up, and converted for managed schema use.-See <<schema-factory.adoc#,Schema Factory Definition in SolrConfig>> for more details.+See xref:schema-factory.adoc[] for more details.`dataDir`::+@@ -135,7 +135,7 @@ The core's data directory (where indexes are stored) as either an absolute pathn|Optional |Default: none|===+-The name of a defined configset, if desired, to use to configure the core (see the section <<config-sets.adoc#,Configsets>> for more details).+The name of a defined configset, if desired, to use to configure the core (see the section xref:config-sets.adoc[] for more details).`properties`::+@@ -216,4 +216,4 @@ The name of the collection this core is part of (SolrCloud only).Future parameter for SolrCloud or a way for users to mark nodes for their own use.Additional user-defined properties may be specified for use as variables.-For more information on how to define local properties, see the section <<property-substitution.adoc#,Property Substitution in `solrconfig.xml`>>.+For more information on how to define local properties, see the section xref:property-substitution.adoc[].diff --git a/solr/solr-ref-guide/src/coreadmin-api.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/coreadmin-api.adocsimilarity index 95%rename from solr/solr-ref-guide/src/coreadmin-api.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/coreadmin-api.adocindex 60dec26c0b1..cd33ea975e6 100644--- a/solr/solr-ref-guide/src/coreadmin-api.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/coreadmin-api.adoc@@ -17,11 +17,11 @@// specific language governing permissions and limitations// under the License.-The Core Admin API is primarily used under the covers by the <<collections-api.adoc#,Collections API>> when running a <<cluster-types.adoc#solrcloud-mode,SolrCloud>> cluster.+The Core Admin API is primarily used under the covers by the xref:collections-api.adoc[] when running a xref:deployment-guide:cluster-types.adoc#solrcloud-mode[SolrCloud] cluster.SolrCloud users should not typically use the CoreAdmin API directly, but the API may be useful for users of user-managed clusters or single-node installations for core maintenance operations.-The CoreAdmin API is implemented by the CoreAdminHandler, which is a special purpose <<requesthandlers-searchcomponents.adoc#,request handler>> that is used to manage Solr cores.+The CoreAdmin API is implemented by the CoreAdminHandler, which is a special purpose xref:requesthandlers-searchcomponents.adoc[request handler] that is used to manage Solr cores.Unlike other request handlers, the CoreAdminHandler is not attached to a single core.Instead, there is a single instance of the CoreAdminHandler in each Solr node that manages all the cores running in that node and is accessible at the `/solr/admin/cores` path.@@ -160,9 +160,9 @@ When you are running SolrCloud and create a new core for a collection, the confiEach collection is linked to a `configName`, which is stored in ZooKeeper.This satisfies the configuration requirement.That said, if you're running SolrCloud, you should *NOT* use the CoreAdmin API at all.-Instead, use the <<collections-api.adoc#,Collections API>>.+Instead, use the xref:collections-api.adoc[].-With a user-managed cluster, if you have <<config-sets.adoc#,Configsets>> defined, you can use the `configSet` parameter as documented below.+With a user-managed cluster, if you have xref:config-sets.adoc[] defined, you can use the `configSet` parameter as documented below.If there are no configsets, then the `instanceDir` specified in the CREATE call must already exist, and it must contain a `conf` directory which in turn must contain `solrconfig.xml`, your schema (usually named either `managed-schema.xml` or `schema.xml`), and any files referenced by those configs.The config and schema filenames can be specified with the `config` and `schema` parameters, but these are expert options.@@ -218,7 +218,7 @@ Name of the config file (i.e., `solrconfig.xml`) relative to `instanceDir`.+Name of the schema file to use for the core.Please note that if you are using a "managed schema" (the default behavior) then any value for this property which does not match the effective `managedSchemaResourceName` will be read once, backed up, and converted for managed schema use.-See <<schema-factory.adoc#,Schema Factory Definition in SolrConfig>> for details.+See xref:schema-factory.adoc[] for details.`dataDir`::+@@ -238,7 +238,7 @@ If absolute value is used, it must be inside `SOLR_HOME`, `SOLR_DATA_HOME` or on|===+Name of the configset to use for this core.-For more information, see the section <<config-sets.adoc#,Configsets>>.+For more information, see the section xref:config-sets.adoc[].`collection`::+@@ -253,7 +253,7 @@ The default is the name of the core.Use `collection.configName=_config-name_` to point to the configuration for a new collection.+WARNING: While it's possible to create a core for a non-existent collection, this approach is not supported and not recommended.-Always create a collection using the <<collections-api.adoc#,Collections API>> before creating a core directly for it.+Always create a collection using the xref:collections-api.adoc[] before creating a core directly for it.`shard`::+@@ -273,7 +273,7 @@ This should only be required in special circumstances; normally you want to be a|===+Sets the core property _name_ to _value_.-See the section on defining <<core-discovery.adoc#defining-core-properties-files,core.properties file contents>>.+See the section on defining xref:core-discovery.adoc#defining-core-properties-files[core.properties file contents].`async`::+@@ -672,7 +672,7 @@ Please note that using a single hash range equal to a route key's hash range isThe `targetCore` must already exist and must have a compatible schema with the `core` index.A commit is automatically called on the `core` index before it is split.-This command is used as part of SolrCloud's <<shard-management.adoc#splitshard,SPLITSHARD>> command but it can be used for cores in user-managed clusters as well.+This command is used as part of SolrCloud's xref:deployment-guide:shard-management.adoc#splitshard[SPLITSHARD] command but it can be used for cores in user-managed clusters as well.When used against a core in a user-managed cluster without `split.key` parameter, this action will split the source index and distribute its documents alternately so that each split piece contains an equal number of documents.If the `split.key` parameter is specified then only documents having the same route key will be split from the source index.diff --git a/solr/solr-ref-guide/src/implicit-requesthandlers.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/implicit-requesthandlers.adocsimilarity index 89%rename from solr/solr-ref-guide/src/implicit-requesthandlers.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/implicit-requesthandlers.adocindex b9b0c3808a5..d291270c77d 100644--- a/solr/solr-ref-guide/src/implicit-requesthandlers.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/implicit-requesthandlers.adoc@@ -64,7 +64,7 @@ v2: `api/node/logging` |{solr-javadocs}/core/org/apache/solr/handler/admin/LoggiLuke:: Expose the internal Lucene index.This handler must have a collection name in the path to the endpoint.+-*Documentation*: <<luke-request-handler.adoc#,Luke Request Handler>>+*Documentation*: xref:indexing-guide:luke-request-handler.adoc[]+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -75,7 +75,7 @@ This handler must have a collection name in the path to the endpoint.MBeans:: Provide info about all registered {solr-javadocs}/core/org/apache/solr/core/SolrInfoBean.html[SolrInfoMBeans].This handler must have a collection name in the path to the endpoint.+-*Documentation*: <<mbean-request-handler.adoc#,MBean Request Handler>>+*Documentation*: xref:deployment-guide:mbean-request-handler.adoc[]+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -86,7 +86,7 @@ This handler must have a collection name in the path to the endpoint.Ping:: Health check.This handler must have a collection name in the path to the endpoint.+-*Documentation*: <<ping.adoc#,Ping>>+*Documentation*: xref:deployment-guide:ping.adoc[]+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -157,7 +157,7 @@ Document Analysis:: Return a breakdown of the analysis process of the given docu|===Field Analysis:: Return index- and query-time analysis over the given field(s)/field type(s).-This handler drives the <<analysis-screen.adoc#,Analysis screen>> in Solr's Admin UI.+This handler drives the xref:indexing-guide:analysis-screen.adoc[] in Solr's Admin UI.+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -170,7 +170,7 @@ This handler drives the <<analysis-screen.adoc#,Analysis screen>> in Solr's Admi[horizontal]Config API:: Retrieve and modify Solr configuration.+-*Documentation*: <<config-api.adoc#,Config API>>+*Documentation*: xref:config-api.adoc[]+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -199,7 +199,7 @@ This handler must have a core name in the path to the endpoint.Schema API:: Retrieve and modify the Solr schema.+-*Documentation*: <<schema-api.adoc#,Schema API>>+*Documentation*: xref:indexing-guide:schema-api.adoc[]+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -214,7 +214,7 @@ v2: `api/collections/<collection>/schema`, `api/cores/<core>/schema` |{solr-java[horizontal]Export:: Export full sorted result sets.+-*Documentation*: <<exporting-result-sets.adoc#,Exporting Result Sets>>+*Documentation*: xref:query-guide:exporting-result-sets.adoc[]+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -224,7 +224,7 @@ Export:: Export full sorted result sets.RealTimeGet:: Low-latency retrieval of the latest version of a document.+-*Documentation*: <<realtime-get.adoc#,RealTime Get>>+*Documentation*: xref:realtime-get.adoc[]+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -234,7 +234,7 @@ RealTimeGet:: Low-latency retrieval of the latest version of a document.Graph Traversal:: Return http://graphml.graphdrawing.org/[GraphML] formatted output from a `gatherNodes` streaming expression.+-*Documentation*: <<graph-traversal.adoc#,Graph Traversal>>+*Documentation*: xref:query-guide:graph-traversal.adoc[]+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -244,7 +244,7 @@ Graph Traversal:: Return http://graphml.graphdrawing.org/[GraphML] formatted outSQL:: SQL query support.+-*Documentation*: <<sql-query.adoc#sql-request-handler,SQL Request Handler>>+*Documentation*: xref:query-guide:sql-query.adoc#sql-request-handler[SQL Request Handler]+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -254,7 +254,7 @@ SQL:: SQL query support.Streaming Expressions:: Distributed stream processing.+-*Documentation*: <<streaming-expressions.adoc#streaming-requests-and-responses,Streaming Requests and Responses>>+*Documentation*: xref:query-guide:streaming-expressions.adoc#streaming-requests-and-responses[Streaming Requests and Responses]+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -264,7 +264,7 @@ Streaming Expressions:: Distributed stream processing.Terms:: Return a field's indexed terms and the number of documents containing each term.+-*Documentation*: <<terms-component.adoc#using-the-terms-component-in-a-request-handler,Using the Terms Component in a Request Handler>>+*Documentation*: xref:query-guide:terms-component.adoc#using-the-terms-component-in-a-request-handler[Using the Terms Component in a Request Handler]+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -277,7 +277,7 @@ Terms:: Return a field's indexed terms and the number of documents containing ea[horizontal]Update:: Add, delete and update indexed documents formatted as SolrXML, CSV, SolrJSON or javabin.+-*Documentation*: <<indexing-with-update-handlers.adoc#,Indexing with Update Handlers>>+*Documentation*: xref:indexing-guide:indexing-with-update-handlers.adoc[]+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -287,7 +287,7 @@ Update:: Add, delete and update indexed documents formatted as SolrXML, CSV, SolCSV Updates:: Add and update CSV-formatted documents.+-*Documentation*: <<indexing-with-update-handlers.adoc#csv-update-convenience-paths,CSV Update Convenience Paths>>+*Documentation*: xref:indexing-guide:indexing-with-update-handlers.adoc#csv-update-convenience-paths[CSV Update Convenience Paths]+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -297,7 +297,7 @@ CSV Updates:: Add and update CSV-formatted documents.JSON Updates:: Add, delete and update SolrJSON-formatted documents.+-*Documentation*: <<indexing-with-update-handlers.adoc#json-update-convenience-paths,JSON Update Convenience Paths>>+*Documentation*: xref:indexing-guide:indexing-with-update-handlers.adoc#json-update-convenience-paths[JSON Update Convenience Paths]+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -307,7 +307,7 @@ JSON Updates:: Add, delete and update SolrJSON-formatted documents.Custom JSON Updates:: Add and update custom JSON-formatted documents.+-*Documentation*: <<transforming-and-indexing-custom-json.adoc#,Transforming and Indexing Custom JSON>>+*Documentation*: xref:indexing-guide:transforming-and-indexing-custom-json.adoc[]+[cols="3*.",frame=none,grid=cols,options="header"]|===@@ -317,7 +317,7 @@ Custom JSON Updates:: Add and update custom JSON-formatted documents.== How to View Implicit Handler Paramsets-You can see configuration for all request handlers, including the implicit request handlers, via the <<config-api.adoc#,Config API>>.+You can see configuration for all request handlers, including the implicit request handlers, via the xref:config-api.adoc[].To include the expanded paramset in the response, as well as the effective parameters from merging the paramset parameters with the built-in parameters, use the `expandParams` request parameter.@@ -382,6 +382,6 @@ The response will look similar to:== How to Edit Implicit Handler Paramsets-Because implicit request handlers are not present in `solrconfig.xml`, configuration of their associated `default`, `invariant` and `appends` parameters may be edited via the <<request-parameters-api.adoc#, Request Parameters API>> using the paramset listed in the above table.+Because implicit request handlers are not present in `solrconfig.xml`, configuration of their associated `default`, `invariant` and `appends` parameters may be edited via the xref:request-parameters-api.adoc[] using the paramset listed in the above table.However, other parameters, including SearchHandler components, may not be modified.The invariants and appends specified in the implicit configuration cannot be overridden.diff --git a/solr/solr-ref-guide/src/index-location-format.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/index-location-format.adocsimilarity index 91%rename from solr/solr-ref-guide/src/index-location-format.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/index-location-format.adocindex 311e015cf5a..f577db4db05 100644--- a/solr/solr-ref-guide/src/index-location-format.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/index-location-format.adoc@@ -32,7 +32,7 @@ For example:The `${solr.core.name}` substitution will cause the name of the current core to be substituted, which results in each core's data being kept in a separate subdirectory.-If you are using <<user-managed-index-replication#,user-managed replication>> to replicate the Solr index, then the `<dataDir>` directory should correspond to the index directory used in the replication configuration.+If you are using xref:deployment-guide:user-managed-index-replication.adoc[] to replicate the Solr index, then the `<dataDir>` directory should correspond to the index directory used in the replication configuration.NOTE: If the environment variable `SOLR_DATA_HOME` is defined, or if `solr.data.home` is configured for your DirectoryFactory, or if `solr.xml` contains anelement `<solrDataHome>` then the location of data directory will be `<SOLR_DATA_HOME>/<instance_name>/data`.@@ -61,5 +61,5 @@ Use this DirectoryFactory to store your index in RAM.[NOTE]====If you are using Hadoop and would like to store your indexes in HDFS, you should use the {solr-javadocs}/modules/hdfs/org/apache/solr/core/HdfsDirectoryFactory.html[`solr.HdfsDirectoryFactory`] instead of either of the above implementations.-For more details, see the section <<solr-on-hdfs.adoc#,Solr on HDFS>>.+For more details, see the section xref:deployment-guide:solr-on-hdfs.adoc[].====diff --git a/solr/solr-ref-guide/src/index-segments-merging.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/index-segments-merging.adocsimilarity index 94%rename from solr/solr-ref-guide/src/index-segments-merging.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/index-segments-merging.adocindex 839400fee02..9bf7cb4d74b 100644--- a/solr/solr-ref-guide/src/index-segments-merging.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/index-segments-merging.adoc@@ -179,7 +179,7 @@ If the configuration options for the built-in merge policies do not fully suit y----The example above shows Solr's {solr-javadocs}/core/org/apache/solr/index/SortingMergePolicyFactory.html[`SortingMergePolicyFactory`] being configured to sort documents in merged segments by `"timestamp desc"`, and wrapped around a `TieredMergePolicyFactory` configured to use the values `maxMergeAtOnce=10` and `segmentsPerTier=10` via the `inner` prefix defined by `SortingMergePolicyFactory` 's `wrapped.prefix` option.-For more information on using `SortingMergePolicyFactory`, see <<common-query-parameters.adoc#segmentterminateearly-parameter,the segmentTerminateEarly parameter>>.+For more information on using `SortingMergePolicyFactory`, see xref:query-guide:common-query-parameters.adoc#segmentterminateearly-parameter[the segmentTerminateEarly parameter].=== mergeScheduler@@ -189,7 +189,7 @@ The alternative, `SerialMergeScheduler`, does not perform merges with separate tThe `ConcurrentMergeScheduler` has the following configurable attributes.The defaults for these attributes are dynamically set based on whether the underlying disk drive is rotational disk or not.-Refer to the <<taking-solr-to-production.adoc#dynamic-defaults-for-concurrentmergescheduler, Dynamic defaults for ConcurrentMergeScheduler>> section for more details.+Refer to xref:deployment-guide:taking-solr-to-production.adoc#dynamic-defaults-for-concurrentmergescheduler[Dynamic Defaults for ConcurrentMergeScheduler] for more details.`maxMergeCount`::+@@ -239,7 +239,7 @@ By default throttling is enabled and the CMS will limit I/O throughput when merg=== mergedSegmentWarmer-When using Solr for <<solrcloud-distributed-requests.adoc#near-real-time-nrt-use-cases,Near Real Time Use Cases>>, a merged segment warmer can be configured to warm the reader on the newly merged segment, before the merge commits.+When using Solr for xref:deployment-guide:solrcloud-distributed-requests.adoc#near-real-time-nrt-use-cases[Near Real Time Use Cases], a merged segment warmer can be configured to warm the reader on the newly merged segment, before the merge commits.This is not required for near real-time search, but will reduce search latency on opening a new near real-time reader after a merge completes.[source,xml]@@ -272,7 +272,7 @@ Many <<Merging Index Segments,Merge Policy>> implementations support `noCFSRatioThe Segments Info screen in the Admin UI lets you see a visualization of the various segments in the underlying Lucene index for this core, with information about the size of each segment – both bytes and in number of documents – as well as other basic metadata about those segments.Most visible is the number of deleted documents, but you can hover your mouse over the segments to see additional numeric details.-image::images/index-segments-merging/segments_info.png[image,width=486,height=250]+image::index-segments-merging/segments_info.png[image,width=486,height=250]This information may be useful for people to help make decisions about the optimal <<merging-index-segments,merge settings>> for their data.@@ -282,7 +282,7 @@ This information may be useful for people to help make decisions about the optimThe LockFactory options specify the locking implementation to use.-The set of valid lock type options depends on the <<index-location-format.adoc#,DirectoryFactory>> you have configured.+The set of valid lock type options depends on the xref:index-location-format.adoc[DirectoryFactory] you have configured.The values listed below are are supported by `StandardDirectoryFactory` (the default):@@ -304,7 +304,7 @@ WARNING: If multiple Solr instances in different JVMs modify an index, this typeSee also the {lucene-javadocs}/core/org/apache/lucene/store/SingleInstanceLockFactory.html[SingleInstanceLockFactory javadocs].* `hdfs` uses `HdfsLockFactory` to support reading and writing index and transaction log files to a HDFS filesystem.-See the section <<solr-on-hdfs.adoc#,Solr on HDFS>> for more details on using this feature.+See the section xref:deployment-guide:solr-on-hdfs.adoc[] for more details on using this feature.[source,xml]----diff --git a/solr/solr-ref-guide/src/initparams.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/initparams.adocsimilarity index 96%rename from solr/solr-ref-guide/src/initparams.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/initparams.adocindex 10c66410692..31e8a5e945e 100644--- a/solr/solr-ref-guide/src/initparams.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/initparams.adoc@@ -21,7 +21,7 @@ The `<initParams>` section of `solrconfig.xml` allows you to define request handThere are a couple of use cases where this might be desired:-* Some handlers are implicitly defined in code (see <<implicit-requesthandlers.adoc#,Implicit Request Handlers>>) and there should be a way to add, append, or override some of the implicitly defined properties.+* Some handlers are implicitly defined in code (see xref:implicit-requesthandlers.adoc[]) and there should be a way to add, append, or override some of the implicitly defined properties.* There are a few properties that are used across handlers.This helps you keep only a single definition of those properties and apply them over multiple handlers.diff --git a/solr/solr-ref-guide/src/libs.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/libs.adocsimilarity index 94%rename from solr/solr-ref-guide/src/libs.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/libs.adocindex 5e95253a138..db651e2403d 100644--- a/solr/solr-ref-guide/src/libs.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/libs.adoc@@ -30,7 +30,7 @@ There are several special places you can place Solr plugin `.jar` files:* `<solr_home>/lib/`: The `.jar` files placed here are available to all Solr cores running on the node, and to node level plugins referenced in `solr.xml` -- so basically everything.This directory is not present by default so create it.-See <<taking-solr-to-production.adoc#solr-home-directory,Solr home directory>>.+See xref:deployment-guide:taking-solr-to-production.adoc[].* `<core_instance>/lib/`: In a user-managed cluster or a single-node installation, you may want to add plugins just for a specific Solr core.Create this adjacent to the `conf/` directory; it's not present by default.@@ -47,7 +47,7 @@ Solr plugins won't work in these locations.== Lib Directives in SolrConfig-_Both_ plugin and <<resource-loading.adoc#,resource>> file paths are configurable via `<lib/>` directives in `solrconfig.xml`.+_Both_ plugin and xref:resource-loading.adoc[resource] file paths are configurable via `<lib/>` directives in `solrconfig.xml`.When a directive matches a directory, then resources can be resolved from it.When a directive matches a `.jar` file, Solr plugins and their dependencies are resolved from it.Resources can be placed in a `.jar` too but that's unusual.diff --git a/solr/solr-ref-guide/src/managed-resources.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/managed-resources.adocsimilarity index 93%rename from solr/solr-ref-guide/src/managed-resources.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/managed-resources.adocindex b5cf5bb931a..7bcd16565ca 100644--- a/solr/solr-ref-guide/src/managed-resources.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/managed-resources.adoc@@ -40,7 +40,7 @@ After reading this section, you'll be ready to dig into the details of how manag=== Managing Stop Words-To begin, you need to define a field type that uses the <<filters.adoc#managed-stop-filter,ManagedStopFilterFactory>>, such as:+To begin, you need to define a field type that uses the xref:indexing-guide:filters.adoc#managed-stop-filter[ManagedStopFilterFactory], such as:[source,xml,subs="verbatim,callouts"]----@@ -56,7 +56,7 @@ To begin, you need to define a field type that uses the <<filters.adoc#managed-sThere are two important things to notice about this field type definition:<1> The filter implementation class is `solr.ManagedStopFilterFactory`.-This is a special implementation of the <<filters.adoc#stop-filter,StopFilterFactory>> that uses a set of stop words that are managed from a REST API.+This is a special implementation of the xref:indexing-guide:filters.adoc#stop-filter[StopFilterFactory] that uses a set of stop words that are managed from a REST API.<2> The `managed=”english”` attribute gives a name to the set of managed stop words, in this case indicating the stop words are for English text.@@ -104,7 +104,7 @@ Assuming you sent this request to Solr, the response body is a JSON document:}-----The `sample_techproducts_configs` <<config-sets.adoc#,configset>> ships with a pre-built set of managed stop words, however you should only interact with this file using the API and not edit it directly.+The `sample_techproducts_configs` xref:config-sets.adoc[configset] ships with a pre-built set of managed stop words, however you should only interact with this file using the API and not edit it directly.One thing that should stand out to you in this response is that it contains a `managedList` of words as well as `initArgs`.This is an important concept in this framework -- managed resources typically have configuration and data.@@ -144,7 +144,7 @@ This is because it is more common to add a term to an existing list than it is t=== Managing SynonymsFor the most part, the API for managing synonyms behaves similar to the API for stop words, except instead of working with a list of words, it uses a map, where the value for each entry in the map is a set of synonyms for a term.-As with stop words, the `sample_techproducts_configs` <<config-sets.adoc#,configset>> includes a pre-built set of synonym mappings suitable for the sample data that is activated by the following field type definition:+As with stop words, the `sample_techproducts_configs` xref:config-sets.adoc[configset] includes a pre-built set of synonym mappings suitable for the sample data that is activated by the following field type definition:[source,xml]----@@ -224,7 +224,7 @@ Lastly, you can delete a mapping by sending a DELETE request to the managed endpChanges made to managed resources via this REST API are not applied to the active Solr components until the Solr collection (or Solr core in single server mode) is reloaded.-For example: after adding or deleting a stop word, you must reload the core/collection before changes become active; related APIs: <<coreadmin-api.adoc#,CoreAdmin API>> and <<collections-api.adoc#,Collections API>>.+For example: after adding or deleting a stop word, you must reload the core/collection before changes become active; related APIs: xref:coreadmin-api.adoc[] and xref:collections-api.adoc[].This approach is required when running in distributed mode so that we are assured changes are applied to all cores in a collection at the same time so that behavior is consistent and predictable.It goes without saying that you don’t want one of your replicas working with a different set of stop words or synonyms than the others.@@ -238,7 +238,7 @@ However, the intent of this API implementation is that changes will be applied u====Changing things like stop words and synonym mappings typically require reindexing existing documents if being used by index-time analyzers.The RestManager framework does not guard you from this, it simply makes it possible to programmatically build up a set of stop words, synonyms, etc.-See the section <<reindexing.adoc#,Reindexing>> for more information about reindexing your documents.+See the section xref:indexing-guide:reindexing.adoc[] for more information about reindexing your documents.====== RestManager Endpointdiff --git a/solr/solr-ref-guide/src/package-manager-internals.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/package-manager-internals.adocsimilarity index 100%rename from solr/solr-ref-guide/src/package-manager-internals.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/package-manager-internals.adocdiff --git a/solr/solr-ref-guide/src/package-manager.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/package-manager.adocsimilarity index 92%rename from solr/solr-ref-guide/src/package-manager.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/package-manager.adocindex bdcf05b4b7a..e07996e656f 100644--- a/solr/solr-ref-guide/src/package-manager.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/package-manager.adoc@@ -19,7 +19,7 @@The package manager in Solr allows installation and updating of Solr-specific packages in Solr's cluster environment.-In this system, a _package_ is a set of Java jar files (usually one) containing one or more <<solr-plugins.adoc#,Solr plugins>>.+In this system, a _package_ is a set of Java jar files (usually one) containing one or more xref:solr-plugins.adoc[].Each jar file is also accompanied by a signature string (which can be verified against a supplied public key).A key design aspect of this system is the ability to install or update packages in a cluster environment securely without the need to restart every node.@@ -27,7 +27,7 @@ A key design aspect of this system is the ability to install or update packagesOther elements of the design include the ability to install from a remote repository; package standardization; a command line interface (CLI); and a package store.This section will focus on how to use the package manager to install and update packages.-For technical details, see the section <<package-manager-internals.adoc#,Package Manager internals>>.+For technical details, see the section xref:package-manager-internals.adoc[].== Interacting with the Package Manager@@ -51,7 +51,7 @@ $ bin/solr -c -Denable.packages=trueWARNING: There are security consequences to enabling the package manager.If an unauthorized user gained access to the system, they would have write access to ZooKeeper and could install packages from untrusted sources.-Always ensure you have secured Solr with firewalls and <<authentication-and-authorization-plugins.adoc#,authentication>> before enabling the package manager.+Always ensure you have secured Solr with firewalls and xref:deployment-guide:authentication-and-authorization-plugins.adoc[] before enabling the package manager.=== Add Trusted Repositories@@ -118,7 +118,7 @@ If you pass `-y` to the command, confirmation can be skipped.==== Manual Deploy-It is also possible to deploy a package's collection level plugins manually by editing a <<config-sets.adoc#,configset>> and reloading the collection.+It is also possible to deploy a package's collection level plugins manually by editing a xref:config-sets.adoc[configset] and reloading the collection.For example, if a package named `mypackage` contains a request handler, we would add it to a configset's `solrconfig.xml` like this:@@ -127,7 +127,7 @@ For example, if a package named `mypackage` contains a request handler, we would<requestHandler name="/myhandler" class="mypackage:full.path.to.MyClass"></requestHandler>-----Then use either the Collections API <<collection-management.adoc#reload,RELOAD command>> or the <<collections-core-admin.adoc#,Admin UI>> to reload the collection.+Then use either the Collections API xref:deployment-guide:collection-management.adoc#reload[RELOAD command] or the xref:deployment-guide:collections-core-admin.adoc[Admin UI] to reload the collection.Next, set the package version that this collection is using.If the collection is named `collection1`, the package name is `mypackage`, and the installed version is `1.0.0`, the command would look like this:diff --git a/solr/solr-ref-guide/src/property-substitution.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/property-substitution.adocsimilarity index 93%rename from solr/solr-ref-guide/src/property-substitution.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/property-substitution.adocindex b4fe68184f7..e70df746579 100644--- a/solr/solr-ref-guide/src/property-substitution.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/property-substitution.adoc@@ -48,11 +48,11 @@ bin/solr start -Dsolr.lock.type=noneIn general, any Java system property that you want to set can be passed through the `bin/solr` script using the standard `-Dproperty=value` syntax.Alternatively, you can add common system properties to the `SOLR_OPTS` environment variable defined in the Solr include file (`bin/solr.in.sh` or `bin/solr.in.cmd`).-For more information about how the Solr include file works, refer to: <<taking-solr-to-production.adoc#,Taking Solr to Production>>.+For more information about how the Solr include file works, refer to: xref:deployment-guide:taking-solr-to-production.adoc[].== Config API to Override solrconfig.xml-The <<config-api.adoc#,Config API>> allows you to use an API to modify Solr's configuration, specifically user defined properties.+The xref:config-api.adoc[] allows you to use an API to modify Solr's configuration, specifically user defined properties.Changes made with this API are stored in a file named `configoverlay.json`.This file should only be edited with the API, but will look like this example:@@ -69,7 +69,7 @@ This file should only be edited with the API, but will look like this example:"components":["terms"]}}}-----For more details, see the section <<config-api.adoc#,Config API>>.+For more details, see the section xref:config-api.adoc[].== User-Defined Properties in core.properties@@ -136,7 +136,7 @@ For example, regardless of whether the name for a particular Solr core is explic</requestHandler>-----All implicit properties use the `solr.core.` name prefix, and reflect the runtime value of the equivalent <<core-discovery.adoc#,`core.properties` property>>:+All implicit properties use the `solr.core.` name prefix, and reflect the runtime value of the equivalent xref:core-discovery.adoc[`core.properties` property]:* `solr.core.name`* `solr.core.config`diff --git a/solr/solr-ref-guide/src/realtime-get.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/realtime-get.adocsimilarity index 95%rename from solr/solr-ref-guide/src/realtime-get.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/realtime-get.adocindex a74b8681239..e794bce8d8f 100644--- a/solr/solr-ref-guide/src/realtime-get.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/realtime-get.adoc@@ -30,7 +30,7 @@ Real Time Get relies on the update log feature, which is enabled by default and</updateLog>-----Real Time Get requests can be performed using the `/get` handler which exists implicitly in Solr - see <<implicit-requesthandlers.adoc#,Implicit Request Handlers>> - it's equivalent to the following configuration:+Real Time Get requests can be performed using the `/get` handler which exists implicitly in Solr - see xref:implicit-requesthandlers.adoc[] - it's equivalent to the following configuration:[source,xml]----@@ -166,7 +166,7 @@ http://localhost:8983/api/collections/techproducts/get?id=mydoc&id=IW-02====---Real Time Get requests can also be combined with filter queries, specified with an <<common-query-parameters.adoc#fq-filter-query-parameter,`fq` parameter>>:+Real Time Get requests can also be combined with filter queries, specified with an xref:query-guide:common-query-parameters.adoc#fq-filter-query-parameter[`fq` parameter]:[.dynamic-tabs]--diff --git a/solr/solr-ref-guide/src/replica-placement-plugins.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/replica-placement-plugins.adocsimilarity index 100%rename from solr/solr-ref-guide/src/replica-placement-plugins.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/replica-placement-plugins.adocdiff --git a/solr/solr-ref-guide/src/request-parameters-api.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/request-parameters-api.adocsimilarity index 97%rename from solr/solr-ref-guide/src/request-parameters-api.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/request-parameters-api.adocindex 4c2daad0190..11b5e5199f9 100644--- a/solr/solr-ref-guide/src/request-parameters-api.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/request-parameters-api.adoc@@ -20,7 +20,7 @@ The Request Parameters API allows creating parameter sets, a.k.a. paramsets, thaThe parameter sets defined with this API can be used in requests to Solr, or referenced directly in `solrconfig.xml` request handler definitions.-It is really another endpoint of the <<config-api.adoc#,Config API>> instead of a separate API, and has distinct commands.+It is really another endpoint of the xref:config-api.adoc[] instead of a separate API, and has distinct commands.It does not replace or modify any sections of `solrconfig.xml`, but instead provides another approach to handling parameters used in requests.It behaves in the same way as the Config API, by storing parameters in another file that will be used at runtime.In this case, the parameters are stored in a file named `params.json`.@@ -145,7 +145,7 @@ It will be equivalent to a standard request handler definition like:=== Implicit RequestHandlers with the Request Parameters APISolr ships with many out-of-the-box request handlers that may only be configured via the Request Parameters API, because their configuration is not present in `solrconfig.xml`.-See <<implicit-requesthandlers.adoc#,Implicit Request Handlers>> for the paramset to use when configuring an implicit request handler.+See xref:implicit-requesthandlers.adoc[] for the paramset to use when configuring an implicit request handler.=== Viewing Expanded Paramsets and Effective Parameters with RequestHandlersdiff --git a/solr/solr-ref-guide/src/requestdispatcher.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/requestdispatcher.adocsimilarity index 97%rename from solr/solr-ref-guide/src/requestdispatcher.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/requestdispatcher.adocindex 290eadf9b4e..d706d5856aa 100644--- a/solr/solr-ref-guide/src/requestdispatcher.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/requestdispatcher.adoc@@ -34,7 +34,7 @@ The default value "false" will ignore requests to `/select` if a request handlerA value of "true" will route query requests to the parser defined with the `qt` value if a request handler is not explicitly registered with the name `/select`.In recent versions of Solr, a `/select` request handler is defined by default, so a value of "false" will work fine.-See the section <<requesthandlers-searchcomponents.adoc#,Request Handlers and Search Components>> for more information.+See the section xref:requesthandlers-searchcomponents.adoc[] for more information.[source,xml]----@@ -114,7 +114,7 @@ This `HttpServletRequest` is not used by any Solr component, but may be useful waddHttpRequestToContext="false" />-----The below command is an example of how to enable RemoteStreaming and BodyStreaming through the <<config-api.adoc#commands-for-common-properties,Config API>>:+The below command is an example of how to enable RemoteStreaming and BodyStreaming through the xref:config-api.adoc#commands-for-common-properties[Config API]:[.dynamic-tabs]--diff --git a/solr/solr-ref-guide/src/requesthandlers-searchcomponents.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/requesthandlers-searchcomponents.adocsimilarity index 75%rename from solr/solr-ref-guide/src/requesthandlers-searchcomponents.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/requesthandlers-searchcomponents.adocindex 677432292a7..8a3144c6c61 100644--- a/solr/solr-ref-guide/src/requesthandlers-searchcomponents.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/requesthandlers-searchcomponents.adoc@@ -19,16 +19,16 @@After the `<query>` section of `solrconfig.xml`, request handlers and search components are configured.A _request handler_ processes requests coming to Solr.-These might be query requests, index update requests or specialized interactions such as <<ping.adoc#,ping>>.+These might be query requests, index update requests or specialized interactions such as xref:deployment-guide:ping.adoc[].Not all handlers are defined explicitly in `solrconfig.xml`, many are defined implicitly.-See <<implicit-requesthandlers.adoc#,Implicit Request Handlers>> for details.+See xref:implicit-requesthandlers.adoc[] for details.-Additionally, handlers can be defined or overridden in `configoverlay.json` by using <<config-api.adoc#,Config API>>.-Finally, independent parameter sets can be also defined by <<request-parameters-api.adoc#,Request Parameters API>>.-They will be stored in `params.json` file and referenced with <<#paramsets-and-useparams,useParams>>.+Additionally, handlers can be defined or overridden in `configoverlay.json` by using xref:config-api.adoc[].+Finally, independent parameter sets can be also defined by xref:request-parameters-api.adoc[].+They will be stored in `params.json` file and referenced with <<paramsets-and-useparams,useParams>>.-All of this multi-layered configuration, may be verified via <<config-api.adoc#,Config API>>.+All of this multi-layered configuration can be verified via xref:config-api.adoc[].Defining your own config handlers is often a useful way to provide defaults and advanced configuration to support business cases and simplify client API.At the same time, using every single option explained in this guide, will most certainly cause some confusion about which parameter is actually used when.@@ -81,7 +81,7 @@ Notice the URL-encoded space (as +) for the values of `fl` parameter.http://localhost:8983/solr/techproducts/select?q=id:SP2514N&fl=id+name&wt=xml-----And here is an example of parameters being sent through the POST form to `/query` Search Handler using <<json-request-api.adoc#,JSON Request API>>.+The following is an example of parameters being sent through the POST form to `/query` Search Handler using the xref:query-guide:json-request-api.adoc[].[source,bash]----@@ -111,7 +111,7 @@ The parameters there are used unless they are overridden by any other method.</requestHandler>-----This example defined a useful troubleshooting parameter <<common-query-parameters.adoc#echoparams-parameter,echoParams>>, with value that returns only params defined in the request itself (no defaults), set it to `all` for more information.+This example defined a useful troubleshooting parameter xref:query-guide:common-query-parameters.adoc#echoparams-parameter[echoParams], with value that returns only params defined in the request itself (no defaults), set it to `all` for more information.It also defines the `rows` parameter, with how many results to return (per page) (10 is a true default actually, so this is a redundant definition, if you are not going to modify it).Note also that the way the defaults are defined in the list varies if the parameter is a string, an integer, or another type.@@ -131,7 +131,7 @@ Other specialized types may exist, they would be explained in the sections for r==== AppendsIn the `appends` section, you can define parameters that are added those already defined elsewhere.-These are useful when the same parameter may be meaningfully defined multiple times, such as for <<common-query-parameters.adoc#fq-filter-query-parameter,filter queries>>.+These are useful when the same parameter may be meaningfully defined multiple times, such as for xref:query-guide:common-query-parameters.adoc#fq-filter-query-parameter[filter queries].There is no mechanism in Solr to allow a client to override these additions, so you should be absolutely sure you always want these parameters applied to queries.[source,xml]@@ -167,11 +167,11 @@ these are the only facets they will be able to see counts for; regardless of whaIt is also possible to configure defaults for request handlers with a section called `initParams`.These defaults can be used when you want to have common properties that will be used by each separate handler.For example, if you intend to create several request handlers that will all request the same list of fields in the response, you can configure an `initParams` section with your list of fields.-For more information about `initParams`, see the section <<initparams.adoc#,InitParams>>.+For more information about `initParams`, see the section xref:initparams.adoc[].=== Paramsets and UseParamsIf you are expecting to change the parameters often, or if you want define sets of parameters that you can apply on the fly,-you can define them with <<request-parameters-api.adoc#,Request Parameters API>> and then invoke them+you can define them with xref:request-parameters-api.adoc[] and then invoke themby providing one or more in `useParams` setting either in the handler definition itself or as a query parameter.[source,xml]@@ -187,9 +187,8 @@ by providing one or more in `useParams` setting either in the handler definitionhttp://localhost/solr/techproducts/select?useParams=myFacets,myQueries-----If paramset is called but is not defined, it is ignored.-This allows most <<implicit-requesthandlers.adoc#,implicit request handlers>> to call specific paramsets,-that you can define later, as needed.+If a paramset is called but is not defined, it is ignored.+This allows most xref:implicit-requesthandlers.adoc[] to call specific paramsets that you can define later, as needed.== Search Handlers@@ -210,10 +209,10 @@ The following sections are allowed within a Search Handler:All the blocks are optional, especially since parameters can also be provided with `initParams` and `useParams`.-The defaults/appends/invariants blocks were described <<#defaults-appends-and-invariants,higher>> on the page.-All the parameters described in the section <<query-guide.adoc#,Query Guide>> can be defined as parameters for any of the Search Handlers.+The defaults/appends/invariants blocks were described earlier in <<defaults-appends-and-invariants>>.+All query parameters can be defined as parameters for any of the Search Handlers.-The Search Components blocks are described next, and <<solrcloud-distributed-requests.adoc#configuring-the-shardhandlerfactory,shardHandlerFactory>> is for fine-tuning of the SolrCloud distributed requests.+The Search Components blocks are described next, and xref:deployment-guide:solrcloud-distributed-requests.adoc#configuring-the-shardhandlerfactory[shardHandlerFactory] is for fine-tuning of the SolrCloud distributed requests.=== Defining Search ComponentsThe search components themselves are defined outside of the Request Handlers and then are referenced from various Search Handlers that want to use them.@@ -228,30 +227,30 @@ They are called in the order listed.[cols="20,40,40",options="header"]|===|Component Name |Class Name |More Information-|query |`solr.QueryComponent` |Described in the section <<query-syntax-and-parsers.adoc#,Query Syntax and Parsing>>.-|facet |`solr.FacetComponent` |Original parameter-based facet component, described in the section <<faceting.adoc#,Faceting>>.-|facet_module |`solr.facet.FacetModule` | JSON Faceting and Analytics module, described in the section <<json-facet-api.adoc#, JSON Facet API>>.-|mlt |`solr.MoreLikeThisComponent` |Described in the section <<morelikethis.adoc#,MoreLikeThis>>.-|highlight |`solr.HighlightComponent` |Described in the section <<highlighting.adoc#,Highlighting>>.-|stats |`solr.StatsComponent` |Described in the section <<stats-component.adoc#,The Stats Component>>.-|expand |`solr.ExpandComponent` |Described in the section <<collapse-and-expand-results.adoc#,Collapse and Expand Results>>.-|terms |`solr.TermsComponent` |Described in the section <<terms-component.adoc#,The Terms Component>>.-|debug |`solr.DebugComponent` |Described in the section on <<common-query-parameters.adoc#debug-parameter,Common Query Parameters>>.+|query |`solr.QueryComponent` |Described in the section xref:query-guide:query-syntax-and-parsers.adoc[].+|facet |`solr.FacetComponent` |Original parameter-based facet component, described in the section xref:query-guide:faceting.adoc[].+|facet_module |`solr.facet.FacetModule` | JSON Faceting and Analytics module, described in the section xref:query-guide:json-facet-api.adoc[].+|mlt |`solr.MoreLikeThisComponent` |Described in the section xref:query-guide:morelikethis.adoc[].+|highlight |`solr.HighlightComponent` |Described in the section xref:query-guide:highlighting.adoc[].+|stats |`solr.StatsComponent` |Described in the section xref:query-guide:stats-component.adoc[].+|expand |`solr.ExpandComponent` |Described in the section xref:query-guide:collapse-and-expand-results.adoc[].+|terms |`solr.TermsComponent` |Described in the section xref:query-guide:terms-component.adoc[].+|debug |`solr.DebugComponent` |Described in the section on xref:query-guide:common-query-parameters.adoc#debug-parameter[debug Parameter].|======= Shipped Custom ComponentsApart from default components, Solr ships with a number of additional - very useful - components.They do need to defined and referenced in `solrconfig.xml` to be actually used.-* `AnalyticsComponent`, described in the section <<analytics.adoc#,Analytics>>.-* `ClusteringComponent`, described in the section <<result-clustering.adoc#,Result Clustering>>.+* `AnalyticsComponent`, described in the section xref:query-guide:analytics.adoc[].+* `ClusteringComponent`, described in the section xref:query-guide:result-clustering.adoc[].* `PhrasesIdentificationComponent`, used to identify & score "phrases" found in the input string, based on shingles in indexed fields, described in the {solr-javadocs}/core/org/apache/solr/handler/component/PhrasesIdentificationComponent.html[PhrasesIdentificationComponent] javadocs.-* `QueryElevationComponent`, described in the section <<query-elevation-component.adoc#,The Query Elevation Component>>.-* `RealTimeGetComponent`, described in the section <<realtime-get.adoc#,RealTime Get>>.+* `QueryElevationComponent`, described in the section xref:query-guide:query-elevation-component.adoc[].+* `RealTimeGetComponent`, described in the section xref:realtime-get.adoc[].* `ResponseLogComponent`, used to record which documents are returned to the user via the Solr log, described in the {solr-javadocs}/core/org/apache/solr/handler/component/ResponseLogComponent.html[ResponseLogComponent] javadocs.-* `SpellCheckComponent`, described in the section <<spell-checking.adoc#,Spell Checking>>.-* `SuggestComponent`, described in the section <<suggester.adoc#,Suggester>>.-* `TermVectorComponent`, described in the section <<term-vector-component.adoc#,The Term Vector Component>>.+* `SpellCheckComponent`, described in the section xref:query-guide:spell-checking.adoc[].+* `SuggestComponent`, described in the section xref:query-guide:suggester.adoc[].+* `TermVectorComponent`, described in the section xref:query-guide:term-vector-component.adoc[].Some third party components are also linked from https://solr.cool/ website.@@ -292,7 +291,7 @@ It's possible to define some components as being used before (with `first-componNOTE: The component registered with the name "debug" will always be executed after the "last-components"-If you define `components` instead, the <<#default-components,default components (above)>> will not be executed, and `first-components` and `last-components` are disallowed.+If you define `components` instead, the <<default-components>> will not be executed, and `first-components` and `last-components` are disallowed.This should be considered as a last-resort option as the default list may change in a later Solr version.[source,xml]@@ -310,8 +309,7 @@ This should be considered as a last-resort option as the default list may change== Update Request HandlersThe Update Request Handlers are request handlers which process updates to the index.-Most of the request handlers are <<implicit-requesthandlers.adoc#update-handlers,implicit>>-and can be customized by defining properly named Paramsets.+Most of the available update request handlers are xref:implicit-requesthandlers.adoc#update-handlers[implicit] and can be customized by defining properly named Paramsets.If you need to define additional Update Request Handler, the syntax is:@@ -323,10 +321,10 @@ If you need to define additional Update Request Handler, the syntax is:-----The full details are covered in the section <<indexing-with-update-handlers.adoc#,Indexing with Update Handlers>>.+The full details are covered in the section xref:indexing-guide:indexing-with-update-handlers.adoc[].Similar to Search Components for Search Handlers, Solr has document-preprocessing plugins for Update Request Handlers,-called <<update-request-processors.adoc#,Update Request Processors>>,+called xref:update-request-processors.adoc[],which also allow for default and custom configuration chains.-Note: Do not confuse Update Request Handlers with <<commits-transaction-logs.adoc#,`updateHandler`>> section also defined in `solrconfig.xml`.+Note: Do not confuse Update Request Handlers with xref:commits-transaction-logs.adoc[`updateHandler`] section also defined in `solrconfig.xml`.diff --git a/solr/solr-ref-guide/src/resource-loading.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/resource-loading.adocsimilarity index 78%rename from solr/solr-ref-guide/src/resource-loading.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/resource-loading.adocindex d489a35ea0e..bcdbe17c5ef 100644--- a/solr/solr-ref-guide/src/resource-loading.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/resource-loading.adoc@@ -19,17 +19,17 @@Solr components can be configured using *resources*: data stored in external files that may be referred to in a location-independent fashion.-Examples of resources include: files needed by schema components, e.g., a stopword list for <<filters.adoc#stop-filter,Stop Filter>>; and machine-learned models for <<learning-to-rank.adoc#,Learning to Rank>>.+Examples of resources include: files needed by schema components, e.g., a stopword list for xref:indexing-guide:filters.adoc#stop-filter[Stop Filter]; and machine-learned models for xref:query-guide:learning-to-rank.adoc[]._Resources are typically resolved from the configSet_ but there are other options too.Solr's resources are generally only loaded initially when the Solr collection or Solr core is loaded.After you update a resource, you'll typically need to _reload_ the affected collections when running SolrCloud, or the cores when running a user-managed cluster or single-node installation.Restarting all affected Solr nodes also works.-<<managed-resources.adoc#,Managed resources>> can be manipulated via APIs and do not need an explicit reload.+xref:managed-resources.adoc[] can be manipulated via APIs and do not need an explicit reload.== Resources in Configsets-<<config-sets.adoc#,Configsets>> are the directories containing solrconfig.xml, the schema, and resources referenced by them.+xref:config-sets.adoc[] are the directories containing `solrconfig.xml`, the schema, and resources referenced by them.In SolrCloud they are stored in ZooKeeper.In a user-managed cluster and a single-node installation they are stored on the file system.In any mode, resources may be shared or may be dedicated to a configSet.@@ -37,7 +37,7 @@ Prefer to put resources here.== Resources in Other Places-Resources can also be placed in an arbitrary directory and <<libs.adoc#lib-directives-in-solrconfig,referenced>> from a `<lib />` directive in `solrconfig.xml`, provided the directive refers to a directory and not the actual resource file.+Resources can also be placed in an arbitrary directory and xref:libs.adoc#lib-directives-in-solrconfig[referenced] from a `<lib />` directive in `solrconfig.xml`, provided the directive refers to a directory and not the actual resource file.Example: `<lib path="/volume/models/" />`This choice may make sense if the resource is too large for a configset in ZooKeeper.However it's up to you to somehow ensure that all nodes in your cluster have access to these resources.diff --git a/solr/solr-ref-guide/src/schema-factory.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/schema-factory.adocsimilarity index 86%rename from solr/solr-ref-guide/src/schema-factory.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/schema-factory.adocindex 3b80f3bb5d2..61843aadac4 100644--- a/solr/solr-ref-guide/src/schema-factory.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/schema-factory.adoc@@ -17,7 +17,7 @@// under the License.Solr supports two styles of schema: a managed schema and a manually maintained `schema.xml` file.-When using a managed schema, features such as the <<schema-api.adoc#,Schema API>> and <<schemaless-mode.adoc#,Schemaless Mode>> are available.+When using a managed schema, features such as the xref:indexing-guide:schema-api.adoc[] and xref:indexing-guide:schemaless-mode.adoc[] are available.When using `schema.xml`, the only way changes can be made to Solr's schema is by manually editing the file.== <schemaFactory> in solrconfig.xml@@ -46,7 +46,7 @@ When a `<schemaFactory/>` is not explicitly declared in a `solrconfig.xml` file,Using the Managed Schema is required to be able to use the Schema API to modify your schema.However, using Managed Schema does not mean you are also using Solr in Schemaless Mode (or "schema guessing" mode).-Schemaless mode requires enabling the Managed Schema if it is not already, but full schema guessing requires additional configuration as described in the section <<schemaless-mode.adoc#,Schemaless Mode>>.+Schemaless mode requires enabling the Managed Schema if it is not already, but full schema guessing requires additional configuration as described in the section xref:indexing-guide:schemaless-mode.adoc[].Below is an example of a `schemaFactory` that reflects Solr's defaults:@@ -70,7 +70,7 @@ The defaults can be overridden by explicitly configuring `ManagedIndexSchemaFactControls whether changes may be made to the schema data.This must be set to `true` to allow edits to be made with the Schema API.+-With the default configuration shown above, you could use the <<schema-api.adoc#,Schema API>> to modify the schema as much as you want, and then later change the value of `mutable` to `false` to "lock" the schema in place and prevent future changes.+With the default configuration shown above, you could use the xref:indexing-guide:schema-api.adoc[] to modify the schema as much as you want, and then later change the value of `mutable` to `false` to "lock" the schema in place and prevent future changes.`managedSchemaResourceName`::+@@ -110,7 +110,7 @@ If you look at the resulting file, you'll see this at the top of the page:<!-- Solr managed schema - automatically generated - DO NOT EDIT -->-----You are now free to use the <<schema-api.adoc#,Schema API>> to make changes, and remove the `schema.xml.bak`.+You are now free to use the xref:indexing-guide:schema-api.adoc[] to make changes, and remove the `schema.xml.bak`.=== Switching from Managed Schema to schema.xml@@ -124,10 +124,10 @@ If you have started Solr with managed schema enabled and you would like to switcIf you are using SolrCloud, you may need to modify the files via ZooKeeper.The `bin/solr` script provides an easy way to download the files from ZooKeeper and upload them back after edits.-See the section <<solr-control-script-reference.adoc#zookeeper-operations,ZooKeeper Operations>> for more information.+See the section xref:deployment-guide:solr-control-script-reference.adoc#zookeeper-operations[ZooKeeper Operations] for more information.[TIP]====To have full control over your `schema.xml` file, you may also want to disable schema guessing, which allows unknown fields to be added to the schema during indexing.-The properties that enable this feature are discussed in the section <<schemaless-mode.adoc#,Schemaless Mode>>.+The properties that enable this feature are discussed in the section xref:indexing-guide:schemaless-mode.adoc[].====diff --git a/solr/solr-ref-guide/src/script-update-processor.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/script-update-processor.adocsimilarity index 99%rename from solr/solr-ref-guide/src/script-update-processor.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/script-update-processor.adocindex d8d457c2b05..0f944b7e434 100644--- a/solr/solr-ref-guide/src/script-update-processor.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/script-update-processor.adoc@@ -35,7 +35,7 @@ The scripting update processor lives in the module `/modules/scripting`, and youJava 11 and previous versions come with a JavaScript engine called Nashorn, but Java 12 will require you to add your own JavaScript engine.Other supported scripting engines like JRuby, Jython, Groovy, all require you to add JAR files.-Learn more about adding the `modules/scripting/lib/solr-scripting-*.jar` file, and any other needed JAR files (depending on your scripting engine) into Solr's <<libs.adoc#lib-directories,Lib Directories>>.+Learn more about adding the `modules/scripting/lib/solr-scripting-*.jar` file, and any other needed JAR files (depending on your scripting engine) into Solr's xref:libs.adoc#lib-directories[Lib Directories].== Configurationdiff --git a/solr/solr-ref-guide/src/solr-modules.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/solr-modules.adocsimilarity index 84%rename from solr/solr-ref-guide/src/solr-modules.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/solr-modules.adocindex b9683b542cc..503bbe23bfe 100644--- a/solr/solr-ref-guide/src/solr-modules.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/solr-modules.adoc@@ -30,12 +30,12 @@ each module are also packaged with the module. This helps keep the main core ofThe easiest way to enable a module is to list the modules you intend to use either in thesystem property `solr.modules` or in the environment variable `SOLR_MODULES` (e.g. in`solr.in.sh`or `solr.in.cmd`). You can also add a `<str name="modules">` tag to-<<configuring-solr-xml.adoc#,solr.xml>>. The expected value is a comma separated list+xref:configuration-guide:configuring-solr-xml.adoc[solr.xml]. The expected value is a comma separated listof module names, e.g. `SOLR_MODULES=extracting,ltr`. This way of adding modules will addthem to the shared class loader, making them available for every collection in Solr.If you only wish to enable a module for a single collection, you may add `<lib>` tags to `solrconfig.xml`-as explained in <<libs.adoc#,Lib Directories>>.+as explained in xref:configuration-guide:libs.adoc[Lib Directories].-Some modules may have been made available as packages for the <<package-manager.adoc#,Package Manager>>,+Some modules may have been made available as packages for the xref:configuration-guide:package-manager.adoc[Package Manager],check by listing available pacakges.\ No newline at end of filediff --git a/solr/solr-ref-guide/src/solr-plugins.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/solr-plugins.adocsimilarity index 79%rename from solr/solr-ref-guide/src/solr-plugins.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/solr-plugins.adocindex dd2ba2c41ae..37f23688707 100644--- a/solr/solr-ref-guide/src/solr-plugins.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/solr-plugins.adoc@@ -37,12 +37,12 @@ One resource is the Solr Wiki documentation on plugins at https://cwiki.apache.oThere are essentially two types of plugins in Solr:* Collection level plugins.-These are registered on individual collections, either by hand-editing the `solrconfig.xml` or schema files for the collection's configset or by using the <<config-api.adoc#,config API>> or <<schema-api.adoc#,schema API>>.+These are registered on individual collections, either by hand-editing the `solrconfig.xml` or schema files for the collection's configset or by using the xref:config-api.adoc[] or xref:indexing-guide:schema-api.adoc[].Examples of these are query parsers, request handlers, update request processors, value source parsers, response writers etc.* Cluster level (or Core Container level) plugins.These are plugins that are installed at a cluster level and every Solr node has one instance each of these plugins.-Examples of these are <<authentication-and-authorization-plugins.adoc#,authentication and authorization plugins>>, <<metrics-reporting.adoc#reporters,metrics reporters>>, https://issues.apache.org/jira/browse/SOLR-14404[cluster level request handlers] etc.+Examples of these are xref:deployment-guide:authentication-and-authorization-plugins.adoc[], xref:deployment-guide:metrics-reporting.adoc#reporters[metrics reporters], https://issues.apache.org/jira/browse/SOLR-14404[cluster level request handlers], etc.== Installing Plugins ==@@ -57,11 +57,11 @@ The next sections describe some options:// tag::plugin-sections[][cols="1,1",frame=none,grid=none,stripes=none]|===-| <<libs.adoc#,Lib Directories>>: Plugins as libraries on the filesystem.-| <<solr-modules.adoc#,Solr Modules>>: Loading bundled modules.-| <<package-manager.adoc#,Package Management>>: Package-based plugins.-| <<cluster-plugins.adoc#,Cluster Plugins>>: Cluster-level plugins.-| <<replica-placement-plugins.adoc#,Replica Placement Plugins>>: Plugins specifically for replica placement.+| xref:libs.adoc[]: Plugins as libraries on the filesystem.+| xref:solr-modules.adoc[]: Loading bundled modules.+| xref:package-manager.adoc[]: Package-based plugins.+| xref:cluster-plugins.adoc[]: Cluster-level plugins.+| xref:replica-placement-plugins.adoc[]: Plugins specifically for replica placement.|===// end::plugin-sections[]****diff --git a/solr/solr-ref-guide/src/update-request-processors.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/update-request-processors.adocsimilarity index 96%rename from solr/solr-ref-guide/src/update-request-processors.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/update-request-processors.adocindex 1db2ffe3990..7faa3f86702 100644--- a/solr/solr-ref-guide/src/update-request-processors.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/update-request-processors.adoc@@ -138,7 +138,7 @@ For update requests this routing is implemented by the `DistributedUpdateRequestIn SolrCloud clusters, all processors in the chain _before_ the `DistributedUpdateProcessor` are run on the first node that receives an update from the client, regardless of this node's status as a leader or replica.The `DistributedUpdateProcessor` then forwards the update to the appropriate shard leader for the update (or to multiple leaders in the event of an update that affects multiple documents, such as a delete by query or commit).-The shard leader uses a transaction log to apply <<partial-document-updates.adoc#,Atomic Updates & Optimistic Concurrency>> and then forwards the update to all of the shard replicas.+The shard leader uses a transaction log to apply xref:indexing-guide:partial-document-updates.adoc[] and then forwards the update to all of the shard replicas.The leader and each replica run all of the processors in the chain that are listed _after_ the `DistributedUpdateProcessor`.For example, consider the "dedupe" chain which we saw in a section above.@@ -182,7 +182,7 @@ Otherwise the expensive computation is repeated on both the leader and replica n.Custom update chain post-processors may never be invoked on a recovering replica[WARNING]====-While a replica is in <<solrcloud-recoveries-and-write-tolerance.adoc#,recovery>>, inbound update requests are buffered to the transaction log.+While a replica is in xref:deployment-guide:solrcloud-recoveries-and-write-tolerance.adoc[recovery], inbound update requests are buffered to the transaction log.After recovery has completed successfully, those buffered update requests are replayed.As of this writing, however, custom update chain post-processors are never invoked for buffered update requests.See https://issues.apache.org/jira/browse/SOLR-8030[SOLR-8030].@@ -193,7 +193,7 @@ To work around this problem until SOLR-8030 has been fixed, *avoid specifying poIf the `AtomicUpdateProcessorFactory` is in the update chain before the `DistributedUpdateProcessor`, the incoming document to the chain will be a partial document.-Because `DistributedUpdateProcessor` is responsible for processing <<partial-document-updates.adoc#,Atomic Updates>> into full documents on the leader node, this means that pre-processors which are executed only on the forwarding nodes can only operate on the partial document.+Because `DistributedUpdateProcessor` is responsible for processing xref:indexing-guide:partial-document-updates.adoc[atomic updates] into full documents on the leader node, this means that pre-processors which are executed only on the forwarding nodes can only operate on the partial document.If you have a processor which must process a full document then the only choice is to specify it as a post-processor.@@ -275,9 +275,9 @@ In the first example, Solr will dynamically create a chain which has "signature"We can also specify a custom chain to be used by default for all requests sent to specific update handlers instead of specifying the names in request parameters for each request.-This can be done by adding either "update.chain" or "processor" and "post-processor" as default parameter for a given path which can be done either via <<initparams.adoc#,initParams>> or by adding them in a <<requesthandlers-searchcomponents.adoc#,"defaults" section>> which is supported by all request handlers.+This can be done by adding either "update.chain" or "processor" and "post-processor" as default parameter for a given path which can be done either via xref:initparams.adoc[] or by adding them in a xref:requesthandlers-searchcomponents.adoc["defaults" section] which is supported by all request handlers.-The following is an `initParam` defined in the <<schemaless-mode.adoc#,schemaless configuration>> which applies a custom update chain to all request handlers starting with "/update/".+The following is an `initParam` defined in the xref:indexing-guide:schemaless-mode.adoc[] which applies a custom update chain to all request handlers starting with "/update/"..Example initParams[source,xml]@@ -337,8 +337,8 @@ It can help to prevent unexpected problems on indexing as well as on recovering{solr-javadocs}/core/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.html[SignatureUpdateProcessorFactory]:: Uses a defined set of fields to generate a hash "signature" for the document.Useful for only indexing one copy of "similar" documents.-{solr-javadocs}/modules/scripting/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.html[ScriptUpdateProcessorFactory]:: An processor that enables the use of update processors implemented as scripts.-Learn more at the <<script-update-processor.adoc#,script update processor>> page.+{solr-javadocs}/modules/scripting/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.html[ScriptUpdateProcessorFactory]:: A processor that enables the use of update processors implemented as scripts.+Learn more in the section xref:script-update-processor.adoc[].{solr-javadocs}/core/org/apache/solr/update/processor/TemplateUpdateProcessorFactory.html[TemplateUpdateProcessorFactory]:: Allows adding new fields to documents based on a template pattern.This update processor can also be used at runtime (without defining it in `solrconfig.xml`), see the section <<templateupdateprocessorfactory>> below.@@ -413,7 +413,7 @@ The {solr-javadocs}/modules/langid/index.html[`langid`] module provides::The {solr-javadocs}/modules/analysis-extras/index.html[`analysis-extras`] module provides::{solr-javadocs}/modules/analysis-extras/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.html[OpenNLPExtractNamedEntitiesUpdateProcessorFactory]::: Update document(s) to be indexed with named entities extracted using an OpenNLP NER model.-Note that in order to use model files larger than 1MB on SolrCloud, you must either <<zookeeper-ensemble#increasing-the-file-size-limit,configure both ZooKeeper server and clients>> or <<libs.adoc#lib-directives-in-solrconfig,store the model files on the filesystem>> on each node hosting a collection replica.+Note that in order to use model files larger than 1MB on SolrCloud, you must either xref:deployment-guide:zookeeper-ensemble#increasing-the-file-size-limit[configure both ZooKeeper server and clients] or xref:libs.adoc#lib-directives-in-solrconfig[store the model files on the filesystem] on each node hosting a collection replica.=== Update Processor Factories You Should _Not_ Modify or Removediff --git a/solr/solr-ref-guide/src/v2-api.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/v2-api.adocsimilarity index 100%rename from solr/solr-ref-guide/src/v2-api.adocrename to solr/solr-ref-guide/modules/configuration-guide/pages/v2-api.adocdiff --git a/solr/solr-ref-guide/modules/deployment-guide/deployment-nav.adoc b/solr/solr-ref-guide/modules/deployment-guide/deployment-nav.adocnew file mode 100644index 00000000000..2baea0ac0d8--- /dev/null+++ b/solr/solr-ref-guide/modules/deployment-guide/deployment-nav.adoc@@ -0,0 +1,76 @@+.Deployment Guide++* xref:solr-control-script-reference.adoc[]++* Installation & Deployment+** xref:system-requirements.adoc[]+** xref:installing-solr.adoc[]+** xref:taking-solr-to-production.adoc[]+** xref:jvm-settings.adoc[]+** xref:upgrading-a-solr-cluster.adoc[]+*** xref:indexupgrader-tool.adoc[]+** xref:backup-restore.adoc[]+** xref:solr-in-docker.adoc[]+*** xref:docker-faq.adoc[]+*** xref:docker-networking.adoc[]+** xref:solr-on-hdfs.adoc[]++* Scaling Solr+** xref:cluster-types.adoc[]+** User-Managed Clusters+*** xref:user-managed-index-replication.adoc[]+*** xref:user-managed-distributed-search.adoc[]+** SolrCloud Clusters+*** xref:solrcloud-shards-indexing.adoc[]+*** xref:solrcloud-recoveries-and-write-tolerance.adoc[]+*** xref:solrcloud-distributed-requests.adoc[]+*** xref:node-roles.adoc[]+*** xref:aliases.adoc[]+*** Collections API+**** xref:cluster-node-management.adoc[]+**** xref:collection-management.adoc[]+**** xref:shard-management.adoc[]+**** xref:replica-management.adoc[]+**** xref:alias-management.adoc[]+*** ZooKeeper Configuration+**** xref:zookeeper-ensemble.adoc[]+**** xref:zookeeper-file-management.adoc[]+**** xref:zookeeper-utilities.adoc[]+**** xref:solrcloud-with-legacy-configuration-files.adoc[]+*** Admin UI+**** xref:collections-core-admin.adoc[]+**** xref:cloud-screens.adoc[]++* Monitoring Solr+** xref:configuring-logging.adoc[]+** xref:ping.adoc[]+** xref:metrics-reporting.adoc[]+** xref:performance-statistics-reference.adoc[]+** xref:plugins-stats-screen.adoc[]+** xref:mbean-request-handler.adoc[]+** xref:monitoring-with-prometheus-and-grafana.adoc[]+** xref:jmx-with-solr.adoc[]+** xref:thread-dump.adoc[]+** xref:distributed-tracing.adoc[]+** xref:circuit-breakers.adoc[]+** xref:rate-limiters.adoc[]+** xref:task-management.adoc[]++* xref:securing-solr.adoc[]+** xref:authentication-and-authorization-plugins.adoc[]+*** xref:basic-authentication-plugin.adoc[]+*** xref:kerberos-authentication-plugin.adoc[]+*** xref:jwt-authentication-plugin.adoc[]+*** xref:cert-authentication-plugin.adoc[]+*** xref:hadoop-authentication-plugin.adoc[]+*** xref:rule-based-authorization-plugin.adoc[]+** xref:audit-logging.adoc[]+** xref:enabling-ssl.adoc[]+** xref:zookeeper-access-control.adoc[]+** xref:security-ui.adoc[]++* xref:client-apis.adoc[]+** xref:solrj.adoc[]+** xref:javascript.adoc[]+** xref:python.adoc[]+** xref:ruby.adoc[]diff --git a/solr/solr-ref-guide/modules/deployment-guide/examples/UsingSolrJRefGuideExamplesTest.java b/solr/solr-ref-guide/modules/deployment-guide/examples/UsingSolrJRefGuideExamplesTest.javanew file mode 120000index 00000000000..04f64eb3d0f--- /dev/null+++ b/solr/solr-ref-guide/modules/deployment-guide/examples/UsingSolrJRefGuideExamplesTest.java@@ -0,0 +1 @@+../../../../solrj/src/test/org/apache/solr/client/ref_guide_examples/UsingSolrJRefGuideExamplesTest.java\ No newline at end of filediff --git a/solr/solr-ref-guide/modules/deployment-guide/examples/ZkConfigFilesTest.java b/solr/solr-ref-guide/modules/deployment-guide/examples/ZkConfigFilesTest.javanew file mode 120000index 00000000000..3179a82978a--- /dev/null+++ b/solr/solr-ref-guide/modules/deployment-guide/examples/ZkConfigFilesTest.java@@ -0,0 +1 @@+../../../../solrj/src/test/org/apache/solr/client/ref_guide_examples/ZkConfigFilesTest.java\ No newline at end of filediff --git a/solr/solr-ref-guide/src/images/cloud-screens/cloud-graph.png b/solr/solr-ref-guide/modules/deployment-guide/images/cloud-screens/cloud-graph.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/cloud-screens/cloud-graph.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/cloud-screens/cloud-graph.pngdiff --git a/solr/solr-ref-guide/src/images/cloud-screens/cloud-hover.png b/solr/solr-ref-guide/modules/deployment-guide/images/cloud-screens/cloud-hover.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/cloud-screens/cloud-hover.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/cloud-screens/cloud-hover.pngdiff --git a/solr/solr-ref-guide/src/images/cloud-screens/cloud-nodes.png b/solr/solr-ref-guide/modules/deployment-guide/images/cloud-screens/cloud-nodes.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/cloud-screens/cloud-nodes.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/cloud-screens/cloud-nodes.pngdiff --git a/solr/solr-ref-guide/src/images/cloud-screens/cloud-tree.png b/solr/solr-ref-guide/modules/deployment-guide/images/cloud-screens/cloud-tree.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/cloud-screens/cloud-tree.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/cloud-screens/cloud-tree.pngdiff --git a/solr/solr-ref-guide/src/images/cloud-screens/cloud-zkstatus.png b/solr/solr-ref-guide/modules/deployment-guide/images/cloud-screens/cloud-zkstatus.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/cloud-screens/cloud-zkstatus.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/cloud-screens/cloud-zkstatus.pngdiff --git a/solr/solr-ref-guide/src/images/collections-core-admin/DeleteShard.png b/solr/solr-ref-guide/modules/deployment-guide/images/collections-core-admin/DeleteShard.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/collections-core-admin/DeleteShard.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/collections-core-admin/DeleteShard.pngdiff --git a/solr/solr-ref-guide/src/images/collections-core-admin/collection-admin.png b/solr/solr-ref-guide/modules/deployment-guide/images/collections-core-admin/collection-admin.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/collections-core-admin/collection-admin.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/collections-core-admin/collection-admin.pngdiff --git a/solr/solr-ref-guide/src/images/configuring-logging/level_menu.png b/solr/solr-ref-guide/modules/deployment-guide/images/configuring-logging/level_menu.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/configuring-logging/level_menu.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/configuring-logging/level_menu.pngdiff --git a/solr/solr-ref-guide/src/images/configuring-logging/logging.png b/solr/solr-ref-guide/modules/deployment-guide/images/configuring-logging/logging.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/configuring-logging/logging.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/configuring-logging/logging.pngdiff --git a/solr/solr-ref-guide/src/images/distributed-tracing/query-request-tracing.png b/solr/solr-ref-guide/modules/deployment-guide/images/distributed-tracing/query-request-tracing.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/distributed-tracing/query-request-tracing.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/distributed-tracing/query-request-tracing.pngdiff --git a/solr/solr-ref-guide/src/images/installing-solr/SolrAdminDashboard.png b/solr/solr-ref-guide/modules/deployment-guide/images/installing-solr/SolrAdminDashboard.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/installing-solr/SolrAdminDashboard.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/installing-solr/SolrAdminDashboard.pngdiff --git a/solr/solr-ref-guide/src/images/jvm-settings/javaproperties.png b/solr/solr-ref-guide/modules/deployment-guide/images/jvm-settings/javaproperties.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jvm-settings/javaproperties.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/jvm-settings/javaproperties.pngdiff --git a/solr/solr-ref-guide/src/images/monitoring-with-prometheus-and-grafana/grafana-solr-dashboard.png b/solr/solr-ref-guide/modules/deployment-guide/images/monitoring-with-prometheus-and-grafana/grafana-solr-dashboard.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/monitoring-with-prometheus-and-grafana/grafana-solr-dashboard.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/monitoring-with-prometheus-and-grafana/grafana-solr-dashboard.pngdiff --git a/solr/solr-ref-guide/src/images/monitoring-with-prometheus-and-grafana/prometheus-solr-ping.png b/solr/solr-ref-guide/modules/deployment-guide/images/monitoring-with-prometheus-and-grafana/prometheus-solr-ping.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/monitoring-with-prometheus-and-grafana/prometheus-solr-ping.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/monitoring-with-prometheus-and-grafana/prometheus-solr-ping.pngdiff --git a/solr/solr-ref-guide/src/images/monitoring-with-prometheus-and-grafana/solr-exporter-diagram.png b/solr/solr-ref-guide/modules/deployment-guide/images/monitoring-with-prometheus-and-grafana/solr-exporter-diagram.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/monitoring-with-prometheus-and-grafana/solr-exporter-diagram.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/monitoring-with-prometheus-and-grafana/solr-exporter-diagram.pngdiff --git a/solr/solr-ref-guide/src/images/ping/ping.png b/solr/solr-ref-guide/modules/deployment-guide/images/ping/ping.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/ping/ping.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/ping/ping.pngdiff --git a/solr/solr-ref-guide/src/images/plugins-stats-screen/plugin-searcher.png b/solr/solr-ref-guide/modules/deployment-guide/images/plugins-stats-screen/plugin-searcher.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/plugins-stats-screen/plugin-searcher.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/plugins-stats-screen/plugin-searcher.pngdiff --git a/solr/solr-ref-guide/src/images/security-ui/add-permission.png b/solr/solr-ref-guide/modules/deployment-guide/images/security-ui/add-permission.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/security-ui/add-permission.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/security-ui/add-permission.pngdiff --git a/solr/solr-ref-guide/src/images/security-ui/edit-user-dialog.png b/solr/solr-ref-guide/modules/deployment-guide/images/security-ui/edit-user-dialog.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/security-ui/edit-user-dialog.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/security-ui/edit-user-dialog.pngdiff --git a/solr/solr-ref-guide/src/images/security-ui/filter-users.png b/solr/solr-ref-guide/modules/deployment-guide/images/security-ui/filter-users.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/security-ui/filter-users.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/security-ui/filter-users.pngdiff --git a/solr/solr-ref-guide/src/images/security-ui/permissions.png b/solr/solr-ref-guide/modules/deployment-guide/images/security-ui/permissions.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/security-ui/permissions.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/security-ui/permissions.pngdiff --git a/solr/solr-ref-guide/src/images/security-ui/roles.png b/solr/solr-ref-guide/modules/deployment-guide/images/security-ui/roles.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/security-ui/roles.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/security-ui/roles.pngdiff --git a/solr/solr-ref-guide/src/images/security-ui/security-not-enabled-warn.png b/solr/solr-ref-guide/modules/deployment-guide/images/security-ui/security-not-enabled-warn.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/security-ui/security-not-enabled-warn.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/security-ui/security-not-enabled-warn.pngdiff --git a/solr/solr-ref-guide/src/images/security-ui/users.png b/solr/solr-ref-guide/modules/deployment-guide/images/security-ui/users.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/security-ui/users.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/security-ui/users.pngdiff --git a/solr/solr-ref-guide/src/images/thread-dump/thread_dump_1.png b/solr/solr-ref-guide/modules/deployment-guide/images/thread-dump/thread_dump_1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/thread-dump/thread_dump_1.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/thread-dump/thread_dump_1.pngdiff --git a/solr/solr-ref-guide/src/images/thread-dump/thread_dump_2.png b/solr/solr-ref-guide/modules/deployment-guide/images/thread-dump/thread_dump_2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/thread-dump/thread_dump_2.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/thread-dump/thread_dump_2.pngdiff --git a/solr/solr-ref-guide/src/images/user-managed-index-replication/replication.png b/solr/solr-ref-guide/modules/deployment-guide/images/user-managed-index-replication/replication.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/user-managed-index-replication/replication.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/user-managed-index-replication/replication.pngdiff --git a/solr/solr-ref-guide/src/images/user-managed-index-replication/user-managed-replication.png b/solr/solr-ref-guide/modules/deployment-guide/images/user-managed-index-replication/user-managed-replication.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/user-managed-index-replication/user-managed-replication.pngrename to solr/solr-ref-guide/modules/deployment-guide/images/user-managed-index-replication/user-managed-replication.pngdiff --git a/solr/solr-ref-guide/src/alias-management.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/alias-management.adocsimilarity index 95%rename from solr/solr-ref-guide/src/alias-management.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/alias-management.adocindex 1e57f51bfb4..15fdc27912e 100644--- a/solr/solr-ref-guide/src/alias-management.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/alias-management.adoc@@ -25,7 +25,7 @@ Some use cases for collection aliasing:* Time series data* Reindexing content behind the scenes-For an overview of aliases in Solr, see the section <<aliases.adoc#,Aliases>>.+For an overview of aliases in Solr, see the section xref:aliases.adoc[].[[createalias]]== CREATEALIAS: Create or Modify an Alias for a Collection@@ -46,7 +46,7 @@ While it is possible to send updates to an alias spanning multiple collections,*Routed aliases* are aliases with additional capabilities to act as a kind of super-collection that route updates to the correct collection.Routing is data driven and may be based on a temporal field or on categories specified in a field (normally string based).-See <<aliases.adoc#routed-aliases,Routed Aliases>> for some important high-level information before getting started.+See xref:aliases.adoc#routed-aliases[Routed Aliases] for some important high-level information before getting started.[source,text]----@@ -92,7 +92,7 @@ It must therefore adhere to normal requirements for collection naming.|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].==== Standard Alias Parameters@@ -123,7 +123,7 @@ s|Required |Default: noneThe type of routing to use.Presently only `time` and `category` and `Dimensional[]` are valid.+-In the case of a multi dimensional routed alias (aka "DRA", see <<aliases.adoc#dimensional-routed-aliases,Aliases>>), it is required to express all the dimensions in the same order that they will appear in the dimension+In the case of a xref:aliases.adoc#dimensional-routed-aliases[multi-dimensional routed alias] (aka "DRA"), it is required to express all the dimensions in the same order that they will appear in the dimensionarray.The format for a DRA `router.name` is `Dimensional[dim1,dim2]` where `dim1` and `dim2` are valid `router.name` values for each sub-dimension.Note that DRA's are very new, and only 2D DRA's are presently supported.@@ -147,7 +147,7 @@ This field is required on all incoming documents.|Optional |Default: none|===+-The `*` wildcard can be replaced with any parameter from the <<collection-management.adoc#create,CREATE>> command except `name`.+The `*` wildcard can be replaced with any parameter from the xref:collection-management.adoc#create[CREATE] command except `name`.All other fields are identical in requirements and naming except that we insist that the configset be explicitly specified.The configset must be created beforehand, either uploaded or copied and modified.It's probably a bad idea to use "data driven" mode as schema mutations might happen concurrently leading to errors.@@ -161,7 +161,7 @@ It's probably a bad idea to use "data driven" mode as schema mutations might haps|Required |Default: none|===+-The start date/time of data for this time routed alias in Solr's standard date/time format (i.e., ISO-8601 or "NOW" optionally with <<date-formatting-math.adoc#date-math,date math>>).+The start date/time of data for this time routed alias in Solr's standard date/time format (i.e., ISO-8601 or "NOW" optionally with xref:indexing-guide:date-formatting-math.adoc#date-math[date math]).+The first collection created for the alias will be internally named after this value.If a document is submitted with an earlier value for `router.field` then the earliest collection the alias points to then it will yield an error since it can't be routed.@@ -680,7 +680,7 @@ A dictionary of name/value pairs of properties to be set.|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].=== ALIASPROP Response@@ -738,7 +738,7 @@ The name of the alias to delete.|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].=== DELETEALIAS Responsediff --git a/solr/solr-ref-guide/src/aliases.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/aliases.adocsimilarity index 91%rename from solr/solr-ref-guide/src/aliases.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/aliases.adocindex 7a2c5128b41..cea787cf640 100644--- a/solr/solr-ref-guide/src/aliases.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/aliases.adoc@@ -32,15 +32,15 @@ In other cases update commands are rejected with an error since there is no logi== Standard Aliases-Standard aliases are created and updated using the <<alias-management.adoc#createalias,CREATEALIAS>> command.+Standard aliases are created and updated using the xref:alias-management.adoc#createalias[CREATEALIAS] command.-The current list of collections that are members of an alias can be verified via the <<cluster-node-management.adoc#clusterstatus,CLUSTERSTATUS>> command.+The current list of collections that are members of an alias can be verified via the xref:cluster-node-management.adoc#clusterstatus[CLUSTERSTATUS] command.-The full definition of all aliases including metadata about that alias (in the case of routed aliases, see below) can be verified via the <<alias-management.adoc#listaliases,LISTALIASES>> command.+The full definition of all aliases including metadata about that alias (in the case of routed aliases, see below) can be verified via the xref:alias-management.adoc#listaliases[LISTALIASES] command.-Alternatively this information is available by checking `/aliases.json` in ZooKeeper with either the native ZooKeeper client or in the <<cloud-screens.adoc#tree-view,tree page>> of the cloud menu in the admin UI.+Alternatively this information is available by checking `/aliases.json` in ZooKeeper with either the native ZooKeeper client or in the xref:cloud-screens.adoc#tree-view[tree page] of the cloud menu in the admin UI.-Aliases may be deleted via the <<alias-management.adoc#deletealias,DELETEALIAS>> command.+Aliases may be deleted via the xref:alias-management.adoc#deletealias[DELETEALIAS] command.When deleting an alias, underlying collections are *unaffected*.[TIP]@@ -48,7 +48,7 @@ When deleting an alias, underlying collections are *unaffected*.Any alias (standard or routed) that references multiple collections may complicate relevancy.By default, SolrCloud scores documents on a per-shard basis.-With multiple collections in an alias this is always a problem, so if you have a use case for which BM25 or TF/IDF relevancy is important you will want to turn on one of the <<solrcloud-distributed-requests.adoc#distributedidf,ExactStatsCache>> implementations.+With multiple collections in an alias this is always a problem, so if you have a use case for which BM25 or TF/IDF relevancy is important you will want to turn on one of the xref:solrcloud-distributed-requests.adoc#distributedidf[ExactStatsCache] implementations.However, for analytical use cases where results are sorted on numeric, date, or alphanumeric field values, rather than relevancy calculations, this is not a problem.====@@ -59,7 +59,7 @@ To address the update limitations associated with standard aliases and provide aThere are presently two types of routed alias: time routed and category routed.These are described in detail below, but share some common behavior.-When processing an update for a routed alias, Solr initializes its <<update-request-processors.adoc#,UpdateRequestProcessor>> chain as usual, but when `DistributedUpdateProcessor` (DUP) initializes, it detects that the update targets a routed alias and injects `RoutedAliasUpdateProcessor` (RAUP) in front of itself.+When processing an update for a routed alias, Solr initializes its xref:configuration-guide:update-request-processors.adoc[] chain as usual, but when `DistributedUpdateProcessor` (DUP) initializes, it detects that the update targets a routed alias and injects `RoutedAliasUpdateProcessor` (RAUP) in front of itself.RAUP, in coordination with the Overseer, is the main part of a routed alias, and must immediately precede DUP.It is not possible to configure custom chains with other types of UpdateRequestProcessors between RAUP and DUP.@@ -72,7 +72,7 @@ WARNING: It's extremely important with all routed aliases that the route valuesReindexing a document with a different route value for the same ID produces two distinct documents with the same ID accessible via the alias.All query time behavior of the routed alias is *_undefined_* and not easily predictable once duplicate ID's exist.-CAUTION: It is a bad idea to use "data driven" mode (aka <<schemaless-mode.adoc#,schemaless-mode>>) with routed aliases, as duplicate schema mutations might happen concurrently leading to errors.+CAUTION: It is a bad idea to use "data driven" mode (aka xref:indexing-guide:schemaless-mode.adoc[]) with routed aliases, as duplicate schema mutations might happen concurrently leading to errors.=== Time Routed Aliases@@ -86,8 +86,8 @@ If you need to store a lot of timestamped data in Solr, such as logs or IoT sens==== How It Works-First you create a time routed aliases using the <<alias-management.adoc#createalias,CREATEALIAS>> command with the desired router settings.-Most of the settings are editable at a later time using the <<alias-management.adoc#aliasprop,ALIASPROP>> command.+First you create a time routed aliases using the xref:alias-management.adoc#createalias[CREATEALIAS] command with the desired router settings.+Most of the settings are editable at a later time using the xref:alias-management.adoc#aliasprop[ALIASPROP] command.The first collection will be created automatically, along with an alias pointing to it.Each underlying Solr "core" in a collection that is a member of a TRA has a special core property referencing the alias.@@ -115,7 +115,7 @@ Each time a new collection is added, the oldest collections in the TRA are examiAll this happens synchronously, potentially adding seconds to the update request and indexing latency.+If `router.preemptiveCreateMath` is configured and if the document arrives within this window then it will occur asynchronously.-See <<alias-management.adoc#time-routed-alias-parameters,Time Routed Alias Parameters>> for more information.+See xref:alias-management.adoc#time-routed-alias-parameters[Time Routed Alias Parameters] for more information.Any other type of update like a commit or delete is routed by RAUP to all collections.Generally speaking, this is not a performance concern.@@ -145,15 +145,15 @@ This approach allows for simplified indexing of data that must be segregated int==== How It Works-First you create a category routed alias using the <<alias-management.adoc#createalias,CREATEALIAS>> command with the desired router settings.-Most of the settings are editable at a later time using the <<alias-management.adoc#aliasprop,ALIASPROP>> command.+First you create a category routed alias using the xref:alias-management.adoc#createalias[CREATEALIAS] command with the desired router settings.+Most of the settings are editable at a later time using the xref:alias-management.adoc#aliasprop[ALIASPROP] command.The alias will be created with a special place-holder collection which will always be named `myAlias\__CRA__NEW_CATEGORY_ROUTED_ALIAS_WAITING_FOR_DATA\__TEMP`.The first document indexed into the CRA will create a second collection named `myAlias__CRA__foo` (for a routed field value of `foo`).The second document indexed will cause the temporary place holder collection to be deleted.Thereafter collections will be created whenever a new value for the field is encountered.-CAUTION: To guard against runaway collection creation options for limiting the total number of categories, and for rejecting values that don't match, a regular expression parameter is provided (see <<alias-management.adoc#category-routed-alias-parameters,Category Routed Alias Parameters>> for details).+CAUTION: To guard against runaway collection creation options for limiting the total number of categories, and for rejecting values that don't match, a regular expression parameter is provided (see xref:alias-management.adoc#category-routed-alias-parameters[Category Routed Alias Parameters] for details).+Note that by providing very large or very permissive values for these options you are accepting the risk that garbled data could potentially create thousands of collections and bring your cluster to a grinding halt.@@ -223,7 +223,7 @@ More dimensions will be supported in the future (see https://issues.apache.org/j==== How It WorksFirst you create a dimensional routed alias with the desired router settings for each dimension.-See the <<alias-management.adoc#createalias,CREATEALIAS>> command documentation for details on how to specify the per-dimension configuration.+See the xref:alias-management.adoc#createalias[CREATEALIAS] command documentation for details on how to specify the per-dimension configuration.Typical collection names will be of the form (example is for category x time example, with 30 minute intervals):[source,text]@@ -314,7 +314,7 @@ If a new category is introduced at a later date and indexing latency is an impor* If the number of extra time slices to be created is not very large, then sending a single document out of band from regular indexing, and waiting for collection creation to complete before allowing the new category to be sent via the SLA constrained process.-* If the above procedure is likely to create an extreme number of collections, and the earliest possible document in the new category is known, the start time for the time dimension may be adjusted using the <<alias-management.adoc#aliasprop,ALIASPROP>> command+* If the above procedure is likely to create an extreme number of collections, and the earliest possible document in the new category is known, the start time for the time dimension may be adjusted using the xref:alias-management.adoc#aliasprop[ALIASPROP] command=== Improvement Possibilitiesdiff --git a/solr/solr-ref-guide/src/audit-logging.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/audit-logging.adocsimilarity index 100%rename from solr/solr-ref-guide/src/audit-logging.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/audit-logging.adocdiff --git a/solr/solr-ref-guide/src/authentication-and-authorization-plugins.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/authentication-and-authorization-plugins.adocsimilarity index 96%rename from solr/solr-ref-guide/src/authentication-and-authorization-plugins.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/authentication-and-authorization-plugins.adocindex 8cd2002b4dc..edbf2ee55ac 100644--- a/solr/solr-ref-guide/src/authentication-and-authorization-plugins.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/authentication-and-authorization-plugins.adoc@@ -100,12 +100,12 @@ Then use the `bin/solr zk` command to upload the file:>bin/solr zk cp ./security.json zk:security.json -z localhost:2181-----NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see <<zookeeper-ensemble#updating-solr-include-files,instructions>>) you can omit `-z <zk host string>` from the above command.+NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see xref:zookeeper-ensemble.adoc#updating-solr-include-files[Updating Solr Include Files]) you can omit `-z <zk host string>` from the above command.[WARNING]====Whenever you use any security plugins and store `security.json` in ZooKeeper, we highly recommend that you implement access control in your ZooKeeper nodes.-Information about how to enable this is available in the section <<zookeeper-access-control.adoc#,ZooKeeper Access Control>>.+Information about how to enable this is available in the section xref:zookeeper-access-control.adoc[].====Once `security.json` has been uploaded to ZooKeeper, you should use the appropriate APIs for the plugins you're using to update it.@@ -191,8 +191,8 @@ The Admin UI is an AngularJS application running inside your browser, and is treWhen authentication is required the Admin UI will presented you with a login dialogue.The authentication plugins currently supported by the Admin UI are:-* <<basic-authentication-plugin.adoc#,Basic Authentication Plugin>>-* <<jwt-authentication-plugin.adoc#,JWT Authentication Plugin>>+* xref:basic-authentication-plugin.adoc[]+* xref:jwt-authentication-plugin.adoc[]If your plugin of choice is not supported, the Admin UI will still let you perform unrestricted operations, while for restricted operations you will need to interact with Solr by sending HTTP requests instead of through the graphical user interface of the Admin UI.All operations supported by Admin UI can be performed through Solr's APIs.diff --git a/solr/solr-ref-guide/src/backup-restore.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/backup-restore.adocsimilarity index 94%rename from solr/solr-ref-guide/src/backup-restore.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/backup-restore.adocindex 9a5117c0ac4..c6eef7ad283 100644--- a/solr/solr-ref-guide/src/backup-restore.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/backup-restore.adoc@@ -24,7 +24,7 @@ If you run a user-managed cluster or a single-node installation, you will use th[NOTE]====-Backups (and Snapshots) capture data that has been <<commits-transaction-logs.adoc#hard-commits-vs-soft-commits,hard committed>>.+Backups (and Snapshots) capture data that has been xref:configuration-guide:commits-transaction-logs.adoc#hard-commits-vs-soft-commits[hard committed].Committing changes using `softCommit=true` may result in changes that are visible in search results but not included in subsequent backups.Likewise, committing changes using `openSearcher=false` may result in changes committed to disk and included in subsequent backups, even if they are not currently visible in search results.@@ -32,7 +32,7 @@ Likewise, committing changes using `openSearcher=false` may result in changes co== SolrCloud Clusters-Support for backups in SolrCloud is provided with the <<collection-management.adoc#,Collections API>>.+Support for backups in SolrCloud is provided with the xref:collection-management.adoc#backup[Collections API].This allows the backups to be generated across multiple shards, and restored to the same number of shards and replicas as the original collection.NOTE: SolrCloud Backup/Restore requires a shared file system mounted at the same path on all nodes, or HDFS.@@ -40,20 +40,20 @@ NOTE: SolrCloud Backup/Restore requires a shared file system mounted at the sameFour different API commands are supported:* `action=BACKUP`: This command backs up Solr indexes and configurations.-More information is available in the section <<collection-management.adoc#backup,Backup Collection>>.+More information is available in the section xref:collection-management.adoc#backup[Backup Collection].* `action=RESTORE`: This command restores Solr indexes and configurations.-More information is available in the section <<collection-management.adoc#restore,Restore Collection>>.+More information is available in the section xref:collection-management.adoc#restore[Restore Collection].* `action=LISTBACKUP`: This command lists the backup points available at a specified location, displaying metadata for each.-More information is available in the section <<collection-management.adoc#listbackup,List Backups>>.+More information is available in the section xref:collection-management.adoc#listbackup[List Backups].* `action=DELETEBACKUP`: This command allows deletion of backup files or whole backups.-More information is available in the section <<collection-management.adoc#deletebackup,Delete Backups>>.+More information is available in the section xref:collection-management.adoc#deletebackup[Delete Backups].== User-Managed Clusters and Single-Node InstallationsBackups and restoration uses Solr's replication handler.Out of the box, Solr includes implicit support for replication so this API can be used.Configuration of the replication handler can, however, be customized by defining your own replication handler in `solrconfig.xml`.-For details on configuring the replication handler, see the section <<user-managed-index-replication.adoc#configuring-the-replicationhandler,Configuring the ReplicationHandler>>.+For details on configuring the replication handler, see the section xref:user-managed-index-replication.adoc#configuring-the-replicationhandler[Configuring the ReplicationHandler].=== Backup API@@ -105,7 +105,7 @@ If a name is not specified then the directory name will have the following formaThe number of backups to keep.If `maxNumberOfBackups` has been specified on the replication handler in `solrconfig.xml`, `maxNumberOfBackups` is always used and attempts to use `numberToKeep` will cause an error.Also, this parameter is not taken into consideration if the backup name is specified.-More information about `maxNumberOfBackups` can be found in the section <<user-managed-index-replication.adoc#configuring-the-replicationhandler,Configuring the ReplicationHandler>>.+More information about `maxNumberOfBackups` can be found in the section xref:user-managed-index-replication.adoc#configuring-the-replicationhandler[Configuring the ReplicationHandler].`repository`::+@@ -401,7 +401,9 @@ An example configuration using this property can be found below.=== HdfsBackupRepository-Stores and retrieves backup files from HDFS directories. This plugin must first be <<solr-plugins.adoc#installing-plugins,installed>> before using.+Stores and retrieves backup files from HDFS directories.+This is provided in the `hdfs` xref:configuration-guide:solr-modules.adoc[Solr Module].+This plugin must first be xref:configuration-guide:solr-plugins.adoc#installing-plugins[installed] before using.HdfsBackupRepository accepts the following configuration options:@@ -459,7 +461,9 @@ An example configuration using these properties can be found below:=== GCSBackupRepository-Stores and retrieves backup files in a Google Cloud Storage ("GCS") bucket. This plugin must first be <<solr-plugins.adoc#installing-plugins,installed>> before using.+Stores and retrieves backup files in a Google Cloud Storage ("GCS") bucket.+This is provided in the `gcs-repository` xref:configuration-guide:solr-modules.adoc[Solr Module].+This plugin must first be xref:configuration-guide:solr-plugins.adoc#installing-plugins[installed] before using.GCSBackupRepository accepts the following options for overall configuration:@@ -658,7 +662,8 @@ An example configuration using the overall and GCS-client properties can be seen=== S3BackupRepositoryStores and retrieves backup files in an Amazon S3 bucket.-This plugin must first be <<solr-plugins.adoc#installing-plugins,installed>> before using.+This is provided in the `s3-repository` xref:configuration-guide:solr-modules.adoc[Solr Module].+This plugin must first be xref:configuration-guide:solr-plugins.adoc#installing-plugins[installed] before using.This plugin uses the https://docs.aws.amazon.com/sdk-for-java/v2/developer-guide/credentials.html[default AWS credentials provider chain], so ensure that your credentials are set appropriately (e.g., via env var, or in `~/.aws/credentials`, etc.).diff --git a/solr/solr-ref-guide/src/basic-authentication-plugin.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/basic-authentication-plugin.adocsimilarity index 94%rename from solr/solr-ref-guide/src/basic-authentication-plugin.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/basic-authentication-plugin.adocindex 7f5baba5154..e649f4a51a2 100644--- a/solr/solr-ref-guide/src/basic-authentication-plugin.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/basic-authentication-plugin.adoc@@ -19,12 +19,12 @@Solr can support Basic authentication for users with the use of the `BasicAuthPlugin`.This plugin only provides user authentication.-To control user permissions, you may need to configure an authorization plugin as described in the section <<rule-based-authorization-plugin.adoc#,Rule-Based Authorization Plugin>>.+To control user permissions, you may need to configure an authorization plugin as described in the section xref:rule-based-authorization-plugin.adoc[].== Enable Basic AuthenticationTo use Basic authentication, you must first create a `security.json` file.-This file and where to put it is described in detail in the section <<authentication-and-authorization-plugins.adoc#configuring-security-json,Configuring security.json>>.+This file and where to put it is described in detail in the section xref:authentication-and-authorization-plugins.adoc#configuring-security-json[Configuring security.json].If running in cloud mode, you can use the `bin/solr auth` command-line utility to enable security for a new installation, see: `bin/solr auth --help` for more details.@@ -70,7 +70,7 @@ However, you will want to ensure that `blockUnknown` is set to `true` or omitted[WARNING]====If you set `blockUnknown` to `false`, then *any* request that is not explicitly protected by a permission will be accessible to anonymous users!-Consequently, you should define a role binding for every <<rule-based-authorization-plugin.adoc#permissions,predefined>> permission you want to protect.+Consequently, you should define a role binding for every xref:rule-based-authorization-plugin.adoc#permissions[predefined permission] you want to protect.You can assign the special `role: null` binding for requests that you want to allow anonymous users to access. To protect all endpoints except those with `role:null`,you can add a role binding for the `all` permission and place it in the last position in `security.json`.====@@ -78,14 +78,14 @@ you can add a role binding for the `all` permission and place it in the last posIf `realm` is not defined, it will default to `solr`.If you are using SolrCloud, you must upload `security.json` to ZooKeeper.-An example command and more information about securing your setup can be found at <<authentication-and-authorization-plugins#in-a-solrcloud-cluster,Authentication and Authorization Plugins In a SolrCloud Cluster>>.+An example command and more information about securing your setup can be found at xref:authentication-and-authorization-plugins#in-a-solrcloud-cluster[Authentication and Authorization Plugins In a SolrCloud Cluster].=== CaveatsThere are a few things to keep in mind when using the Basic authentication plugin.* Credentials are sent in plain text by default.-It's recommended to use SSL for communication when Basic authentication is enabled, as described in the section <<enabling-ssl.adoc#,Enabling SSL>>.+It's recommended to use SSL for communication when Basic authentication is enabled, as described in the section xref:enabling-ssl.adoc[].* A user who has access to write permissions to `security.json` will be able to modify all permissions and user permission assignments.Special care should be taken to only grant access to editing security to appropriate users.@@ -96,7 +96,7 @@ Even with Basic authentication enabled, you should not unnecessarily expose Solr== Combining Basic Authentication with Other Schemes:experimental:-When using other authentication schemes, such as the <<jwt-authentication-plugin.adoc#,JWT Authentication Plugin>>, you may still want to use Basic authentication for a small set of "service account" oriented client applications.+When using other authentication schemes, such as the xref:jwt-authentication-plugin.adoc[], you may still want to use Basic authentication for a small set of "service account" oriented client applications.Solr provides the `MultiAuthPlugin` to support multiple authentication schemes. For example, you may want to integrate Solr with an OIDC provider for user accounts,but also use Basic for authenticating requests coming from the Prometheus metrics exporter. The `MultiAuthPlugin` uses the scheme of the `Authorization` header to determine whichplugin should handle each request. The `MultiAuthPlugin` is useful when running Solr on Kubernetes as you can delegate user management and authentication to an OIDC provider for end-users,diff --git a/solr/solr-ref-guide/src/cert-authentication-plugin.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/cert-authentication-plugin.adocsimilarity index 92%rename from solr/solr-ref-guide/src/cert-authentication-plugin.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/cert-authentication-plugin.adocindex 1c968bda55b..681388e21bf 100644--- a/solr/solr-ref-guide/src/cert-authentication-plugin.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/cert-authentication-plugin.adoc@@ -36,7 +36,7 @@ An example `security.json` is shown below:=== Certificate ValidationParts of certificate validation, including verifying the trust chain and peer hostname/ip address will be done by the web servlet container before the request ever reaches the authentication plugin.-These checks are described in the <<enabling-ssl.adoc#,Enabling SSL>> section.+These checks are described in the xref:enabling-ssl.adoc[] section.This plugin provides no additional checking beyond what has been configured via SSL properties.@@ -58,4 +58,4 @@ It is best practice to verify the actual contents of certificates issued by your== Using Certificate Auth with Clients (including SolrJ)With certificate authentication enabled, all client requests must include a valid certificate.-This is identical to the <<enabling-ssl.adoc#example-client-actions,client requirements>> when using SSL.+This is identical to the xref:enabling-ssl.adoc#example-client-actions[client requirements] when using SSL.diff --git a/solr/solr-ref-guide/src/circuit-breakers.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adocsimilarity index 100%rename from solr/solr-ref-guide/src/circuit-breakers.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adocdiff --git a/solr/solr-ref-guide/src/client-apis.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/client-apis.adocsimilarity index 89%rename from solr/solr-ref-guide/src/client-apis.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/client-apis.adocindex f47d9a1ab61..792d9a05952 100644--- a/solr/solr-ref-guide/src/client-apis.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/client-apis.adoc@@ -29,10 +29,10 @@ Solr offers documentation on the following client integrations:// tag::client-sections[][width=100%,cols="1,1",frame=none,grid=none,stripes=none]|===-| <<solrj.adoc#,SolrJ>>: SolrJ, an API for working with Java applications.-| <<javascript.adoc#,JavaScript>>: JavaScript clients.-| <<python.adoc#,Python>>: Python and JSON responses.-| <<ruby.adoc#,Ruby>>: Solr with Ruby applications.+| xref:solrj.adoc[]: SolrJ, an API for working with Java applications.+| xref:javascript.adoc[]: JavaScript clients.+| xref:python.adoc[]: Python and JSON responses.+| xref:ruby.adoc[]: Solr with Ruby applications.|===//end::client-sections[]****@@ -57,8 +57,7 @@ The other operations are similar, although in certain cases the HTTP request isAn index operation, for example, may contain a document in the body of the request.Solr also features an EmbeddedSolrServer that offers a Java API without requiring an HTTP connection.-For details, see <<solrj.adoc#,SolrJ>>.-+For details, see xref:solrj.adoc[].== Choosing an Output Format@@ -67,7 +66,7 @@ Parsing the responses is a slightly more thorny problem.Fortunately, Solr makes it easy to choose an output format that will be easy to handle on the client side.Specify a response format using the `wt` parameter in a query.-The available response formats are documented in <<response-writers.adoc#,Response Writers>>.+The available response formats are documented in xref:query-guide:response-writers.adoc.Most client APIs hide this detail for you, so for many types of client applications, you won't ever have to specify a `wt` parameter.In JavaScript, however, the interface to Solr is a little closer to the metal, so you will need to add this parameter yourself.diff --git a/solr/solr-ref-guide/src/cloud-screens.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/cloud-screens.adocsimilarity index 85%rename from solr/solr-ref-guide/src/cloud-screens.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/cloud-screens.adocindex f8b256cbd1a..a4f23232d45 100644--- a/solr/solr-ref-guide/src/cloud-screens.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/cloud-screens.adoc@@ -16,12 +16,12 @@// specific language governing permissions and limitations// under the License.-This screen provides status information about each collection & node in your cluster, as well as access to the low level data being stored in <<zookeeper-file-management.adoc#,ZooKeeper files>>.+This screen provides status information about each collection & node in your cluster, as well as access to the low level data being stored in xref:zookeeper-file-management.adoc[ZooKeeper files]..Only Visible When using SolrCloud[NOTE]====-The "Cloud" menu option is only available when Solr is running <<cluster-types.adoc#solrcloud-mode,SolrCloud>>.+The "Cloud" menu option is only available when Solr is running xref:cluster-types.adoc#solrcloud-mode[SolrCloud].User-managed clusters or single-node installations will not display this option.====@@ -36,7 +36,7 @@ Details are expanded for node on port 7574, showing more metadata and more metriThe screen provides links to navigate to nodes, collections and replicas.The table supports paging and filtering on host/node names and collection names.-image::images/cloud-screens/cloud-nodes.png[image,width=900,height=415]+image::cloud-screens/cloud-nodes.png[image,width=900,height=415]== Tree ViewThe "Tree" view shows a directory structure of the data in ZooKeeper, including cluster wide information regarding the `live_nodes` and `overseer` status.@@ -44,7 +44,7 @@ Collection-specific information such as the `state.json`, current shard leaders,In this example, we see part of the `state.json` definition for the "tlog" collection:-image::images/cloud-screens/cloud-tree.png[image,width=487,height=250]+image::cloud-screens/cloud-tree.png[image,width=487,height=250]As an aid to debugging, the data shown in the "Tree" view can be exported locally using the following command `bin/solr zk ls -r /`@@ -52,7 +52,7 @@ As an aid to debugging, the data shown in the "Tree" view can be exported locallThe "ZK Status" view gives an overview over the ZooKeeper servers or ensemble used by Solr.It lists whether running in `standalone` or `ensemble` mode, shows how many ZooKeeper nodes are configured, and then displays a table listing detailed monitoring status for each node, including who is the leader, configuration parameters, and more.-image::images/cloud-screens/cloud-zkstatus.png[image,width=512,height=509]+image::cloud-screens/cloud-zkstatus.png[image,width=512,height=509]== Graph ViewThe "Graph" view shows a graph of each collection, its shards, and the addresses and type ("NRT", "TLOG", or "PULL") of each replica for each shard.@@ -60,8 +60,8 @@ The "Graph" view shows a graph of each collection, its shards, and the addressesThis example shows a simple cluster.In addition to the 2 shard, 2 replica "gettingstarted" collection, there is an additional "tlog" collection consisting of mixed TLOG and PULL replica types.-image::images/cloud-screens/cloud-graph.png[image,width=512,height=250]+image::cloud-screens/cloud-graph.png[image,width=512,height=250]Tooltips appear when hovering over each replica giving additional information.-image::images/cloud-screens/cloud-hover.png[image,width=512,height=250]+image::cloud-screens/cloud-hover.png[image,width=512,height=250]diff --git a/solr/solr-ref-guide/src/cluster-node-management.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/cluster-node-management.adocsimilarity index 97%rename from solr/solr-ref-guide/src/cluster-node-management.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/cluster-node-management.adocindex 38b3383790a..1cf0fa3e8d9 100644--- a/solr/solr-ref-guide/src/cluster-node-management.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/cluster-node-management.adoc@@ -229,7 +229,7 @@ curl -X POST http://localhost:8983/api/cluster -H 'Content-Type: application/jso+The name of the property.Supported properties names are `location`, `maxCoresPerNode`, `urlScheme`, and `defaultShardPreferences`.-If the <<distributed-tracing.adoc#,Jaeger tracing module>> has been enabled, the property `samplePercentage` is also available.+If the xref:distributed-tracing.adoc[Jaeger tracing module] has been enabled, the property `samplePercentage` is also available.+Other properties can be set (for example, if you need them for custom plugins) but they must begin with the prefix `ext.`.Unknown properties that don't begin with `ext.` will be rejected.@@ -344,7 +344,7 @@ Support for the "collectionDefaults" key will be removed in Solr 9.=== Default Shard PreferencesUsing the `defaultShardPreferences` parameter, you can implement rack or availability zone awareness.-First, make sure to "label" your nodes using a <<property-substitution.adoc#jvm-system-properties,system property>> (e.g., `-Drack=rack1`).+First, make sure to "label" your nodes using a xref:configuration-guide:property-substitution.adoc#jvm-system-properties[system property] (e.g., `-Drack=rack1`).Then, set the value of `defaultShardPreferences` to `node.sysprop:sysprop.YOUR_PROPERTY_NAME` like this:[source,bash]@@ -539,7 +539,7 @@ Keep in mind that this can lead to very high network and disk I/O if the replica|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].`timeout`::+@@ -601,7 +601,7 @@ The node to be removed.|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].[[addrole]]== ADDROLE: Add a Rolediff --git a/solr/solr-ref-guide/src/cluster-types.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/cluster-types.adocsimilarity index 100%rename from solr/solr-ref-guide/src/cluster-types.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/cluster-types.adocdiff --git a/solr/solr-ref-guide/src/collection-management.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/collection-management.adocsimilarity index 95%rename from solr/solr-ref-guide/src/collection-management.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/collection-management.adocindex f77886c1997..837698272c7 100644--- a/solr/solr-ref-guide/src/collection-management.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/collection-management.adoc@@ -97,7 +97,7 @@ The `compositeId` router hashes the value in the uniqueKey field and looks up thWhen using the `implicit` router, the `shards` parameter is required.When using the `compositeId` router, the `numShards` parameter is required.+-For more information, see also the section <<solrcloud-shards-indexing.adoc#document-routing,Document Routing>>.+For more information, see also the section xref:solrcloud-shards-indexing.adoc#document-routing[Document Routing].`numShards`::+@@ -130,7 +130,7 @@ The number of replicas to be created for each shard.+This will create a NRT type of replica.If you want another type of replica, see the `tlogReplicas` and `pullReplicas` parameters below.-See the section <<solrcloud-shards-indexing.adoc#types-of-replicas,Types of Replicas>> for more information about replica types.+See the section xref:solrcloud-shards-indexing.adoc#types-of-replicas[Types of Replicas] for more information about replica types.`nrtReplicas`::+@@ -152,7 +152,7 @@ If you want all of your replicas to be of this type, you can simply use `replica+The number of TLOG replicas to create for this collection.This type of replica maintains a transaction log but only updates its index via replication from a leader.-See the section <<solrcloud-shards-indexing.adoc#types-of-replicas,Types of Replicas>> for more information about replica types.+See the section xref:solrcloud-shards-indexing.adoc#types-of-replicas[Types of Replicas] for more information about replica types.`pullReplicas`::+@@ -164,7 +164,7 @@ See the section <<solrcloud-shards-indexing.adoc#types-of-replicas,Types of ReplThe number of PULL replicas to create for this collection.This type of replica does not maintain a transaction log and only updates its index via replication from a leader.This type is not eligible to become a leader and should not be the only type of replicas in the collection.-See the section <<solrcloud-shards-indexing.adoc#types-of-replicas,Types of Replicas>> for more information about replica types.+See the section xref:solrcloud-shards-indexing.adoc#types-of-replicas[Types of Replicas] for more information about replica types.`createNodeSet` (v1), `nodeSet` (v2)::+@@ -178,7 +178,7 @@ The format is a comma-separated list of node_names, such as `localhost:8983_solr+If not provided, the CREATE operation will create shard-replicas spread across all live Solr nodes.+-Alternatively, use the special value of `EMPTY` to initially create no shard-replica within the new collection and then later use the <<replica-management.adoc#addreplica,ADDREPLICA>> operation to add shard-replicas when and where required.+Alternatively, use the special value of `EMPTY` to initially create no shard-replica within the new collection and then later use the xref:replica-management.adoc#addreplica[ADDREPLICA] operation to add shard-replicas when and where required.`createNodeSet.shuffle` (v1), `shuffleNodes` (v2)::+@@ -215,7 +215,7 @@ When such a collection is deleted, its autocreated configset will be deleted byIf this parameter is specified, the router will look at the value of the field in an input document to compute the hash and identify a shard instead of looking at the `uniqueKey` field.If the field specified is null in the document, the document will be rejected.+-Please note that <<realtime-get.adoc#,RealTime Get>> or retrieval by document ID would also require the parameter `\_route_` (or `shard.keys`) to avoid a distributed search.+Please note that xref:configuration-guide:realtime-get.adoc[] or retrieval by document ID would also require the parameter `\_route_` (or `shard.keys`) to avoid a distributed search.`perReplicaState`::+@@ -234,7 +234,7 @@ If `true` the states of individual replicas will be maintained as individual chi|===+Set core property _name_ to _value_.-See the section <<core-discovery.adoc#,Core Discovery>> for details on supported properties and values.+See the section xref:configuration-guide:core-discovery.adoc[] for details on supported properties and values.+[WARNING]====@@ -262,7 +262,7 @@ The default is `false`, which means that the API will return the status of the s+When a collection is created additionally an alias can be created that points to this collection.This parameter allows specifying the name of this alias, effectively combining-this operation with <<alias-management.adoc#createalias,CREATEALIAS>>+this operation with xref:alias-management.adoc#createalias[CREATEALIAS].`async`::+@@ -271,10 +271,10 @@ this operation with <<alias-management.adoc#createalias,CREATEALIAS>>|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].Collections are first created in read-write mode but can be put in `readOnly`-mode using the <<collection-management.adoc#modifycollection,MODIFYCOLLECTION>> action.+mode using the xref:collection-management.adoc#modifycollection[MODIFYCOLLECTION] action.=== CREATE Response@@ -351,7 +351,7 @@ This parameter is required by the V1 API.|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].=== RELOAD Response@@ -442,7 +442,7 @@ See the <<create,CREATE action>> section above for details on these attributes.|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].[[readonlymode]]==== Read-Only Mode@@ -643,7 +643,7 @@ The name of the collection to delete.|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].=== DELETE Response@@ -845,7 +845,7 @@ The timeout, in seconds, until which write requests made to the source collectio|===+Set core property _name_ to _value_.-See the section <<core-discovery.adoc#,Core Discovery>> for details on supported properties and values.+See the section xref:configuration-guide:core-discovery.adoc[] for details on supported properties and values.`async`::+@@ -854,7 +854,7 @@ See the section <<core-discovery.adoc#,Core Discovery>> for details on supported|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].=== MIGRATE Response@@ -991,7 +991,7 @@ If `true` then after the processing is successfully finished the source collecti|Optional |Default: none|===+-Optional request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Optional request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].There are additionally a number of optional parameters that determine the target collection layout.If they are not specified in the request then their values are copied from the source collection.@@ -1566,7 +1566,7 @@ curl -X POST http://localhost:8983/api/collections -H 'Content-Type: application--The BACKUP command will backup Solr indexes and configurations for a specified collection.-The BACKUP command <<backup-restore.adoc#,takes one copy from each shard for the indexes>>.+The BACKUP command xref:backup-restore.adoc[takes one copy from each shard for the indexes].For configurations, it backs up the configset that was associated with the collection and metadata.Backup data is stored in the repository based on the provided `name` and `location`.@@ -1609,7 +1609,7 @@ s|Required |Default: none|===+The location on a shared drive for the backup command to write to.-This parameter is required, unless a default location is defined on the repository configuration, or set as a <<cluster-node-management.adoc#clusterprop,cluster property>>.+This parameter is required, unless a default location is defined on the repository configuration, or set as a xref:cluster-node-management.adoc#clusterprop[cluster property].+If the location path is on a mounted drive, the mount must be available on the node that serves as the overseer, even if the overseer node does not host a replica of the collection being backed up.Since any node can take the overseer role at any time, a best practice to avoid possible backup failures is to ensure the mount point is available on all nodes of the cluster.@@ -1624,7 +1624,7 @@ Repeated backups of the same collection are done incrementally, so that files un|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].`repository`::+@@ -1695,7 +1695,7 @@ s|Required |Default: none|===+The repository location to list backups from.-This parameter is required, unless a default location is defined on the repository configuration, or set as a <<cluster-node-management.adoc#clusterprop,cluster property>>.+This parameter is required, unless a default location is defined on the repository configuration, or set as a xref:cluster-node-management.adoc#clusterprop[cluster property].+If the location path is on a mounted drive, the mount must be available on the node that serves as the overseer, even if the overseer node does not host a replica of the collection being backed up.Since any node can take the overseer role at any time, a best practice to avoid possible backup failures is to ensure the mount point is available on all nodes of the cluster.@@ -1717,7 +1717,7 @@ If no repository is specified then the local filesystem repository will be used|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].=== LISTBACKUP Example@@ -1834,7 +1834,7 @@ Optionally, you can override some parameters documented below.While restoring, if a configset with the same name exists in ZooKeeper then Solr will reuse that, or else it will upload the backed up configset in ZooKeeper and use that.-You can use the collection <<alias-management.adoc#createalias,CREATEALIAS>> command to make sure clients don't need to change the endpoint to query or index against the newly restored collection.+You can use the collection xref:alias-management.adoc#createalias[CREATEALIAS] command to make sure clients don't need to change the endpoint to query or index against the newly restored collection.=== RESTORE Parameters@@ -1865,7 +1865,7 @@ The name of the existing backup that you want to restore.|===+The location on a shared drive for the RESTORE command to read from.-Alternately it can be set as a <<cluster-node-management.adoc#clusterprop,cluster property>>.+Alternately it can be set as a xref:cluster-node-management.adoc#clusterprop[cluster property].`async`::+@@ -1874,7 +1874,7 @@ Alternately it can be set as a <<cluster-node-management.adoc#clusterprop,cluste|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].`repository`::+@@ -2001,7 +2001,7 @@ s|Required |Default: none|===+The repository location to delete backups from.-This parameter is required, unless a default location is defined on the repository configuration, or set as a <<cluster-node-management.adoc#clusterprop,cluster property>>.+This parameter is required, unless a default location is defined on the repository configuration, or set as a xref:cluster-node-management.adoc#clusterprop[cluster property].+If the location path is on a mounted drive, the mount must be available on the node that serves as the overseer, even if the overseer node does not host a replica of the collection being backed up.Since any node can take the overseer role at any time, a best practice to avoid possible backup failures is to ensure the mount point is available on all nodes of the cluster.@@ -2055,7 +2055,7 @@ Only one of `backupId`, `maxNumBackupPoints`, and `purgeUnused` may be specified|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].[[rebalanceleaders]]== REBALANCELEADERS: Rebalance Leadersdiff --git a/solr/solr-ref-guide/src/collections-core-admin.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/collections-core-admin.adocsimilarity index 75%rename from solr/solr-ref-guide/src/collections-core-admin.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/collections-core-admin.adocindex 292da8a4fab..1e66093c4c2 100644--- a/solr/solr-ref-guide/src/collections-core-admin.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/collections-core-admin.adoc@@ -16,13 +16,13 @@// specific language governing permissions and limitations// under the License.-The Collections screen provides some basic functionality for managing your Collections, powered by the <<collections-api.adoc#,Collections API>>.+The Collections screen provides some basic functionality for managing your Collections, powered by the xref:configuration-guide:collections-api.adoc[].[NOTE]====If you are running a user-managed cluster or a single-node installation, you will not see a Collections option in the left nav menu of the Admin UI.-You will instead see a "Core Admin" screen that supports some comparable Core level information & manipulation via the <<coreadmin-api.adoc#,CoreAdmin API>> instead.+You will instead see a "Core Admin" screen that supports some comparable Core level information & manipulation via the xref:configuration-guide:coreadmin-api.adoc[] instead.====The main display of this page provides a list of collections that exist in your cluster.@@ -30,11 +30,11 @@ Clicking on a collection name provides some basic metadata about how the collectThe buttons at the top of the screen let you make various collection level changes to your cluster, from add new collections or aliases to reloading or deleting a single collection.-image::images/collections-core-admin/collection-admin.png[image,width=653,height=250]+image::collections-core-admin/collection-admin.png[image,width=653,height=250]Replicas can be deleted by clicking the red "X" next to the replica name.-If the shard is inactive, for example after a <<shard-management.adoc#splitshard,SPLITSHARD action>>, an option to delete the shard will appear as a red "X" next to the shard name.+If the shard is inactive, for example after a xref:shard-management.adoc#splitshard[SPLITSHARD action], an option to delete the shard will appear as a red "X" next to the shard name.-image::images/collections-core-admin/DeleteShard.png[image,width=486,height=250]+image::collections-core-admin/DeleteShard.png[image,width=486,height=250]diff --git a/solr/solr-ref-guide/src/configuring-logging.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/configuring-logging.adocsimilarity index 91%rename from solr/solr-ref-guide/src/configuring-logging.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/configuring-logging.adocindex e14fb8851ac..d2b8a4cf39b 100644--- a/solr/solr-ref-guide/src/configuring-logging.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/configuring-logging.adoc@@ -30,7 +30,7 @@ Select the *Logging*] link in the left-hand menu.Note that log levels will also be reset on next Solr restart..The Logging Screen-image::images/configuring-logging/logging.png[Logging Screen]+image::configuring-logging/logging.png[Logging Screen]This part of the Admin Web interface allows you to set the logging level for many different log categories.Fortunately, any categories that are *unset* will have the logging level of its parent.@@ -39,7 +39,7 @@ This makes it possible to change many categories at once by adjusting the logginWhen you select menu:Logging[Level], you see the following menu:.The Log Level Menu-image::images/configuring-logging/level_menu.png[image,width=1159,height=577]+image::configuring-logging/level_menu.png[image,width=1159,height=577]Solr classes are shown in the left column in a directory tree structure representing the classpath.The current level is shown in the right column.@@ -90,7 +90,7 @@ There are two ways:The first way is to set the `SOLR_LOG_LEVEL` environment variable before you start Solr, or place the same variable in `bin/solr.in.sh` or `bin/solr.in.cmd`.The variable must contain an uppercase string with a supported log level (see above).-The second way is to start Solr with the -v or -q options, see <<solr-control-script-reference.adoc#,Solr Control Script Reference>> for details.+The second way is to start Solr with the -v or -q options, see xref:solr-control-script-reference.adoc[] for details.Examples:[source,bash]@@ -103,7 +103,7 @@ bin/solr start -f -q== Permanent Logging Settings-Solr uses http://logging.apache.org/log4j/2.x/[Log4J version {ivy-log4j-version}] for logging which is configured using `server/resources/log4j2.xml`.+Solr uses http://logging.apache.org/log4j/2.x/[Log4J version {dep-version-log4j}] for logging which is configured using `server/resources/log4j2.xml`.Take a moment to inspect the contents of the `log4j2.xml` file so that you are familiar with its structure.By default, Solr log messages will be written to `SOLR_LOGS_DIR/solr.log`.@@ -111,7 +111,7 @@ The format of the log messages can be changed by https://logging.apache.org/log4When you're ready to deploy Solr in production, set the variable `SOLR_LOGS_DIR` to the location where you want Solr to write log files, such as `/var/solr/logs`.You may also want to tweak `log4j2.xml`.-Note that if you installed Solr as a service using the instructions provided in <<taking-solr-to-production.adoc#,Taking Solr to Production>>, then see `/var/solr/log4j2.xml` instead of the default `server/resources` version.+Note that if you installed Solr as a service using the instructions provided in xref:taking-solr-to-production.adoc[], then see `/var/solr/log4j2.xml` instead of the default `server/resources` version.When starting Solr in the foreground (`-f` option), all logs will be sent to the console, in addition to `solr.log`.When starting Solr in the background, it will write all `stdout` and `stderr` output to a log file in `solr-<port>-console.log`, and automatically disable the CONSOLE logger configured in `log4j2.xml`, having the same effect as if you removed the CONSOLE appender from the rootLogger manually.@@ -149,7 +149,7 @@ The log file under which you can find all these queries is called `solr_slow_req== Logging Select Request ParametersIn addition to the logging options described above, it's possible to log only a selected list of request parameters (such as those sent with queries) with an additional request parameter called `logParamsList`.-See the section on <<common-query-parameters.adoc#logparamslist-parameter,logParamsList Parameter>> for more information.+See the section on xref:query-guide:common-query-parameters.adoc#logparamslist-parameter[logParamsList Parameter] for more information.== Request Loggingdiff --git a/solr/solr-ref-guide/src/distributed-tracing.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/distributed-tracing.adocsimilarity index 98%rename from solr/solr-ref-guide/src/distributed-tracing.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/distributed-tracing.adocindex dc7d2293f38..d2fad635111 100644--- a/solr/solr-ref-guide/src/distributed-tracing.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/distributed-tracing.adoc@@ -24,7 +24,7 @@ At the moment, only Jaeger is supported out of the box.A sampled distributed tracing query request on Jaeger looks like this:.Tracing of a Solr query-image::images/distributed-tracing/query-request-tracing.png[]+image::distributed-tracing/query-request-tracing.png[]== Configuring Tracerdiff --git a/solr/solr-ref-guide/src/docker-faq.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/docker-faq.adocsimilarity index 98%rename from solr/solr-ref-guide/src/docker-faq.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/docker-faq.adocindex bbd0731bc68..945b7ba9da4 100644--- a/solr/solr-ref-guide/src/docker-faq.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/docker-faq.adoc@@ -178,7 +178,7 @@ This is especially a problem for ZooKeeper 3.4.6; future versions are better atDocker 1.10 has a new `--ip` configuration option that allows you to specify an IP address for a container.It also has a `--ip-range` option that allows you to specify the range that other containers get addresses from.Used together, you can implement static addresses.-See the <<docker-networking.adoc#,Solr Docker networking guide>> for more information.+See the xref:docker-networking.adoc[] for more information.== Can I run ZooKeeper and Solr with Docker Links?@@ -223,7 +223,7 @@ Then go to `+http://localhost:8983/solr/#/~cloud+` (adjust the hostname for your== How can I run ZooKeeper and Solr with Docker Compose?-See the <<solr-in-docker.adoc#docker-compose,docker compose example>>.+See the xref:solr-in-docker.adoc#docker-compose[docker compose example].== How can I get rid of "shared memory" warnings on Solr startup?diff --git a/solr/solr-ref-guide/src/docker-networking.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/docker-networking.adocsimilarity index 100%rename from solr/solr-ref-guide/src/docker-networking.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/docker-networking.adocdiff --git a/solr/solr-ref-guide/src/enabling-ssl.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adocsimilarity index 95%rename from solr/solr-ref-guide/src/enabling-ssl.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adocindex ddbe2684a08..d90203eea65 100644--- a/solr/solr-ref-guide/src/enabling-ssl.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc@@ -72,7 +72,7 @@ To activate the SSL settings, uncomment and update the set of properties beginni====[.tab-label]**nix (solr.in.sh)*-NOTE: If you setup Solr as a service on Linux using the steps outlined in <<taking-solr-to-production.adoc#,Taking Solr to Production>>, then make these changes in `/var/solr/solr.in.sh`.+NOTE: If you setup Solr as a service on Linux using the steps outlined in xref:taking-solr-to-production.adoc[], then make these changes in `/var/solr/solr.in.sh`.[source,bash]----@@ -218,7 +218,7 @@ There are several related JIRA tickets where SSL support is being planned/workedAfter creating the keystore described above and before you start any SolrCloud nodes, you must configure your Solr cluster properties in ZooKeeper so that Solr nodes know to communicate via SSL.This section assumes you have created and started an external ZooKeeper.-See <<zookeeper-ensemble.adoc#,ZooKeeper Ensemble>> for more information.+See xref:zookeeper-ensemble.adoc[] for more information.The `urlScheme` cluster-wide property needs to be set to `https` before any Solr node starts up.The examples below use the `zkcli` tool that comes with Solr to do this.@@ -245,7 +245,7 @@ C:\> server\scripts\cloud-scripts\zkcli.bat -zkhost server1:2181,server2:2181,se--Be sure to use the correct `zkhost` value for your system.-If you have set up your ZooKeeper ensemble to use a <<taking-solr-to-production.adoc#zookeeper-chroot,chroot for Solr>>, make sure to include it in the `zkhost` string, e.g., `-zkhost server1:2181,server2:2181,server3:2181/solr`.+If you have set up your ZooKeeper ensemble to use a xref:taking-solr-to-production.adoc#zookeeper-chroot[chroot for Solr], make sure to include it in the `zkhost` string, e.g., `-zkhost server1:2181,server2:2181,server3:2181/solr`.=== Update Cluster Properties for Existing Collections@@ -253,7 +253,7 @@ If you are using SolrCloud and have collections created before enabling SSL, youIf you do not have existing collections or are not using SolrCloud, you can skip ahead and start Solr.-Updating cluster properties can be done with the Collections API <<cluster-node-management.adoc#clusterprop,CLUSTERPROP>> command, as in this example (update the hostname and port as appropriate for your system):+Updating cluster properties can be done with the Collections API xref:cluster-node-management.adoc#clusterprop[CLUSTERPROP command], as in this example (update the hostname and port as appropriate for your system):[source,terminal]$ http://localhost:8983/solr/admin/collections?action=CLUSTERPROP&name=urlScheme&val=https@@ -292,7 +292,7 @@ C:\> bin\solr.cmd -p 8984=== Start SolrCloud-NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see <<zookeeper-ensemble#updating-solr-include-files,instructions>>) you can omit `-z <zk host string>` from all of the `bin/solr`/`bin\solr.cmd` commands below.+NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see xref:zookeeper-ensemble.adoc#updating-solr-include-files[Updating Solr Include Files]) you can omit `-z <zk host string>` from all of the `bin/solr`/`bin\solr.cmd` commands below.Start each Solr node with the Solr control script as shown in the examples below.Customize the values for the parameters shown as necessary and add any used in your system.diff --git a/solr/solr-ref-guide/src/hadoop-authentication-plugin.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/hadoop-authentication-plugin.adocsimilarity index 91%rename from solr/solr-ref-guide/src/hadoop-authentication-plugin.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/hadoop-authentication-plugin.adocindex 46c9fe93027..24929cdcde1 100644--- a/solr/solr-ref-guide/src/hadoop-authentication-plugin.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/hadoop-authentication-plugin.adoc@@ -25,15 +25,15 @@ This plugin can be particularly useful in leveraging an extended set of featuresPlease note that the version of Hadoop library used by Solr is upgraded periodically.While Solr will ensure the stability and backwards compatibility of the structure of the plugin configuration (viz., the parameter names of this plugin), the values of these parameters may change based on the version of the Hadoop library.-Please review the Hadoop documentation for v{ivy-hadoop-version} used by this version of Solr.+Please review the Hadoop documentation for v{dep-version-hadoop} used by this version of Solr.For some authentication schemes (e.g., Kerberos), Solr provides a native implementation of authentication plugin.If you require a more stable setup, in terms of configuration, ability to perform rolling upgrades, backward compatibility, etc., you should consider using one of these plugins.-Please review the section <<authentication-and-authorization-plugins.adoc#,Authentication and Authorization Plugins>> for an overview of authentication plugin options in Solr.+Please review the section xref:authentication-and-authorization-plugins.adoc[] for an overview of authentication plugin options in Solr.There are two plugin classes:-* `HadoopAuthPlugin`: This can be used with SolrCloud, user-managed, and single-node installations as well as SolrCloud with <<authentication-and-authorization-plugins.adoc#securing-inter-node-requests,PKI authentication>> for internode communication.+* `HadoopAuthPlugin`: This can be used with SolrCloud, user-managed, and single-node installations as well as SolrCloud with xref:authentication-and-authorization-plugins.adoc#securing-inter-node-requests[PKI authentication] for internode communication.* `ConfigurableInternodeAuthHadoopPlugin`: This is an extension of `HadoopAuthPlugin` that allows you to configure the authentication scheme for internode communication.[TIP]@@ -138,12 +138,12 @@ Only applicable for `ConfigurableInternodeAuthHadoopPlugin`.=== Kerberos Authentication using Hadoop Authentication Plugin-This example lets you configure Solr to use Kerberos Authentication, similar to how you would use the <<kerberos-authentication-plugin.adoc#,Kerberos Authentication Plugin>>.+This example lets you configure Solr to use Kerberos Authentication, similar to how you would use the xref:kerberos-authentication-plugin.adoc[].After consulting the Hadoop authentication library's documentation, you can supply per-host configuration parameters using the `solr.*` prefix.As an example, the Hadoop authentication library expects a parameter `kerberos.principal`, which can be supplied as a system property named `solr.kerberos.principal` when starting a Solr node.-Refer to the section <<kerberos-authentication-plugin.adoc#,Kerberos Authentication Plugin>> for other typical configuration parameters.+Refer to the section xref:kerberos-authentication-plugin.adoc[] for other typical configuration parameters.The example below uses `ConfigurableInternodeAuthHadoopPlugin`, and hence you must provide the `clientBuilderFactory` implementation.As a result, all internode communication will use the Kerberos mechanism, instead of PKI authentication.@@ -185,7 +185,7 @@ Without it, forwarded requests will authenticate as Solr server credentials instSimilar to the previous example, this is an example of setting up a Solr cluster that uses delegation tokens.-Refer to the parameters in the Hadoop https://hadoop.apache.org/docs/stable/hadoop-auth/Configuration.html[authentication library's documentation] or refer to the section <<kerberos-authentication-plugin.adoc#,Kerberos Authentication Plugin>> for further details.+Refer to the parameters in the Hadoop https://hadoop.apache.org/docs/stable/hadoop-auth/Configuration.html[authentication library's documentation] or refer to the section xref:kerberos-authentication-plugin.adoc[] for further details.Please note that this example does not use Kerberos and the requests made to Solr must contain valid delegation tokens.diff --git a/solr/solr-ref-guide/src/indexupgrader-tool.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/indexupgrader-tool.adocsimilarity index 100%rename from solr/solr-ref-guide/src/indexupgrader-tool.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/indexupgrader-tool.adocdiff --git a/solr/solr-ref-guide/src/installing-solr.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/installing-solr.adocsimilarity index 84%rename from solr/solr-ref-guide/src/installing-solr.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/installing-solr.adocindex 0493a854256..26e7a29c8f5 100644--- a/solr/solr-ref-guide/src/installing-solr.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/installing-solr.adoc@@ -19,7 +19,7 @@Installation of Solr on Unix-compatible or Windows servers generally requires simply extracting (or, unzipping) the download package.-Please be sure to review the <<system-requirements.adoc#,System Requirements>> before starting Solr.+Please be sure to review the xref:system-requirements.adoc[] before starting Solr.== Available Solr Packages@@ -40,7 +40,7 @@ This will suffice as an initial development environment, but take care not to ovWhen you've progressed past initial evaluation of Solr, you'll want to take care to plan your implementation.You may need to reinstall Solr on another server or make a clustered SolrCloud environment.-When you're ready to setup Solr for a production environment, please refer to the instructions provided on the <<taking-solr-to-production.adoc#,Taking Solr to Production>> page.+When you're ready to setup Solr for a production environment, please refer to the instructions provided on the xref:taking-solr-to-production.adoc[] page..What Size Server Do I Need?[NOTE]@@ -53,7 +53,7 @@ A very good blog post that discusses the issues to consider is https://lucidworkOne thing to note when planning your installation is that a hard limit exists in Lucene for the number of documents in a single index: approximately 2.14 billion documents (2,147,483,647 to be exact).In practice, it is highly unlikely that such a large number of documents would fit and perform well in a single index, and you will likely need to distribute your index across a cluster before you ever approach this number.-If you know you will exceed this number of documents in total before you've even started indexing, it's best to plan your installation with <<cluster-types.adoc#solrcloud-mode,SolrCloud>> as part of your design from the start.+If you know you will exceed this number of documents in total before you've even started indexing, it's best to plan your installation with xref:cluster-types.adoc#solrcloud-mode[SolrCloud] as part of your design from the start.== Package Installation@@ -76,11 +76,11 @@ After installing Solr, you'll see the following directories and files within thebin/::This directory includes several important scripts that will make using Solr easier.-solr and solr.cmd::: This is <<solr-control-script-reference.adoc#,Solr's Control Script>>, also known as `bin/solr` (*nix) / `bin/solr.cmd` (Windows).+solr and solr.cmd::: This is xref:solr-control-script-reference.adoc[Solr's Control Script], also known as `bin/solr` (*nix) / `bin/solr.cmd` (Windows).This script is the preferred tool to start and stop Solr.You can also create collections or cores, configure authentication, and work with configuration files when running in SolrCloud mode.-post::: The <<post-tool.adoc#,PostTool>>, which provides a simple command line interface for POSTing content to Solr.+post::: The xref:indexing-guide:post-tool.adoc[], which provides a simple command line interface for POSTing content to Solr.solr.in.sh and solr.in.cmd:::These are property files for *nix and Windows systems, respectively.@@ -89,20 +89,20 @@ Many of these settings can be overridden when using `bin/solr` / `bin/solr.cmd`,install_solr_services.sh:::This script is used on *nix systems to install Solr as a service.-It is described in more detail in the section <<taking-solr-to-production.adoc#,Taking Solr to Production>>.+It is described in more detail in the section xref:taking-solr-to-production.adoc[].modules/::Solr's `modules` directory includes 1st-party add-on plugins for specialized features of Solr.prometheus-exporter/::A standalone application, included under `bin/`, that montiors Solr instances and produces Prometheus metrics.-See the <<monitoring-with-prometheus-and-grafana.adoc#,documentation>> for more information.+See the section xref:deployment-guide:monitoring-with-prometheus-and-grafana.adoc[] for more information.docker/::This contains a Dockerfile to build a Docker image from the binary distribution, that is compatible with the official image.This directory also contains the scripts needed when using Solr inside the Docker image, under the `scripts/` directory.The `README.md` in this directory describes how custom Solr Docker images can be built using this binary distribution.-Refer to the <<solr-in-docker.adoc#,Running Solr in Docker>> page for information on using a Solr Docker image.+Refer to the section xref:deployment-guide:solr-in-docker.adoc[] page for information on using a Solr Docker image.docs/::The `docs` directory includes a link to online Javadocs for Solr.@@ -120,19 +120,19 @@ A README in this directory provides a detailed overview, but here are some highl* Solr's Admin UI & JAR files (`server/solr-webapp`)* Jetty libraries (`server/lib`)* Log files (`server/logs`) and log configurations (`server/resources`).-See the section <<configuring-logging.adoc#,Configuring Logging>> for more details on how to customize Solr's default logging.+See the section xref:configuring-logging.adoc[] for more details on how to customize Solr's default logging.* Sample configsets (`server/solr/configsets`)== Solr ExamplesSolr includes a number of example documents and configurations to use when getting started.-If you ran through the <<solr-tutorial.adoc#,Solr Tutorial>>, you have already interacted with some of these files.+If you ran through the xref:getting-started:solr-tutorial.adoc[], you have already interacted with some of these files.Here are the examples included with Solr:exampledocs::This is a small set of simple CSV, XML, and JSON files that can be used with `bin/post` when first getting started with Solr.-For more information about using `bin/post` with these files, see <<post-tool.adoc#,Post Tool>>.+For more information about using `bin/post` with these files, see xref:indexing-guide:post-tool.adoc[].files::The `files` directory provides a basic search UI for documents such as Word or PDF that you may have stored locally.@@ -165,7 +165,7 @@ This will start Solr in the background, listening on port 8983.When you start Solr in the background, the script will wait to make sure Solr starts correctly before returning to the command line prompt.-TIP: All of the options for the Solr CLI are described in the section <<solr-control-script-reference.adoc#,Solr Control Script Reference>>.+TIP: All of the options for the Solr CLI are described in the section xref:solr-control-script-reference.adoc[].=== Start Solr with a Specific Bundled Example@@ -179,11 +179,11 @@ bin/solr -e techproducts----Currently, the available examples you can run are: techproducts, schemaless, and cloud.-See the section <<solr-control-script-reference.adoc#running-with-example-configurations,Running with Example Configurations>> for details on each example.+See the section xref:solr-control-script-reference.adoc#running-with-example-configurations[Running with Example Configurations] for details on each example..Getting Started with SolrCloud-NOTE: Running the `cloud` example starts Solr in <<cluster-types.adoc#solrcloud-mode,SolrCloud>> mode.-For more information on starting Solr in SolrCloud mode, see the section <<tutorial-solrcloud.adoc#,Getting Started with SolrCloud>>.+NOTE: Running the `cloud` example starts Solr in xref:cluster-types.adoc#solrcloud-mode[SolrCloud] mode.+For more information on starting Solr in SolrCloud mode, see the section xref:getting-started:tutorial-solrcloud.adoc[].=== Check if Solr is Running@@ -202,7 +202,7 @@ If you need convincing, use a Web browser to see the Admin Console.`\http://localhost:8983/solr/`.The Solr Admin interface.-image::images/installing-solr/SolrAdminDashboard.png[Solr's Admin UI,pdfwidth=75%]+image::installing-solr/SolrAdminDashboard.png[Solr's Admin UI,pdfwidth=75%]If Solr is not running, your browser will complain that it cannot connect to the server.Check your port number and try again.diff --git a/solr/solr-ref-guide/src/javascript.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/javascript.adocsimilarity index 88%rename from solr/solr-ref-guide/src/javascript.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/javascript.adocindex b4e90574445..51d54609a22 100644--- a/solr/solr-ref-guide/src/javascript.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/javascript.adoc@@ -22,7 +22,7 @@ You don't need to install any packages or configure anything.HTTP requests can be sent to Solr using the standard `XMLHttpRequest` mechanism.-By default, Solr sends <<response-writers.adoc#json-response-writer,JavaScript Object Notation (JSON) responses>>, which are easily interpreted in JavaScript.+By default, Solr sends xref:query-guide:response-writers.adoc#json-response-writer[JavaScript Object Notation (JSON) responses], which are easily interpreted in JavaScript.You don't need to add anything to the request URL to have responses sent as JSON.For more information and an excellent example, take a look at the SolJSON page on the Solr Wiki:diff --git a/solr/solr-ref-guide/src/jmx-with-solr.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/jmx-with-solr.adocsimilarity index 97%rename from solr/solr-ref-guide/src/jmx-with-solr.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/jmx-with-solr.adocindex 695948a2ba3..8e53c7b9b45 100644--- a/solr/solr-ref-guide/src/jmx-with-solr.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/jmx-with-solr.adoc@@ -26,7 +26,7 @@ If you are unfamiliar with JMX, you may find the following overview useful: htt== Configuring JMX-JMX support is configured by defining a metrics reporter, as described in the section the section <<metrics-reporting.adoc#jmx-reporter,JMX Reporter>>.+JMX support is configured by defining a metrics reporter, as described in the section the section xref:metrics-reporting.adoc#jmx-reporter[JMX Reporter].If you have an existing MBean server running in Solr's JVM, or if you start Solr with the system property `-Dcom.sun.management.jmxremote`, Solr will automatically identify its location on startup even if you have not defined a reporter explicitly in `solr.xml`.You can also define the location of the MBean server with parameters defined in the reporter definition.diff --git a/solr/solr-ref-guide/src/jvm-settings.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/jvm-settings.adocsimilarity index 95%rename from solr/solr-ref-guide/src/jvm-settings.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/jvm-settings.adocindex 9b49a63a47c..f2a73a418d2 100644--- a/solr/solr-ref-guide/src/jvm-settings.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/jvm-settings.adoc@@ -48,7 +48,7 @@ When heaps grow to larger sizes, it is imperative to test extensively before goi* Modern hardware can be configured with hundreds of gigabytes of physical RAM and many CPUs.It is often better in these cases to run multiple JVMs, each with a limited amount of memory allocated to their heaps.One way to achieve this is to run Solr as a https://hub.docker.com/_/solr?tab=tags[Docker container].-* It's good practice to periodically re-analyze the GC logs and/or monitor with <<metrics-reporting#metrics-reporting,Metrics Reporting>> to see if the memory usage has changed due to changes in your application, number of documents, etc.+* It's good practice to periodically re-analyze the GC logs and/or monitor with xref:metrics-reporting.adoc[] to see if the memory usage has changed due to changes in your application, number of documents, etc.* On *nix systems, Solr will run with "OOM killer script" (see `solr/bin/oom_solr.sh`).This will forcefully stop Solr when the heap is exhausted rather than continue in an indeterminate state.You can additionally request a heap dump on OOM through the values in `solr.in.sh`@@ -81,4 +81,4 @@ The Java Properties screen, however, provides easy access to all the propertiesIn the Admin UI, it is available in the left-hand menu *Java Properties*..Java Properties Screen-image::images/jvm-settings/javaproperties.png[image,width=593,height=250]+image::jvm-settings/javaproperties.png[image,width=593,height=250]diff --git a/solr/solr-ref-guide/src/jwt-authentication-plugin.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/jwt-authentication-plugin.adocsimilarity index 95%rename from solr/solr-ref-guide/src/jwt-authentication-plugin.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/jwt-authentication-plugin.adocindex c928e60537d..e15be735252 100644--- a/solr/solr-ref-guide/src/jwt-authentication-plugin.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/jwt-authentication-plugin.adoc@@ -23,8 +23,8 @@ The typical use case is to integrate Solr with an https://en.wikipedia.org/wiki/== Module-This is provided via a Solr Module that needs to be added to the classpath before use. Since this is a node-level-plugin it must go in `sharedLib`, see <<configuring-solr-xml.adoc#,Configuring solr.xml>> for details.+This is provided via a xref:configuration-guide:solr-modules.adoc[Solr Module] that needs to be added to the classpath before use. Since this is a node-level+plugin it must go in `sharedLib`, see xref:configuration-guide:configuring-solr-xml.adoc[] for details.== Enable JWT Authentication@@ -198,13 +198,13 @@ Configuring both will cause an error.=== Multiple Authentication Schemes-Solr provides the <<basic-authentication-plugin.adoc#combining-basic-authentication-with-other-schemes,MultiAuthPlugin>> to support multiple authentication schemes based on the `Authorization` header.+Solr provides the xref:basic-authentication-plugin.adoc#combining-basic-authentication-with-other-schemes[MultiAuthPlugin] to support multiple authentication schemes based on the `Authorization` header.This allows you to configure Solr to delegate user management and authentication to an OIDC provider using the `JWTAuthPlugin`,but also allow a small set of service accounts to use `Basic` authentication when using OIDC is not supported or practical.== Editing JWT Authentication Plugin Configuration-All properties mentioned above can be set or changed using the <<basic-authentication-plugin.adoc#editing-basic-authentication-plugin-configuration,Authentication API>>.+All properties mentioned above can be set or changed using the xref:basic-authentication-plugin.adoc#editing-basic-authentication-plugin-configuration[Authentication API].You can thus start with a simple configuration with only `class` and `blockUnknown=false` configured and then configure the rest using the API.=== Set a Configuration Propertydiff --git a/solr/solr-ref-guide/src/kerberos-authentication-plugin.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/kerberos-authentication-plugin.adocsimilarity index 95%rename from solr/solr-ref-guide/src/kerberos-authentication-plugin.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/kerberos-authentication-plugin.adocindex 1ba50ab1a64..5354f4aa422 100644--- a/solr/solr-ref-guide/src/kerberos-authentication-plugin.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/kerberos-authentication-plugin.adoc@@ -19,13 +19,13 @@If you are using Kerberos to secure your network environment, the Kerberos authentication plugin can be used to secure a Solr cluster.This allows Solr to use a Kerberos service principal and keytab file to authenticate with ZooKeeper and between nodes of the Solr cluster (if applicable).-Users of the Admin UI and all clients (such as <<solrj.adoc#,SolrJ>>) would also need to have a valid ticket before being able to use the UI or send requests to Solr.+Users of the Admin UI and all clients (such as xref:solrj.adoc[]) would also need to have a valid ticket before being able to use the UI or send requests to Solr.Support for Kerberos authentication is available in SolrCloud, user-managed, or single-node installations.[TIP]====-If you are using Solr with a Hadoop cluster secured with Kerberos and intend to store your Solr indexes in HDFS, also see the section <<solr-on-hdfs.adoc#,Solr on HDFS>> for additional steps to configure Solr for that purpose.+If you are using Solr with a Hadoop cluster secured with Kerberos and intend to store your Solr indexes in HDFS, also see the section xref:solr-on-hdfs.adoc[] for additional steps to configure Solr for that purpose.The instructions on this page apply only to scenarios where Solr will be secured with Kerberos.If you only need to store your indexes in a Kerberized HDFS system, please see the Running Solr on HDFS section.====@@ -36,7 +36,7 @@ When setting up Solr to use Kerberos, configurations are put in place for Solr tThe configurations define the service principal name and the location of the keytab file that contains the credentials.As with all authentication plugins, Kerberos authentication configuration is stored in `security.json`.-This file is discussed in the section <<authentication-and-authorization-plugins.adoc#configuring-security-json,Configuring security.json>>.+This file is discussed in the section xref:authentication-and-authorization-plugins.adoc#configuring-security-json[Configuring security.json].=== Service Principals and Keytab Files@@ -205,7 +205,7 @@ If you are using Solr in a single-node installation, you need to create the `sec[IMPORTANT]====-If you already have a `/security.json` file in ZooKeeper, download the file, add or modify the authentication section and upload it back to ZooKeeper using the <<zookeeper-utilities.adoc#,ZooKeeper Utilities>> available in Solr.+If you already have a `/security.json` file in ZooKeeper, download the file, add or modify the authentication section and upload it back to ZooKeeper using the xref:zookeeper-utilities.adoc[] available in Solr.======= Define a JAAS Configuration File@@ -260,7 +260,7 @@ The path should be enclosed in double-quotes.=== Solr Startup ParametersWhile starting up Solr, the following host-specific parameters need to be passed.-These parameters can be passed at the command line with the `bin/solr` start command (see <<solr-control-script-reference.adoc#,Solr Control Script Reference>> for details on how to pass system parameters) or defined in `bin/solr.in.sh` or `bin/solr.in.cmd` as appropriate for your operating system.+These parameters can be passed at the command line with the `bin/solr` start command (see xref:solr-control-script-reference.adoc[] for details on how to pass system parameters) or defined in `bin/solr.in.sh` or `bin/solr.in.cmd` as appropriate for your operating system.`solr.kerberos.name.rules`::+@@ -373,7 +373,7 @@ Delegation tokens can reduce the load because they do not access the server afte* If requests or permissions need to be delegated to another user.To enable delegation tokens, several parameters must be defined.-These parameters can be passed at the command line with the `bin/solr` start command (<<solr-control-script-reference.adoc#,Solr Control Script Reference>>) or defined in `bin/solr.in.sh` or `bin/solr.in.cmd` as appropriate for your operating system.+These parameters can be passed at the command line with the `bin/solr` start command xref:solr-control-script-reference.adoc[]) or defined in `bin/solr.in.sh` or `bin/solr.in.cmd` as appropriate for your operating system.`solr.kerberos.delegation.token.enabled`::+@@ -451,7 +451,7 @@ Note you also need to customize the `-z` property as appropriate for the locatio$ bin/solr -c -z server1:2181,server2:2181,server3:2181/solr-----NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see <<zookeeper-ensemble#updating-solr-include-files,instructions>>) you can omit `-z <zk host string>` from the above command.+NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see xref:zookeeper-ensemble#updating-solr-include-files[Updating Solr Include Files]) you can omit `-z <zk host string>` from the above command.=== Test the Configurationdiff --git a/solr/solr-ref-guide/src/mbean-request-handler.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/mbean-request-handler.adocsimilarity index 87%rename from solr/solr-ref-guide/src/mbean-request-handler.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/mbean-request-handler.adocindex a2f9945c6c1..9cdc447bcc9 100644--- a/solr/solr-ref-guide/src/mbean-request-handler.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/mbean-request-handler.adoc@@ -16,7 +16,7 @@// specific language governing permissions and limitations// under the License.-The MBean Request Handler offers programmatic access to the information provided on the <<plugins-stats-screen.adoc#,Plugin/Stats>> page of the Admin UI.+The MBean Request Handler offers programmatic access to the information provided on the xref:plugins-stats-screen.adoc[] of the Admin UI.The MBean Request Handler accepts the following parameters:@@ -57,11 +57,11 @@ The default is `false`.|===+The output format.-This operates the same as the <<response-writers.adoc#,`wt` parameter in a query>>.+This operates the same as the xref:query-guide:response-writers.adoc[`wt` parameter in a query].== MBeanRequestHandler Examples-All of the examples in this section assume you are running the <<tutorial-techproducts.adoc#,"techproducts" example>>.+All of the examples in this section assume you are running the xref:getting-started:tutorial-techproducts.adoc["techproducts" example].To return information about the CACHE category only:diff --git a/solr/solr-ref-guide/src/metrics-reporting.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/metrics-reporting.adocsimilarity index 99%rename from solr/solr-ref-guide/src/metrics-reporting.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/metrics-reporting.adocindex 5734beee13c..74b2cd7cf87 100644--- a/solr/solr-ref-guide/src/metrics-reporting.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/metrics-reporting.adoc@@ -104,7 +104,7 @@ When making requests with the <<Metrics API>>, you can specify `&group=jetty` toThe metrics available in your system can be customized by modifying the `<metrics>` element in `solr.xml`.-TIP: See also the section <<configuring-solr-xml.adoc#,Format of Solr.xml>> for more information about the `solr.xml` file, where to find it, and how to edit it.+TIP: See also the section xref:configuration-guide:configuring-solr-xml.adoc[] for more information about the `solr.xml` file, where to find it, and how to edit it.=== Disabling the Metrics CollectionThe `<metrics>` element in `solr.xml` supports one attribute `enabled`, which takes a boolean value,@@ -184,7 +184,7 @@ This element also supports the `clock` parameter shown above with the `meter` el|===+The fully-qualified class name of the `Reservoir` implementation to use.-The default is `com.codahale.metrics.ExponentiallyDecayingReservoir` but there are other options available with the http://metrics.dropwizard.io/{ivy-dropwizard-version}/manual/core.html#histograms[Codahale Metrics library] that Solr uses.+The default is `com.codahale.metrics.ExponentiallyDecayingReservoir` but there are other options available with the http://metrics.dropwizard.io/{dep-version-dropwizard}/manual/core.html#histograms[Codahale Metrics library] that Solr uses.`<int name="size">`:::+diff --git a/solr/solr-ref-guide/src/monitoring-with-prometheus-and-grafana.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/monitoring-with-prometheus-and-grafana.adocsimilarity index 91%rename from solr/solr-ref-guide/src/monitoring-with-prometheus-and-grafana.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/monitoring-with-prometheus-and-grafana.adocindex d699bf6361b..ba1b90f0bee 100644--- a/solr/solr-ref-guide/src/monitoring-with-prometheus-and-grafana.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/monitoring-with-prometheus-and-grafana.adoc@@ -18,12 +18,12 @@If you use https://prometheus.io[Prometheus] and https://grafana.com[Grafana] for metrics storage and data visualization, Solr includes a Prometheus exporter to collect metrics and other data.-A Prometheus exporter (`solr-exporter`) allows users to monitor not only Solr metrics which come from <<metrics-reporting.adoc#,Metrics API>>, but also facet counts which come from <<query-guide.adoc#,Query Guide>> and responses to <<collections-api.adoc#,Collections API>> commands and <<ping.adoc#,PingRequestHandler>> requests.+A Prometheus exporter (`solr-exporter`) allows users to monitor not only Solr metrics which come from the xref:metrics-reporting.adoc#metrics-api[Metrics API], but also facet counts which come from xref:query-guide:faceting.adoc[] and responses to xref:configuration-guide:collections-api.adoc[] commands and xref:ping.adoc[] requests.This graphic provides a more detailed view:.solr-exporter Diagram-image::images/monitoring-with-prometheus-and-grafana/solr-exporter-diagram.png[image,width=600]+image::monitoring-with-prometheus-and-grafana/solr-exporter-diagram.png[image,width=600]The Prometheus exporter is included with the Solr distribution, and is located under `prometheus-exporter/`.@@ -212,7 +212,7 @@ Extra JVM options.|===+Credentials for connecting to a ZooKeeper host that is protected with ACLs.-For more information on what to include in this variable, refer to the section <<zookeeper-access-control.adoc#zookeeper-acls-in-solr-scripts,ZooKeeper Access Control>> or the <<getting-metrics-from-a-secured-solrcloud,example below>>.+For more information on what to include in this variable, refer to the section xref:zookeeper-access-control.adoc#zookeeper-acls-in-solr-scripts[ZooKeeper ACLs in Solr Scripts] or the example <<getting-metrics-from-a-secured-solrcloud>> below.`CLASSPATH_PREFIX`::+@@ -223,15 +223,14 @@ For more information on what to include in this variable, refer to the section <+Location of extra libraries to load when starting the `solr-exporter`.-All <<#command-line-parameters,command line parameters>> are able to be provided via environment variables when using the `./bin` scripts.+All <<command-line-parameters>> are able to be provided via environment variables when using the `./bin` scripts.=== Getting Metrics from a Secured SolrCloud-Your SolrCloud might be secured by measures described in <<securing-solr.adoc#,Securing Solr>>.-The security configuration can be injected into `solr-exporter` using environment variables in a fashion similar to other clients using <<solrj.adoc#,SolrJ>>.-This is possible because the main script picks up <<Environment Variable Options>> and passes them on to the Java process.+Your SolrCloud security configuration can be injected into `solr-exporter` using environment variables in a fashion similar to other clients using xref:solrj.adoc[].+This is possible because the main script picks up <<Environment Variable Options>> and passes them on to the Java process.-Example for a SolrCloud instance secured by <<basic-authentication-plugin.adoc#,Basic Authentication>>, <<enabling-ssl.adoc#,SSL>> and <<zookeeper-access-control.adoc#,ZooKeeper Access Control>>:+The following example assumes a SolrCloud instance secured by xref:basic-authentication-plugin.adoc[], xref:enabling-ssl.adoc[SSL] and xref:zookeeper-access-control.adoc[].Suppose you have a file `basicauth.properties` with the Solr Basic-Auth credentials:@@ -409,10 +408,10 @@ Between these elements, the data the `solr-exporter` should request is defined.There are several possible types of requests to make:[horizontal]-`<ping>`:: Scrape the response to a <<ping.adoc#,PingRequestHandler>> request.-`<metrics>`:: Scrape the response to a <<metrics-reporting.adoc#metrics-api,Metrics API>> request.-`<collections>`:: Scrape the response to a <<collections-api.adoc#,Collections API>> request.-`<search>`:: Scrape the response to a <<query-guide.adoc#,search>> request.+`<ping>`:: Scrape the response to a xref:ping.adoc[] request.+`<metrics>`:: Scrape the response to a xref:metrics-reporting.adoc#metrics-api[Metrics API] request.+`<collections>`:: Scrape the response to a xref:configuration-guide:collections-api.adoc[] request.+`<search>`:: Scrape the response to a xref:query-guide:query-syntax-and-parsers.adoc[query] request.Within each of these types, we need to define the query and how to work with the response.To do this, we define two additional elements:@@ -551,7 +550,7 @@ You can test that the Prometheus server, `solr-exporter`, and Solr are working tdoing a query for `solr_ping` metric in the Prometheus GUI:.Prometheus Solr Ping expression-image::images/monitoring-with-prometheus-and-grafana/prometheus-solr-ping.png[image,width=800]+image::monitoring-with-prometheus-and-grafana/prometheus-solr-ping.png[image,width=800]== Sample Grafana Dashboard@@ -567,4 +566,4 @@ TIP: You can directly import the Solr dashboard https://grafana.com/grafana/dashThis screenshot shows what it might look like:.Grafana Dashboard-image::images/monitoring-with-prometheus-and-grafana/grafana-solr-dashboard.png[image,width=800]+image::monitoring-with-prometheus-and-grafana/grafana-solr-dashboard.png[image,width=800]diff --git a/solr/solr-ref-guide/src/node-roles.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/node-roles.adocsimilarity index 100%rename from solr/solr-ref-guide/src/node-roles.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/node-roles.adocdiff --git a/solr/solr-ref-guide/src/performance-statistics-reference.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/performance-statistics-reference.adocsimilarity index 97%rename from solr/solr-ref-guide/src/performance-statistics-reference.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/performance-statistics-reference.adocindex 79c3578a184..9f2f7f8c005 100644--- a/solr/solr-ref-guide/src/performance-statistics-reference.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/performance-statistics-reference.adoc@@ -19,7 +19,7 @@This page explains some of the statistics that Solr exposes.There are two approaches to retrieving metrics.-First, you can use the <<metrics-reporting.adoc#metrics-api,Metrics API>>, or you can enable JMX and get metrics from the <<mbean-request-handler.adoc#,MBean Request Handler>> or via an external tool such as JConsole.+First, you can use the xref:metrics-reporting.adoc#metrics-api[Metrics API], or you can enable JMX and get metrics from the xref:mbean-request-handler.adoc[] or via an external tool such as JConsole.The below descriptions focus on retrieving the metrics using the Metrics API, but the metric names are the same if using the MBean Request Handler or an external tool.These statistics are per core.@@ -219,4 +219,4 @@ When eviction by heap usage is enabled, the following additional statistics are|evictionsRamUsage| Number of cache evictions for the current index searcher because heap usage exceeded maxRamMB.|===-More information on Solr caches is available in the section <<caches-warming.adoc#,Caches and Query Warming>>.+More information on Solr caches is available in the section xref:configuration-guide:caches-warming.adoc[].diff --git a/solr/solr-ref-guide/src/ping.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/ping.adocsimilarity index 90%rename from solr/solr-ref-guide/src/ping.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/ping.adocindex 04337006a1f..d85c080c826 100644--- a/solr/solr-ref-guide/src/ping.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/ping.adoc@@ -19,10 +19,10 @@Choosing Ping under a core name issues a `ping` request to check whether the core is up and responding to requests..Ping Option in Core Dropdown-image::images/ping/ping.png[image,width=171,height=195]+image::ping/ping.png[image,width=171,height=195]-The search executed by a Ping is configured with the <<request-parameters-api.adoc#,Request Parameters API>>.-See <<implicit-requesthandlers.adoc#,Implicit Request Handlers>> for the paramset to use for the `/admin/ping` endpoint.+The search executed by a Ping is configured with the xref:configuration-guide:request-parameters-api.adoc[].+See xref:configuration-guide:implicit-requesthandlers.adoc[] for the paramset to use for the `/admin/ping` endpoint.The Ping option doesn't open a page, but the status of the request can be seen on the core overview page shown when clicking on a collection name.The length of time the request has taken is displayed next to the Ping option, in milliseconds.diff --git a/solr/solr-ref-guide/src/plugins-stats-screen.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/plugins-stats-screen.adocsimilarity index 95%rename from solr/solr-ref-guide/src/plugins-stats-screen.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/plugins-stats-screen.adocindex 84ecf83564a..81bc46b2573 100644--- a/solr/solr-ref-guide/src/plugins-stats-screen.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/plugins-stats-screen.adoc@@ -23,7 +23,7 @@ Choose an area of interest on the right, and then drill down into more specificsIn this example, we've chosen to look at the Searcher stats, from the Core area:.Searcher Statistics-image::images/plugins-stats-screen/plugin-searcher.png[image,width=462,height=250]+image::plugins-stats-screen/plugin-searcher.png[image,width=462,height=250]The display is a snapshot taken when the page is loaded.You can get updated status by choosing to either *Watch Changes* or *Refresh Values*.diff --git a/solr/solr-ref-guide/src/python.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/python.adocsimilarity index 90%rename from solr/solr-ref-guide/src/python.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/python.adocindex 900979fdaee..f2fbd3bf5c6 100644--- a/solr/solr-ref-guide/src/python.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/python.adoc@@ -16,7 +16,7 @@// specific language governing permissions and limitations// under the License.-Solr includes an output format specifically for <<response-writers.adoc#python-response-writer,Python>>, but <<response-writers.adoc#json-response-writer,JSON output>> is a little more robust.+Solr includes an output format specifically for xref:query-guide:response-writers.adoc#python-response-writer[Python Response Writer], but the xref:query-guide:response-writers.adoc#json-response-writer[JSON Response Writer] is a little more robust.== Simple Pythondiff --git a/solr/solr-ref-guide/src/rate-limiters.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/rate-limiters.adocsimilarity index 100%rename from solr/solr-ref-guide/src/rate-limiters.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/rate-limiters.adocdiff --git a/solr/solr-ref-guide/src/replica-management.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/replica-management.adocsimilarity index 96%rename from solr/solr-ref-guide/src/replica-management.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/replica-management.adocindex 2965b182123..8e7bf30fa03 100644--- a/solr/solr-ref-guide/src/replica-management.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/replica-management.adoc@@ -189,7 +189,7 @@ These possible values are allowed:* `pull`: The PULL type does not maintain a transaction log and only updates its index via replication.This type is not eligible to become a leader.+-See the section <<solrcloud-shards-indexing.adoc#types-of-replicas,Types of Replicas>> for more information about replica type options.+See the section xref:solrcloud-shards-indexing.adoc#types-of-replicas[Types of Replicas] for more information about replica type options.`nrtReplicas`::+@@ -229,7 +229,7 @@ Defaults to `1` if `type` is `pull` otherwise `0`.|===+Set core property _name_ to _value_.-See <<core-discovery.adoc#,Core Discovery>> for details about supported properties and values.+See xref:configuration-guide:core-discovery.adoc[] for details about supported properties and values.[WARNING]====@@ -255,7 +255,7 @@ If `false`, the API will return the status of the single action, which may be be|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].=== Additional Examples using ADDREPLICA@@ -445,7 +445,7 @@ Defaults to `true`, but is ignored if the replica does not have the property `sh|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].[[deletereplica]]@@ -579,7 +579,7 @@ When set to `true`, no action will be taken if the replica is active.|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].[[addreplicaprop]]== ADDREPLICAPROP: Add Replica Propertydiff --git a/solr/solr-ref-guide/src/ruby.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/ruby.adocsimilarity index 95%rename from solr/solr-ref-guide/src/ruby.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/ruby.adocindex 84f0eeef2dd..92b71b5a708 100644--- a/solr/solr-ref-guide/src/ruby.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/ruby.adoc@@ -16,7 +16,7 @@// specific language governing permissions and limitations// under the License.-Solr has an optional Ruby response format that extends the <<response-writers.adoc#json-response-writer,JSON output>> to allow the response to be safely eval'd by Ruby's interpreter+Solr has an optional Ruby response format that extends the xref:query-guide:response-writers.adoc#json-response-writer[JSON Response Writer] to allow the response to be safely eval'd by Ruby's interpreterThis Ruby response format differs from JSON in the following ways:diff --git a/solr/solr-ref-guide/src/rule-based-authorization-plugin.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/rule-based-authorization-plugin.adocsimilarity index 90%rename from solr/solr-ref-guide/src/rule-based-authorization-plugin.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/rule-based-authorization-plugin.adocindex 2d4f796a987..7e99462bc96 100644--- a/solr/solr-ref-guide/src/rule-based-authorization-plugin.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/rule-based-authorization-plugin.adoc@@ -43,7 +43,7 @@ The users that RBAP sees come from whatever authentication plugin has been confiRBAP is compatible with all of the authentication plugins that Solr ships with out of the box.It is also compatible with any custom authentication plugins users might write, provided that the plugin sets a user principal on the HttpServletRequest it receives.-The user value seen by RBAP in each case depends on the authentication plugin being used: the Kerberos principal if the <<kerberos-authentication-plugin.adoc#,Kerberos Authentication Plugin>> is being used, the "sub" JWT claim if the <<jwt-authentication-plugin.adoc#,JWT Authentication Plugin>> is being used, etc.+The user value seen by RBAP in each case depends on the authentication plugin being used: the Kerberos principal if the xref:kerberos-authentication-plugin.adoc[] is being used, the "sub" JWT claim if the xref:jwt-authentication-plugin.adoc[] is being used, etc.=== Roles@@ -69,7 +69,7 @@ Administrators can use permissions from a list of predefined options or define t== Configuring the Rule-Based Authorization PluginsLike all of Solr's security plugins, configuration for RBAP lives in a file or ZooKeeper node with the name `security.json`.-See <<authentication-and-authorization-plugins.adoc#configuring-security-json,Configuring security.json>> for more information on how to setup `security.json` in your cluster.+See xref:authentication-and-authorization-plugins.adoc#configuring-security-json[Configuring security.json] for more information on how to setup `security.json` in your cluster.Solr offers an <<Authorization API>> for making changes to RBAP configuration.Authorized administrators should use this to make changes under most circumstances.@@ -154,7 +154,7 @@ For some plugins the principal name and short name may be the same.=== Example for RuleBasedAuthorizationPlugin and BasicAuth-This example `security.json` shows how the <<basic-authentication-plugin.adoc#,Basic authentication plugin>> can work with the `RuleBasedAuthorizationPlugin` plugin:+This example `security.json` shows how the xref:basic-authentication-plugin.adoc[] can work with the `RuleBasedAuthorizationPlugin` plugin:[source,json]----@@ -199,7 +199,7 @@ All other APIs are left open, and can be accessed by both users.=== Example for External Role RuleBasedAuthorizationPlugin with JWT auth-This example `security.json` shows how the <<jwt-authentication-plugin.adoc#,JWT authentication plugin>>, which pulls user and user roles from JWT claims, can work with the `ExternalRoleRuleBasedAuthorizationPlugin` plugin:+This example `security.json` shows how the xref:jwt-authentication-plugin.adoc[], which pulls user and user roles from JWT claims, can work with the `ExternalRoleRuleBasedAuthorizationPlugin` plugin:[source,json]----@@ -394,23 +394,23 @@ The predefined permission names (and their effects) are:* *security-edit*: this permission is allowed to edit the security configuration, meaning any update action that modifies `security.json` through the APIs will be allowed.* *security-read*: this permission is allowed to read the security configuration, meaning any action that reads `security.json` settings through the APIs will be allowed.-* *schema-edit*: this permission is allowed to edit a collection's schema using the <<schema-api.adoc#,Schema API>>.+* *schema-edit*: this permission is allowed to edit a collection's schema using the xref:indexing-guide:schema-api.adoc[].Note that this allows schema edit permissions for _all_ collections.If edit permissions should only be applied to specific collections, a custom permission would need to be created.-* *schema-read*: this permission is allowed to read a collection's schema using the <<schema-api.adoc#,Schema API>>.+* *schema-read*: this permission is allowed to read a collection's schema using the xref:indexing-guide:schema-api.adoc[].Note that this allows schema read permissions for _all_ collections.If read permissions should only be applied to specific collections, a custom permission would need to be created.-* *config-edit*: this permission is allowed to edit a collection's configuration using the <<config-api.adoc#,Config API>>, the <<request-parameters-api.adoc#,Request Parameters API>>, and other APIs which modify `configoverlay.json`.+* *config-edit*: this permission is allowed to edit a collection's configuration using the xref:configuration-guide:config-api.adoc[], the xref:configuration-guide:request-parameters-api.adoc[], and other APIs which modify `configoverlay.json`.Note that this allows configuration edit permissions for _all_ collections.If edit permissions should only be applied to specific collections, a custom permission would need to be created.-* *config-read*: this permission is allowed to read a collection's configuration using the <<config-api.adoc#,Config API>>, the <<request-parameters-api.adoc#,Request Parameters API>>, <<configsets-api.adoc#configsets-list,Configsets API>>, the Admin UI's <<configuration-files.adoc#files-screen,Files Screen>>, and other APIs accessing configuration.+* *config-read*: this permission is allowed to read a collection's configuration using the xref:configuration-guide:config-api.adoc[], the xref:configuration-guide:request-parameters-api.adoc[], xref:configuration-guide:configsets-api.adoc#configsets-list[Configsets API], the Admin UI's xref:configuration-guide:configuration-files.adoc#files-screen[Files Screen], and other APIs accessing configuration.Note that this allows configuration read permissions for _all_ collections.If read permissions should only be applied to specific collections, a custom permission would need to be created.-* *metrics-read*: this permission allows access to Solr's <<metrics-reporting.adoc#metrics-api,Metrics API>>, some <<implicit-requesthandlers#admin-handlers,implicit admin handlers>> such as `solr/<collection>/admin/mbeans` and `solr/<collection>/admin/segments` as well as other admin APIs exposing metrics.-* *health*: this permission allows access to Solr's <<implicit-requesthandlers#admin-handlers,Health Check and Ping>> endpoints, typically used to monitor whether a node or core is healthy.+* *metrics-read*: this permission allows access to Solr's xref:metrics-reporting.adoc#metrics-api[Metrics API], some xref:configuration-guide:implicit-requesthandlers.adoc#admin-handlers[implicit admin handlers] such as `solr/<collection>/admin/mbeans` and `solr/<collection>/admin/segments`, as well as other admin APIs exposing metrics.+* *health*: this permission allows access to Solr's xref:configuration-guide:implicit-requesthandlers.adoc#admin-handlers[Health Check and Ping] endpoints, typically used to monitor whether a node or core is healthy.* *core-admin-edit*: Core admin commands that can mutate the system state.* *core-admin-read*: Read operations on the core admin API-* *collection-admin-edit*: this permission is allowed to edit a collection's configuration using the <<collections-api.adoc#,Collections API>>.+* *collection-admin-edit*: this permission is allowed to edit a collection's configuration using the xref:configuration-guide:collections-api.adoc[].Note that this allows configuration edit permissions for _all_ collections.If edit permissions should only be applied to specific collections, a custom permission would need to be created.+@@ -439,7 +439,7 @@ Specifically, the following actions of the Collections API would be allowed:| REBALANCELEADERS|===-* *collection-admin-read*: this permission is allowed to read a collection's configuration using the <<collections-api.adoc#,Collections API>>.+* *collection-admin-read*: this permission is allowed to read a collection's configuration using the xref:configuration-guide:collections-api.adoc[].Note that this allows configuration read permissions for _all_ collections.If read permissions should only be applied to specific collections, a custom permission would need to be created.+@@ -451,10 +451,10 @@ CLUSTERSTATUS +REQUESTSTATUS* *update*: this permission is allowed to perform any update action on any collection.-This includes sending documents for indexing (using an <<requesthandlers-searchcomponents.adoc#update-request-handlers,update request handler>>).+This includes sending documents for indexing (using an xref:configuration-guide:requesthandlers-searchcomponents.adoc#update-request-handlers[update request handler]).This applies to all collections by default (`collection:"*"`).* *read*: this permission is allowed to perform any read action on any collection.-This includes querying using search handlers (using <<requesthandlers-searchcomponents.adoc#search-handlers,request handlers>>) such as `/select`, `/get`, `/tvrh`, `/terms`, `/clustering`, `/elevate`, `/export`, `/spell`, `/clustering`, and `/sql`.+This includes querying using search handlers (using xref:configuration-guide:requesthandlers-searchcomponents.adoc#search-handlers[request handlers]) such as `/select`, `/get`, `/tvrh`, `/terms`, `/clustering`, `/elevate`, `/export`, `/spell`, `/clustering`, and `/sql`.This applies to all collections by default ( `collection:"*"` ).* *zk-read* : Permission to read content from ZK (`/api/cluster/zk/data/*` , `/api/cluster/zk/ls/*` )* *all*: Any requests coming to Solr.diff --git a/solr/solr-ref-guide/src/securing-solr.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/securing-solr.adocsimilarity index 81%rename from solr/solr-ref-guide/src/securing-solr.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/securing-solr.adocindex 76f65f47285..3732cea17cb 100644--- a/solr/solr-ref-guide/src/securing-solr.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/securing-solr.adoc@@ -36,13 +36,13 @@ When planning how to secure Solr, you should consider which of the available feaEncrypting traffic to/from Solr and between Solr nodes prevents sensitive data to be leaked out on the network.TLS is also normally a requirement to prevent credential sniffing when using Authentication.-See the section <<enabling-ssl.adoc#,Enabling TLS (SSL)>> for details.+See the section xref:enabling-ssl.adoc[] for details.== Authentication and Authorization-Use the <<security-ui.adoc#,Security>> screen in the Admin UI to manage users, roles, and permissions.+Use the xref:security-ui.adoc[] screen in the Admin UI to manage users, roles, and permissions.-See chapter <<authentication-and-authorization-plugins.adoc#,Configuring Authentication and Authorization>> to learn how to work with the `security.json` file.+See section xref:authentication-and-authorization-plugins.adoc[] to learn how to work with the `security.json` file.[#securing-solr-auth-plugins]=== Authentication Plugins@@ -53,11 +53,11 @@ The authentication plugins that ship with Solr are:// tag::list-of-authentication-plugins[][width=100%,cols="1,1",frame=none,grid=none,stripes=none]|===-| <<basic-authentication-plugin.adoc#,Basic Authentication Plugin>>-| <<kerberos-authentication-plugin.adoc#,Kerberos Authentication Plugin>>-| <<jwt-authentication-plugin.adoc#,JWT Authentication Plugin>>-| <<cert-authentication-plugin.adoc#,Certificate Authentication Plugin>>-| <<hadoop-authentication-plugin.adoc#,Hadoop Authentication Plugin>>+| xref:basic-authentication-plugin.adoc[]+| xref:kerberos-authentication-plugin.adoc[]+| xref:jwt-authentication-plugin.adoc[]+| xref:cert-authentication-plugin.adoc[]+| xref:hadoop-authentication-plugin.adoc[]||===// end::list-of-authentication-plugins[]@@ -70,15 +70,15 @@ The authorization plugins that ship with Solr are:// tag::list-of-authorization-plugins[][width=100%,cols="1,1",frame=none,grid=none,stripes=none]|===-| <<rule-based-authorization-plugin.adoc#,Rule-Based Authorization Plugin>>-| <<rule-based-authorization-plugin.adoc#,External Role Rule-Based Authorization Plugin>>+| xref:rule-based-authorization-plugin.adoc[]+| xref:rule-based-authorization-plugin.adoc[External Role Rule-Based Authorization Plugin]|===// end::list-of-authorization-plugins[]== Audit LoggingAudit logging will record an audit trail of incoming reqests to your cluster, such as users being denied access to admin APIs.-Learn more about audit logging and how to implement an audit logger plugin in the section <<audit-logging.adoc#,Audit Logging>>.+Learn more about audit logging and how to implement an audit logger plugin in the section xref:audit-logging.adoc[].== IP Access Control@@ -95,7 +95,7 @@ SOLR_IP_DENYLIST="192.168.0.3, 192.168.0.4"== Securing ZooKeeper TrafficZooKeeper is a central and important part of a SolrCloud cluster and understanding how to secure-its content is covered in the section <<zookeeper-access-control.adoc#,ZooKeeper Access Control>>.+its content is covered in the section xref:zookeeper-access-control.adoc[].== Network Configurationdiff --git a/solr/solr-ref-guide/src/security-ui.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/security-ui.adocsimilarity index 72%rename from solr/solr-ref-guide/src/security-ui.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/security-ui.adocindex 472237bb3ad..a5fa8a9df54 100644--- a/solr/solr-ref-guide/src/security-ui.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/security-ui.adoc@@ -21,15 +21,15 @@ The Security screen allows administrators with the `security-edit` permission toThe Security screen works with Solr running in cloud and standalone modes..Security Screen-image::images/solr-admin-ui/security.png[]+image::getting-started:solr-admin-ui/security.png[]== Getting StartedThe Security screen warns you if security is not enabled for Solr. You are strongly encouraged to enable security for Solr instances exposed on any network other than localhost.-image::images/security-ui/security-not-enabled-warn.png[image,width=500]+image::security-ui/security-not-enabled-warn.png[image,width=500]-When first getting started with Solr, use the `bin/solr auth` command-line utility to enable security for your Solr installation (cloud mode only), see <<solr-control-script-reference.adoc#authentication,bin/solr auth>> for usage instructions.+When first getting started with Solr, use the `bin/solr auth` command-line utility to enable security for your Solr installation (cloud mode only), see xref:solr-control-script-reference.adoc#authentication[`bin/solr auth`] for usage instructions.For example, the following command will enable *basic authentication* and prompt you for the username and password for the initial user with administrative access:[source,bash]----@@ -43,15 +43,15 @@ You do not need to restart Solr as the security configuration will be refreshedThe Security screen provides the following features:* Security Settings: Details about the configured authentication and authorization plugins.-* Users: Read, create, update, and delete user accounts if using the <<basic-authentication-plugin.adoc#,Basic Authentication>> plugin; this panel is disabled for all other authentication plugins.-* Roles: Read, create, and update roles if using the <<rule-based-authorization-plugin.adoc#,Rule-based Authorization>> plugin; this panel is disabled for all other authorization plugins.-* Permissions: Read, create, update, and delete permissions if using the <<rule-based-authorization-plugin.adoc#,Rule-based Authorization>> plugin.+* Users: Read, create, update, and delete user accounts if using the xref:basic-authentication-plugin.adoc[] plugin; this panel is disabled for all other authentication plugins.+* Roles: Read, create, and update roles if using the xref:rule-based-authorization-plugin.adoc[] plugin; this panel is disabled for all other authorization plugins.+* Permissions: Read, create, update, and delete permissions if using the xref:rule-based-authorization-plugin.adoc[] plugin.== User Management-Administrators can read, create, update, and delete user accounts when using the <<basic-authentication-plugin.adoc#,Basic Authentication>> plugin.+Administrators can read, create, update, and delete user accounts when using the xref:basic-authentication-plugin.adoc[] plugin.-image::images/security-ui/users.png[image,width=500]+image::security-ui/users.png[image,width=500].Limited User Management Capabilities[NOTE]@@ -62,19 +62,20 @@ Consequently, if a user account has been compromised, then an administrator needTo edit a user account, click on the row in the table to open the edit user dialog. You can change a user's password and change their role membership.-image::images/security-ui/edit-user-dialog.png[image,width=400]+image::security-ui/edit-user-dialog.png[image,width=400]For systems with many user accounts, use the filter controls at the top of the user table to find users based on common properties.-image::images/security-ui/filter-users.png[image,width=400]+image::security-ui/filter-users.png[image,width=400]-For other authentication plugins, such as the <<jwt-authentication-plugin.adoc#,JWT Authentication>> plugin, this panel will be disabled as users are managed by an external system.+For other authentication plugins, such as the xref:jwt-authentication-plugin.adoc[] plugin, this panel will be disabled as users are managed by an external system.== Role Management-<<rule-based-authorization-plugin.adoc#roles,Roles>> link users to permissions. If using the <<rule-based-authorization-plugin.adoc#,Rule-based Authorization>> plugin, administrators can read, create, and update roles. Deleting roles is not supported.+xref:rule-based-authorization-plugin.adoc#roles[Roles] link users to permissions.+If using the Rule-based Authorization plugin, administrators can read, create, and update roles. Deleting roles is not supported.-image::images/security-ui/roles.png[image,width=500]+image::security-ui/roles.png[image,width=500]To edit a role, simply click on the corresponding row in the table.@@ -84,15 +85,15 @@ If not using the Rule-based Authorization plugin, the Roles panel will be disablThe *Permissions* panel on the Security screen allows administrators to read, create, update, and delete permissions.-image::images/security-ui/permissions.png[image,width=900]+image::security-ui/permissions.png[image,width=900]-For detailed information about how permissions work in Solr, see: <<rule-based-authorization-plugin.adoc#permissions,Rule-based Authorization Permissions>>.+For detailed information about how permissions work in Solr, see: xref:rule-based-authorization-plugin.adoc#permissions[Rule-based Authorization Permissions].=== Add PermissionClick on the btn:[Add Permission] button to open the Add Permission dialog.-image::images/security-ui/add-permission.png[image,width=600]+image::security-ui/add-permission.png[image,width=600]You can _either_ select a *Predefined* permission from the drop-down select list or provide a unique name for a custom permission.Creating a new *Predefined* permission is simply a matter of mapping the permission to zero or more roles as the other settings, such as path, are immutable for predefined permissions.@@ -102,9 +103,5 @@ If you do not select any roles for a permission, then the permission is assignedHowever, if *Block anonymous requests* (`blockUnknown=true`) is checked, then anonymous users will not be allowed to make requests, thus permission with the `null` role are effectively inactive.To edit a permission, simply click on the corresponding row in the table. When editing a permission, the current index of the permission in the list of permissions is editable.-This allows you to re-order permissions if needed; see <<rule-based-authorization-plugin.adoc#permission-ordering-and-resolution,Permission Ordering>>.+This allows you to re-order permissions if needed; see xref:rule-based-authorization-plugin.adoc#permission-ordering-and-resolution[Permission Ordering].In general, you want to permissions listed from most specific to least specific in `security.json`.----diff --git a/solr/solr-ref-guide/src/shard-management.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/shard-management.adocsimilarity index 95%rename from solr/solr-ref-guide/src/shard-management.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/shard-management.adocindex 544377e7750..798c5624956 100644--- a/solr/solr-ref-guide/src/shard-management.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/shard-management.adoc@@ -108,7 +108,7 @@ When using `splitMethod=rewrite` (default) you must ensure that the node runningAlso, the first replicas of resulting sub-shards will always be placed on the shard leader node.Shard splitting can be a long running process.-In order to avoid timeouts, you should run this as an <<collections-api.adoc#asynchronous-calls,asynchronous call>>.+In order to avoid timeouts, you should run this as an xref:configuration-guide:collections-api.adoc#asynchronous-calls[asynchronous call].=== SPLITSHARD Parameters@@ -203,7 +203,7 @@ A float value which must be smaller than `0.5` that allows to vary the sub-shard|===+Set core property _name_ to _value_.-See the section <<core-discovery.adoc#,Core Discovery>> for details on supported properties and values.+See the section xref:configuration-guide:core-discovery.adoc[] for details on supported properties and values.`waitForFinalState`::+@@ -231,7 +231,7 @@ If `true` then each stage of processing will be timed and a `timing` section wil|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].`splitByPrefix`::+@@ -413,7 +413,7 @@ The defaults for the collection are used if omitted.|===+Set core property _name_ to _value_.-See the section <<core-discovery.adoc#,Core Discovery>> for details on supported properties and values.+See the section xref:configuration-guide:core-discovery.adoc[] for details on supported properties and values.`waitForFinalState`::+@@ -432,7 +432,7 @@ If `false`, the API will return the status of the single action, which may be be|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].=== CREATESHARD Response@@ -534,7 +534,7 @@ Set this to `false` to prevent the index directory from being deleted.|Optional |Default: none|===+-Request ID to track this action which will be <<collections-api.adoc#asynchronous-calls,processed asynchronously>>.+Request ID to track this action which will be xref:configuration-guide:collections-api.adoc#asynchronous-calls[processed asynchronously].=== DELETESHARD Responsediff --git a/solr/solr-ref-guide/src/solr-control-script-reference.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adocsimilarity index 94%rename from solr/solr-ref-guide/src/solr-control-script-reference.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adocindex ff7864ed828..d489d5abee5 100644--- a/solr/solr-ref-guide/src/solr-control-script-reference.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc@@ -23,7 +23,7 @@ You can start and stop Solr, create and delete collections or cores, perform opeYou can find the script in the `bin/` directory of your Solr installation.The `bin/solr` script makes Solr easier to work with by providing simple commands and options to quickly accomplish common goals.-More examples of `bin/solr` in use are available throughout this Guide, but particularly in the sections <<installing-solr.adoc#starting-solr,Starting Solr>> and <<tutorial-solrcloud.adoc#,Getting Started with SolrCloud>>.+More examples of `bin/solr` in use are available throughout this Guide, but particularly in the sections xref:installing-solr.adoc#starting-solr[Starting Solr] and xref:getting-started:tutorial-solrcloud.adoc[].== Starting and Stopping@@ -77,7 +77,7 @@ Start Solr in SolrCloud mode, which will also launch the embedded ZooKeeper inst+This option can be shortened to simply `-c`.+-If you are already running a ZooKeeper ensemble that you want to use instead of the embedded (single-node) ZooKeeper, you should also either specify `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see <<zookeeper-ensemble#updating-solr-include-files,instructions>>) or pass the `-z` parameter.+If you are already running a ZooKeeper ensemble that you want to use instead of the embedded (single-node) ZooKeeper, you should also either specify `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see xref:zookeeper-ensemble.adoc#updating-solr-include-files[Updating Solr Include Files]) or pass the `-z` parameter.+For more details, see the section <<SolrCloud Mode>> below.+@@ -282,7 +282,7 @@ The `-c` and `-cloud` options are equivalent:If you specify a ZooKeeper connection string, such as `-z 192.168.1.4:2181`, then Solr will connect to ZooKeeper and join the cluster.-NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see <<zookeeper-ensemble#updating-solr-include-files,instructions>>) you can omit `-z <zk host string>` from all `bin/solr` commands.+NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see xref:zookeeper-ensemble.adoc#updating-solr-include-files,Updating Solr Include Files>>) you can omit `-z <zk host string>` from all `bin/solr` commands.When starting Solr in SolrCloud mode, if you do not define `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` nor specify the `-z` option, then Solr will launch an embedded ZooKeeper server listening on the Solr port + 1000.For example, if Solr is running on port 8983, then the embedded ZooKeeper will listen on port 9983.@@ -296,7 +296,7 @@ To do this use the `mkroot` command outlined below, for example: `bin/solr zk mkWhen starting in SolrCloud mode, the interactive script session will prompt you to choose a configset to use.-For more information about starting Solr in SolrCloud mode, see also the section <<tutorial-solrcloud.adoc#,Getting Started with SolrCloud>>.+For more information about starting Solr in SolrCloud mode, see also the section xref:getting-started:tutorial-solrcloud.adoc[].==== Running with Example Configurations@@ -304,11 +304,11 @@ For more information about starting Solr in SolrCloud mode, see also the sectionThe example configurations allow you to get started quickly with a configuration that mirrors what you hope to accomplish with Solr.-Each example launches Solr with a managed schema, which allows use of the <<schema-api.adoc#,Schema API>> to make schema edits, but does not allow manual editing of a Schema file.+Each example launches Solr with a managed schema, which allows use of the xref:indexing-guide:schema-api.adoc[] to make schema edits, but does not allow manual editing of a Schema file.-If you would prefer to manually modify a `schema.xml` file directly, you can change this default as described in the section <<schema-factory.adoc#,Schema Factory Definition in SolrConfig>>.+If you would prefer to manually modify a `schema.xml` file directly, you can change this default as described in the section xref:configuration-guide:schema-factory.adoc[].-Unless otherwise noted in the descriptions below, the examples do not enable SolrCloud nor <<schemaless-mode.adoc#,schemaless mode>>.+Unless otherwise noted in the descriptions below, the examples do not enable SolrCloud nor xref:indexing-guide:schemaless-mode.adoc[].The following examples are provided:@@ -323,13 +323,14 @@ The configset used can be found in `$SOLR_TIP/server/solr/configsets/sample_tech+The data used can be found in `$SOLR_HOME/example/exampledocs/`.-* *schemaless*: This example starts a single-node Solr instance using a managed schema, as described in the section <<schema-factory.adoc#,Schema Factory Definition in SolrConfig>>, and provides a very minimal pre-defined schema.-Solr will run in <<schemaless-mode.adoc#,Schemaless Mode>> with this configuration, where Solr will create fields in the schema on the fly and will guess field types used in incoming documents.+* *schemaless*: This example starts a single-node Solr instance using a managed schema, as described in the section xref:configuration-guide:schema-factory.adoc[], and provides a very minimal pre-defined schema.+Solr will run in xref:indexing-guide:schemaless-mode.adoc[] with this configuration, where Solr will create fields in the schema on the fly and will guess field types used in incoming documents.+The configset used can be found in `$SOLR_TIP/server/solr/configsets/_default`.-* *films*: This example starts a single-node Solr instance using a managed schema, as described in the section <<schema-factory.adoc#,Schema Factory Definition in SolrConfig>>, and then uses the Schema API to create some custom fields.-Solr will run in <<schemaless-mode.adoc#,Schemaless Mode>> with this configuration, where Solr will create fields in the schema on the fly and will guess field types used in incoming documents as well. It then loads some sample film data.+* *films*: This example starts a single-node Solr instance using a managed schema, as described in the section xref:configuration-guide:schema-factory.adoc[], and then uses the Schema API to create some custom fields.+Solr will run in xref:indexing-guide:schemaless-mode.adoc[] with this configuration, where Solr will create fields in the schema on the fly and will guess field types used in incoming documents as well.+It then loads some sample film data.+The configset used can be found in `$SOLR_TIP/server/solr/configsets/_default`.+@@ -751,8 +752,8 @@ Currently, this script only enables Basic Authentication, and is only availableThe command `bin/solr auth enable` configures Solr to use Basic Authentication when accessing the User Interface, using `bin/solr` and any API requests.-TIP: For more information about Solr's authentication plugins, see the section <<securing-solr.adoc#,Securing Solr>>.-For more information on Basic Authentication support specifically, see the section <<basic-authentication-plugin.adoc#,Basic Authentication Plugin>>.+TIP: For more information about Solr's authentication plugins, see the section xref:securing-solr.adoc[].+For more information on Basic Authentication support specifically, see the section xref:basic-authentication-plugin.adoc[].The `bin/solr auth enable` command makes several changes to enable Basic Authentication:@@ -874,7 +875,7 @@ However, the `basicAuth.conf` file is not removed with either option.== Set or Unset Configuration Properties-The `bin/solr` script enables a subset of the Config API: <<config-api.adoc#commands-for-common-properties,(un)setting common properties>> and <<config-api.adoc#commands-for-user-defined-properties,(un)setting user-defined properties>>.+The `bin/solr` script enables a subset of the Config API: xref:configuration-guide:config-api.adoc#commands-for-common-properties[(un)setting common properties] and xref:configuration-guide:config-api.adoc#commands-for-user-defined-properties[(un)setting user-defined properties].`bin/solr config [options]`@@ -896,7 +897,7 @@ To unset a previously set common property, specify `-action unset-property` with=== Set or Unset User-Defined Properties-To set the user-defined property `update.autoCreateFields` to `false` (to disable <<schemaless-mode.adoc#,Schemaless Mode>>):+To set the user-defined property `update.autoCreateFields` to `false` (to disable xref:indexing-guide:schemaless-mode.adoc[]):`bin/solr config -c mycollection -p 8983 -action set-user-property -property update.autoCreateFields -value false`@@ -1049,7 +1050,7 @@ bin/solr zk upconfig -z 111.222.333.444:2181 -n mynewconfig -d /path/to/configse====This command does *not* automatically make changes effective!It simply uploads the configuration sets to ZooKeeper.-You can use the Collection API's <<collection-management.adoc#reload,RELOAD command>> to reload any collections that uses this configuration set.+You can use the Collection API's xref:collection-management.adoc#reload[RELOAD command] to reload any collections that uses this configuration set.======= Download a Configuration Set@@ -1467,7 +1468,7 @@ bin/solr export -url http://localhost:8983/solr/gettingstarted -1 -out 1MDocs.js=== Importing Documents to a Collection-Once you have exported documents in a file, you can use the <<indexing-with-update-handlers.adoc#,/update request handler>> to import them to a new Solr collection.+Once you have exported documents in a file, you can use the xref:indexing-guide:indexing-with-update-handlers.adoc[/update request handler] to import them to a new Solr collection.*Example: import `jsonl` files*diff --git a/solr/solr-ref-guide/src/solr-in-docker.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-in-docker.adocsimilarity index 94%rename from solr/solr-ref-guide/src/solr-in-docker.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/solr-in-docker.adocindex ab7ac6c8d75..9dfb283e38f 100644--- a/solr/solr-ref-guide/src/solr-in-docker.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-in-docker.adoc@@ -91,7 +91,7 @@ docker run --name solr_demo -d -p 8983:8983 solr solr-demo== How the Image Works-The container contains an installation of Solr, as installed by the <<taking-solr-to-production.adoc#service-installation-script,service installation script>>.+The container contains an installation of Solr, as installed by the xref:taking-solr-to-production.adoc#service-installation-script[service installation script].This stores the Solr distribution in `/opt/solr`, and configures Solr to use `/var/solr` to store data and logs, using the `/etc/default/solr` file for configuration.If you want to persist the data, mount a volume or directory on `/var/solr`.Solr expects some files and directories in `/var/solr`; if you use your own directory or volume you can either pre-populate them, or let Solr docker copy them for you.@@ -103,7 +103,7 @@ The Solr docker distribution adds scripts in `/opt/solr/docker/scripts` to make=== Creating CoresWhen Solr runs in standalone mode, you create "cores" to store data.-On a non-Docker Solr, you would run the server in the background, then use the <<solr-control-script-reference.adoc#,Solr control script>> to create cores and load data.+On a non-Docker Solr, you would run the server in the background, then use the xref:solr-control-script-reference.adoc[Solr control script] to create cores and load data.With Solr docker you have various options.==== Manually@@ -135,7 +135,7 @@ docker run -d -p 8983:8983 --name my_solr -v $PWD/config/solr:/my_core_config/co----N.B. When specifying the full path to the configset, the actual core configuration should be located inside that directory in the `conf` directory.-See <<config-sets.adoc#,Configsets>> for details.+See xref:configuration-guide:config-sets.adoc[] for details.==== Using solr-create Command@@ -187,8 +187,8 @@ The fourth way is to use the remote API, from the host or from one of the contaicurl 'http://localhost:8983/solr/admin/collections?action=CREATE&name=gettingstarted3&numShards=1&collection.configName=_default'-----If you want to use a custom config for your collection, you first need to upload it, and then refer to it by name when you create the collection.-See the Ref guide on how to use the <<solr-control-script-reference.adoc#upload-a-configuration-set,ZooKeeper upload>> or the <<configsets-api.adoc#configsets-upload,Configsets API>>.+If you want to use a custom configuration for your collection, you first need to upload it, and then refer to it by name when you create the collection.+You can use the xref:solr-control-script-reference.adoc#upload-a-configuration-set[`bin/solr zk` command] or the xref:configuration-guide:configsets-api.adoc#configsets-upload[Configsets API].=== Loading Your Own Data@@ -221,7 +221,7 @@ Alternatively, you can make the data available on a volume at Solr start time, a=== solr.in.sh ConfigurationIn Solr it is common to configure settings in https://github.com/apache/solr/blob/main/solr/bin/solr.in.sh[solr.in.sh],-as documented in the <<taking-solr-to-production.adoc#environment-overrides-include-file,Taking Solr to Production page>>.+as documented in the section xref:taking-solr-to-production.adoc#environment-overrides-include-file[Environment Overrides Include File].The `solr.in.sh` file can be found in `/etc/default`:@@ -313,7 +313,7 @@ jattach 10 jcmd GC.heap_info== Updating from Solr 5-7 to 8+-In Solr 8, the Solr Docker image switched from just extracting the Solr tar, to using the <<taking-solr-to-production.adoc#service-installation-script,service installation script>>.+In Solr 8, the Solr Docker image switched from just extracting the Solr tar, to using the xref:taking-solr-to-production.adoc#service-installation-script[service installation script].This was done for various reasons: to bring it in line with the recommendations by the Solr Ref Guide and to make it easier to mount volumes.This is a backwards incompatible change, and means that if you're upgrading from an older version, you will most likely need to make some changes.diff --git a/solr/solr-ref-guide/src/solr-on-hdfs.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adocsimilarity index 97%rename from solr/solr-ref-guide/src/solr-on-hdfs.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adocindex 7dc0513a0b4..c02b89e1cf9 100644--- a/solr/solr-ref-guide/src/solr-on-hdfs.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adoc@@ -17,7 +17,9 @@// under the License.-The Solr HDFS module has support for writing and reading its index and transaction log files to the HDFS distributed filesystem. This plugin must first be <<solr-plugins.adoc#installing-plugins,installed>> before using. This module needs to be installed as lib, it is planned to evolve to a Solr package in a later release.+The Solr HDFS module has support for writing and reading its index and transaction log files to the HDFS distributed filesystem.+This plugin must first be xref:configuration-guide:solr-plugins.adoc#installing-plugins[installed] before using.+This module needs to be installed as lib, it is planned to evolve to a Solr package in a later release.This does not use Hadoop MapReduce to process Solr data, rather it only uses the HDFS filesystem for index and transaction log file storage.diff --git a/solr/solr-ref-guide/src/solrcloud-distributed-requests.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solrcloud-distributed-requests.adocsimilarity index 97%rename from solr/solr-ref-guide/src/solrcloud-distributed-requests.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/solrcloud-distributed-requests.adocindex 9a95f115667..b8af8e821a2 100644--- a/solr/solr-ref-guide/src/solrcloud-distributed-requests.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solrcloud-distributed-requests.adoc@@ -115,7 +115,7 @@ There are several ways to control how queries are routed.=== Limiting Which Shards are Queried-While one of the advantages of using SolrCloud is the ability to query very large collections distributed across various shards, in some cases you may have configured Solr so you know <<solrcloud-shards-indexing.adoc#document-routing,you are only interested in results from a specific subset of shards>>.+While one of the advantages of using SolrCloud is the ability to query very large collections distributed across various shards, in some cases you may have configured Solr with specific xref:solrcloud-shards-indexing.adoc#document-routing[document routing].You have the option of searching over all of your data or just parts of it.Because SolrCloud automatically load balances queries, a query across all shards for a collection is simply a query that does not define a `shards` parameter:@@ -222,7 +222,7 @@ The difference is that the non-leader `TLOG` replica also captures updates in it`node.sysprop`::Query will be routed to nodes with same defined system properties as the current one.-For example, if you start Solr nodes on different racks, you'll want to identify those nodes by a <<property-substitution.adoc#jvm-system-properties,system property>> (e.g., `-Drack=rack1`).+For example, if you start Solr nodes on different racks, you'll want to identify those nodes by a xref:configuration-guide:property-substitution.adoc#jvm-system-properties[system property] (e.g., `-Drack=rack1`).Then, queries can contain `shards.preference=node.sysprop:sysprop.rack`, to make sure you always hit shards with the same value of `rack`.*Examples*:@@ -285,7 +285,7 @@ The `\_route_` parameter can be used to specify a route key which is used to figFor example, if you have a document with a unique key "user1!123", then specifying the route key as "_route_=user1!" (notice the trailing '!' character) will route the request to the shard which hosts that user.You can specify multiple route keys separated by comma.This parameter can be leveraged when we have shard data by users.-See <<solrcloud-shards-indexing.adoc#document-routing,Document Routing>> for more information+See xref:solrcloud-shards-indexing.adoc#document-routing[Document Routing] for more information[source,plain]----@@ -335,7 +335,7 @@ To add a `shardHandlerFactory` to the standard search handler, provide a configuNOTE:: The `shardHandlerFactory` is reliant on the `allowUrls` parameter configured in `solr.xml`, which controls which nodes are allowed to talk to each other.This means that the configuration of hosts is global instead of per-core or per-collection.-See the section <<configuring-solr-xml.adoc#allow-urls, Format of solr.allowUrls>> for details.+See the section xref:configuration-guide:configuring-solr-xml.adoc#allow-urls [allowUrls] for details.The `HttpShardHandlerFactory` accepts the following parameters:diff --git a/solr/solr-ref-guide/src/solrcloud-recoveries-and-write-tolerance.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solrcloud-recoveries-and-write-tolerance.adocsimilarity index 100%rename from solr/solr-ref-guide/src/solrcloud-recoveries-and-write-tolerance.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/solrcloud-recoveries-and-write-tolerance.adocdiff --git a/solr/solr-ref-guide/src/solrcloud-shards-indexing.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solrcloud-shards-indexing.adocsimilarity index 97%rename from solr/solr-ref-guide/src/solrcloud-shards-indexing.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/solrcloud-shards-indexing.adocindex 6595eb43a15..cbc20ca9aa2 100644--- a/solr/solr-ref-guide/src/solrcloud-shards-indexing.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solrcloud-shards-indexing.adoc@@ -40,7 +40,7 @@ Additionally, every shard can have multiple replicas for additional robustness.In SolrCloud there are no leaders or followers.Instead, every shard consists of at least one physical *replica*, exactly one of which is a *leader*.-Leaders are automatically elected, initially on a first-come-first-served basis, and then based on the ZooKeeper process described at http://zookeeper.apache.org/doc/r{ivy-zookeeper-version}/recipes.html#sc_leaderElection.+Leaders are automatically elected, initially on a first-come-first-served basis, and then based on the ZooKeeper process described at http://zookeeper.apache.org/doc/r{dep-version-zookeeper}/recipes.html#sc_leaderElection.If a leader goes down, one of the other replicas is automatically elected as the new leader.@@ -117,11 +117,11 @@ When it rejoins the cluster, it would replicate from the leader and when that is=== Queries with Preferred Replica TypesBy default all replicas serve queries.-See the section <<solrcloud-distributed-requests.adoc#shards-preference-parameter,shards.preference Parameter>> for details on how to indicate preferred replica types for queries.+See the section xref:solrcloud-distributed-requests.adoc#shards-preference-parameter[shards.preference Parameter] for details on how to indicate preferred replica types for queries.== Document Routing-Solr offers the ability to specify the router implementation used by a collection by specifying the `router.name` parameter when <<collection-management.adoc#create,creating your collection>>.+Solr offers the ability to specify the router implementation used by a collection by specifying the `router.name` parameter when xref:collection-management.adoc#create[creating your collection].If you use the `compositeId` router (the default), you can send documents with a prefix in the document ID which will be used to calculate the hash Solr uses to determine the shard a document is sent to for indexing.The prefix can be anything you'd like it to be (it doesn't have to be the shard name, for example), but it must be consistent so Solr behaves consistently.@@ -159,7 +159,7 @@ It currently allows splitting a shard into two pieces.The existing shard is left as-is, so the split action effectively makes two copies of the data as new shards.You can delete the old shard at a later time when you're ready.-More details on how to use shard splitting is in the section on the Collection API's <<shard-management.adoc#splitshard,SPLITSHARD command>>.+More details on how to use shard splitting is in the section on the Collection API's xref:shard-management.adoc#splitshard[SPLITSHARD command].== Ignoring Commits from Client Applications in SolrClouddiff --git a/solr/solr-ref-guide/src/solrcloud-with-legacy-configuration-files.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solrcloud-with-legacy-configuration-files.adocsimilarity index 95%rename from solr/solr-ref-guide/src/solrcloud-with-legacy-configuration-files.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/solrcloud-with-legacy-configuration-files.adocindex dc6af6c3ca5..afc8cb82dac 100644--- a/solr/solr-ref-guide/src/solrcloud-with-legacy-configuration-files.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solrcloud-with-legacy-configuration-files.adoc@@ -74,4 +74,4 @@ If you do not want the DistributedUpdateProcessFactory auto-injected into your cIn the update process, Solr skips updating processors that have already been run on other nodes.+For more on the default update request processor chain and options, see-the section <<update-request-processors.adoc#default-update-request-processor-chain,Default Update Request Processor Chain>>.+the section xref:configuration-guide:update-request-processors.adoc#default-update-request-processor-chain[Default Update Request Processor Chain].diff --git a/solr/solr-ref-guide/src/solrj.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solrj.adocsimilarity index 90%rename from solr/solr-ref-guide/src/solrj.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/solrj.adocindex a36aa366d8d..8f2ba8a9ce2 100644--- a/solr/solr-ref-guide/src/solrj.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solrj.adoc@@ -1,6 +1,4 @@= SolrJ-:solr-root-path: ../../-:example-source-dir: {solr-root-path}solrj/src/test/org/apache/solr/client/ref_guide_examples/// 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@@ -141,7 +139,7 @@ They should not include any collections, cores, or other path components.[source,java,indent=0]-----include::{example-source-dir}UsingSolrJRefGuideExamplesTest.java[tag=solrj-cloudsolrclient-baseurl]+include::example$UsingSolrJRefGuideExamplesTest.java[tag=solrj-cloudsolrclient-baseurl]----In case a `baseUrl` is not provided, then a list of ZooKeeper hosts (with ports) and ZooKeeper root must be provided.@@ -149,12 +147,12 @@ If no ZooKeeper root is used then `java.util.Optional.empty()` has to be provide[source,java,indent=0]-----include::{example-source-dir}UsingSolrJRefGuideExamplesTest.java[tag=solrj-cloudsolrclient-zookeepernoroot]+include::example$UsingSolrJRefGuideExamplesTest.java[tag=solrj-cloudsolrclient-zookeepernoroot]----[source,java,indent=0]-----include::{example-source-dir}UsingSolrJRefGuideExamplesTest.java[tag=solrj-cloudsolrclient-zookeeperroot]+include::example$UsingSolrJRefGuideExamplesTest.java[tag=solrj-cloudsolrclient-zookeeperroot]----@@ -164,7 +162,7 @@ These are provided at client creation time, as in the example below:[source,java,indent=0]-----include::{example-source-dir}UsingSolrJRefGuideExamplesTest.java[tag=solrj-solrclient-timeouts]+include::example$UsingSolrJRefGuideExamplesTest.java[tag=solrj-solrclient-timeouts]----When these values are not explicitly provided, SolrJ falls back to using the defaults for the OS/environment is running on.@@ -177,7 +175,7 @@ processing time of the largest update request.=== Cloud Request Routing-The SolrJ `CloudSolrClient` implementations (`CloudSolrClient` and `CloudHttp2SolrClient`) respect the <<solrcloud-distributed-requests.adoc#shards-preference-parameter,shards.preference parameter>>.+The SolrJ `CloudSolrClient` implementations (`CloudSolrClient` and `CloudHttp2SolrClient`) respect the xref:solrcloud-distributed-requests.adoc#shards-preference-parameter[shards.preference parameter].Therefore requests sent to single-sharded collections, using either of the above clients, will route requests the same way that distributed requests are routed to individual shards.If no `shards.preference` parameter is provided, the clients will default to sorting replicas randomly.@@ -192,7 +190,7 @@ The following snippet uses a SolrClient to query Solr's "techproducts" example c[source,java,indent=0]-----include::{example-source-dir}UsingSolrJRefGuideExamplesTest.java[tag=solrj-query-with-raw-solrparams]+include::example$UsingSolrJRefGuideExamplesTest.java[tag=solrj-query-with-raw-solrparams]----`SolrParams` has a `SolrQuery` subclass, which provides some convenience methods that greatly simplifies query creation.@@ -200,7 +198,7 @@ The following snippet shows how the query from the previous example can be built[source,java,indent=0]-----include::{example-source-dir}UsingSolrJRefGuideExamplesTest.java[tag=solrj-query-with-solrquery]+include::example$UsingSolrJRefGuideExamplesTest.java[tag=solrj-query-with-solrquery]----== Indexing in SolrJ@@ -212,7 +210,7 @@ The following example shows how to use SolrJ to add a document to Solr's "techpr[source,java,indent=0]-----include::{example-source-dir}UsingSolrJRefGuideExamplesTest.java[tag=solrj-index-with-raw-solrinputdoc]+include::example$UsingSolrJRefGuideExamplesTest.java[tag=solrj-index-with-raw-solrinputdoc]----CAUTION: The indexing examples above are intended to show syntax.@@ -231,21 +229,21 @@ The example snippet below shows an annotated `TechProduct` class that can be use[source,java,indent=0]-----include::{example-source-dir}UsingSolrJRefGuideExamplesTest.java[tag=solrj-techproduct-value-type]+include::example$UsingSolrJRefGuideExamplesTest.java[tag=solrj-techproduct-value-type]----Application code with access to the annotated `TechProduct` class above can index `TechProduct` objects directly without any conversion, as in the example snippet below:[source,java,indent=0]-----include::{example-source-dir}UsingSolrJRefGuideExamplesTest.java[tag=solrj-index-bean-value-type]+include::example$UsingSolrJRefGuideExamplesTest.java[tag=solrj-index-bean-value-type]----Similarly, search results can be converted directly into bean objects using the `getBeans()` method on `QueryResponse`:[source,java,indent=0]-----include::{example-source-dir}UsingSolrJRefGuideExamplesTest.java[tag=solrj-query-bean-value-type]+include::example$UsingSolrJRefGuideExamplesTest.java[tag=solrj-query-bean-value-type]----== Other APIs@@ -258,5 +256,5 @@ The example below shows how SolrJ users can call the CLUSTERSTATUS API of SolrCl[source,java,indent=0]-----include::{example-source-dir}UsingSolrJRefGuideExamplesTest.java[tag=solrj-other-apis]+include::example$UsingSolrJRefGuideExamplesTest.java[tag=solrj-other-apis]----diff --git a/solr/solr-ref-guide/src/system-requirements.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/system-requirements.adocsimilarity index 100%rename from solr/solr-ref-guide/src/system-requirements.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/system-requirements.adocdiff --git a/solr/solr-ref-guide/src/taking-solr-to-production.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/taking-solr-to-production.adocsimilarity index 94%rename from solr/solr-ref-guide/src/taking-solr-to-production.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/taking-solr-to-production.adocindex a663788c459..fe09c59e6bc 100644--- a/solr/solr-ref-guide/src/taking-solr-to-production.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/taking-solr-to-production.adoc@@ -54,7 +54,7 @@ With this approach, the files in `/opt/solr` will remain untouched and all files=== Create the Solr User-Running Solr as `root` is not recommended for security reasons, and the <<solr-control-script-reference.adoc#,control script>> start command will refuse to do so.+Running Solr as `root` is not recommended for security reasons, and the xref:solr-control-script-reference.adoc#starting-and-stopping[`bin/solr start`] command will refuse to do so.Consequently, you should determine the username of a system user that will own all of the Solr files and the running Solr process.By default, the installation script will create the *solr* user, but you can override this setting using the -u option.If your organization has specific requirements for creating new user accounts, then you should create the user before running the script.@@ -117,7 +117,7 @@ The Solr home directory (not to be confused with the Solr installation directoryBy default, the installation script uses `/var/solr/data`.If the `-d` option is used on the install script, then this will change to the `data` subdirectory in the location given to the -d option.Take a moment to inspect the contents of the Solr home directory on your system.-If you do not <<zookeeper-file-management.adoc#,store `solr.xml` in ZooKeeper>>, the home directory must contain a `solr.xml` file.+If you do not xref:zookeeper-file-management.adoc[store `solr.xml` in ZooKeeper], the home directory must contain a `solr.xml` file.When Solr starts up, the Solr Control Script passes the location of the home directory using the `-Dsolr.solr.home=...` system property.==== Environment Overrides Include File@@ -136,7 +136,7 @@ SOLR_PID_DIR=/var/solrSOLR_HOME=/var/solr/data-----The `SOLR_PID_DIR` variable sets the directory where the <<solr-control-script-reference.adoc#,control script>> will write out a file containing the Solr server’s process ID.+The `SOLR_PID_DIR` variable sets the directory where the xref:solr-control-script-reference.adoc[control script] will write out a file containing the Solr server’s process ID.==== Log Settings@@ -150,7 +150,7 @@ LOG4J_PROPS=/var/solr/log4j2.xmlSOLR_LOGS_DIR=/var/solr/logs-----For more information about Log4J configuration, please see: <<configuring-logging.adoc#,Configuring Logging>>+For more information about Log4J configuration, please see: xref:configuring-logging.adoc[].==== init.d Script@@ -219,7 +219,7 @@ This scheduler uses multiple threads to merge Lucene segments in the background.By default, the `ConcurrentMergeScheduler` auto-detects defaults for `maxThreadCount` and `maxMergeCount` accordingly.`maxThreadCount` is set to 4 or half the number of processors available to the JVM whichever is greater and `maxMergeCount` is set to `maxThreadCount+5`.-If you have a spinning disk, it is best to explicitly set values for `maxThreadCount` and `maxMergeCount` in the <<index-segments-merging.adoc#mergescheduler, IndexConfig section of SolrConfig.xml>> so that values appropriate to your hardware are used.+If you have a spinning disk, it is best to explicitly set values for `maxThreadCount` and `maxMergeCount` in the xref:configuration-guide:index-segments-merging.adoc#mergescheduler[IndexConfig section of SolrConfig.xml] so that values appropriate to your hardware are used.=== Memory and GC Settings@@ -235,10 +235,10 @@ SOLR_HEAP="8g"[NOTE]====Do not allocate a very large Java Heap unless you know you need it.-See <<jvm-settings.adoc#choosing-memory-heap-settings,Choosing Memory Heap Settings>> for details.+See xref:jvm-settings.adoc#choosing-memory-heap-settings[Choosing Memory Heap Settings] for details.====-Also, the <<solr-control-script-reference.adoc#,Solr Control Script>> comes with a set of pre-configured Garbage First Garbage Collection settings that have shown to work well with Solr for a number of different workloads.+Also, the xref:solr-control-script-reference.adoc[Solr Control Script] comes with a set of pre-configured Garbage First Garbage Collection settings that have shown to work well with Solr for a number of different workloads.However, these settings may not work well for your specific use of Solr.Consequently, you may need to change the GC settings, which should also be done with the `GC_TUNE` variable in the `/etc/default/solr.in.sh` include file.@@ -246,7 +246,7 @@ For more information about garbage collection settings refer to following articl. https://cwiki.apache.org/confluence/display/solr/ShawnHeisey. https://www.oracle.com/technetwork/articles/java/g1gc-1984535.html-You can also refer to <<jvm-settings.adoc#,JVM Settings>> for tuning your memory and garbage collection settings.+You can also refer to xref:jvm-settings.adoc[] for tuning your memory and garbage collection settings.==== Out-of-Memory Shutdown Hook@@ -278,7 +278,7 @@ For instance, to ensure all znodes created by SolrCloud are stored under `/solr`ZK_HOST=zk1,zk2,zk3/solr-----Before using a chroot for the first time, you need to create the root path (znode) in ZooKeeper by using the <<solr-control-script-reference.adoc#,Solr Control Script>>.+Before using a chroot for the first time, you need to create the root path (znode) in ZooKeeper by using the xref:solr-control-script-reference.adoc[Solr Control Script].We can use the mkroot command for that:[source,bash]@@ -289,7 +289,7 @@ bin/solr zk mkroot /solr -z <ZK_node>:<ZK_PORT>[NOTE]====If you also want to bootstrap ZooKeeper with existing `solr_home`, you can instead use the `zkcli.sh` / `zkcli.bat` `bootstrap` command, which will also create the chroot path if it does not exist.-See <<zookeeper-utilities.adoc#,ZooKeeper Utilities>> for more info.+See xref:zookeeper-utilities.adoc[] for more info.======= Solr Hostnamediff --git a/solr/solr-ref-guide/src/task-management.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/task-management.adocsimilarity index 100%rename from solr/solr-ref-guide/src/task-management.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/task-management.adocdiff --git a/solr/solr-ref-guide/src/thread-dump.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/thread-dump.adocsimilarity index 93%rename from solr/solr-ref-guide/src/thread-dump.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/thread-dump.adocindex ee1a907d5b1..78c08dff978 100644--- a/solr/solr-ref-guide/src/thread-dump.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/thread-dump.adoc@@ -23,7 +23,7 @@ Icons to the left indicate the state of the thread: for example, threads with aOn the right of the thread name, a down-arrow means you can expand to see the stacktrace for that thread..List of Threads-image::images/thread-dump/thread_dump_1.png[image,width=484,height=250]+image::thread-dump/thread_dump_1.png[image,width=484,height=250]When you move your cursor over a thread name, a box floats over the name with the state for that thread.Thread states can be:@@ -42,6 +42,6 @@ Thread states can be:When you click on one of the threads that can be expanded, you'll see the stacktrace, as in the example below:.Inspecting a Thread-image::images/thread-dump/thread_dump_2.png[image,width=453,height=250]+image::thread-dump/thread_dump_2.png[image,width=453,height=250]You can also check the *Show all Stacktraces* button to automatically enable expansion for all threads.diff --git a/solr/solr-ref-guide/src/upgrading-a-solr-cluster.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/upgrading-a-solr-cluster.adocsimilarity index 91%rename from solr/solr-ref-guide/src/upgrading-a-solr-cluster.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/upgrading-a-solr-cluster.adocindex 92b132dd345..2fb214ee4aa 100644--- a/solr/solr-ref-guide/src/upgrading-a-solr-cluster.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/upgrading-a-solr-cluster.adoc@@ -17,7 +17,7 @@// specific language governing permissions and limitations// under the License.-This page covers how to upgrade an existing Solr cluster that was installed using the <<taking-solr-to-production.adoc#,service installation scripts>>.+This page covers how to upgrade an existing Solr cluster that was installed using the xref:taking-solr-to-production.adoc[service installation scripts].IMPORTANT: The steps outlined on this page assume you use the default service name of `solr`.If you use an alternate service name or Solr installation directory, some of the paths and commands mentioned below will have to be modified accordingly.@@ -26,11 +26,11 @@ If you use an alternate service name or Solr installation directory, some of theHere is a checklist of things you need to prepare before starting the upgrade process:-. Examine the <<solr-upgrade-notes.adoc#,Solr Upgrade Notes>> to determine if any behavior changes in the new version of Solr will affect your installation.+. Examine the xref:upgrade-notes:solr-upgrade-notes.adoc[] to determine if any behavior changes in the new version of Solr will affect your installation.. If not using replication (i.e., collections with `replicationFactor` less than 1), then you should make a backup of each collection.If all of your collections use replication, then you don't technically need to make a backup since you will be upgrading and verifying each node individually.. Determine which Solr node is currently hosting the Overseer leader process in SolrCloud, as you should upgrade this node last.-To determine the Overseer, use the Overseer Status API, see: <<collections-api.adoc#,Collections API>>.+To determine the Overseer, use the xref:cluster-node-management.adoc#overseerstatus[Overseer Status API].. Plan to perform your upgrade during a system maintenance window if possible.You'll be doing a rolling restart of your cluster (each node, one-by-one), but we still recommend doing the upgrade when system usage is minimal.. Verify the cluster is currently healthy and all replicas are active, as you should not perform an upgrade on a degraded cluster.@@ -40,7 +40,7 @@ You'll be doing a rolling restart of your cluster (each node, one-by-one), but w* `SOLR_HOST`: The hostname each Solr node used to register with ZooKeeper when joining the SolrCloud cluster; this value will be used to set the *host* Java system property when starting the new Solr process.* `SOLR_PORT`: The port each Solr node is listening on, such as 8983.* `SOLR_HOME`: The absolute path to the Solr home directory for each Solr node; this directory must contain a `solr.xml` file.-This value will be passed to the new Solr process using the `solr.solr.home` system property, see: <<configuring-solr-xml.adoc#,Configuring solr.xml>>.+This value will be passed to the new Solr process using the `solr.solr.home` system property, see: xref:configuration-guide:configuring-solr-xml.adoc[].+If you are upgrading from an installation of Solr 5.x or later, these values can typically be found in either `/var/solr/solr.in.sh` or `/etc/default/solr.in.sh`.@@ -59,13 +59,13 @@ This means that you won't need to move any index files around to perform the upg=== Step 1: Stop SolrBegin by stopping the Solr node you want to upgrade.-After stopping the node, if using a replication (i.e., collections with `replicationFactor` less than 1), verify that all leaders hosted on the downed node have successfully migrated to other replicas; you can do this by visiting the <<cloud-screens.adoc#,Cloud panel in the Solr Admin UI>>.+After stopping the node, if using a replication (i.e., collections with `replicationFactor` less than 1), verify that all leaders hosted on the downed node have successfully migrated to other replicas; you can do this by visiting the xref:cloud-screens.adoc[] in the Solr Admin UI.If not using replication, then any collections with shards hosted on the downed node will be temporarily off-line.=== Step 2: Install Solr as a Service-Please follow the instructions to install Solr as a Service on Linux documented at <<taking-solr-to-production.adoc#,Taking Solr to Production>>.+Please follow the instructions to install Solr as a Service on Linux documented at xref:taking-solr-to-production.adoc[].Use the `-n` parameter to avoid automatic start of Solr by the installer script.You need to update the `/etc/default/solr.in.sh` include file in the next step to complete the upgrade process.diff --git a/solr/solr-ref-guide/src/user-managed-distributed-search.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/user-managed-distributed-search.adocsimilarity index 94%rename from solr/solr-ref-guide/src/user-managed-distributed-search.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/user-managed-distributed-search.adocindex a88a122bc0c..460039639ca 100644--- a/solr/solr-ref-guide/src/user-managed-distributed-search.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/user-managed-distributed-search.adoc@@ -18,7 +18,7 @@When using traditional index sharding, you will need to consider how to query your documents.-It is highly recommended that you use <<cluster-types.adoc#solrcloud-mode,SolrCloud>> when needing to scale up or scale out.+It is highly recommended that you use xref:cluster-types.adoc#solrcloud-mode[SolrCloud] when needing to scale up or scale out.The setup described below is legacy and was used prior to the existence of SolrCloud.SolrCloud provides for a truly distributed set of features with support for things like automatic routing, leader election, optimistic concurrency and other sanity checks that are expected out of a distributed system.@@ -75,7 +75,7 @@ The following components support distributed search:The nodes allowed in the `shards` parameter is configurable through the `allowUrls` property in `solr.xml`.This allow-list is automatically configured for SolrCloud but needs explicit configuration for user-managed clusters.-Read more details in the section <<solrcloud-distributed-requests.adoc#configuring-the-shardhandlerfactory,Configuring the ShardHandlerFactory>>.+Read more details in the section xref:solrcloud-distributed-requests.adoc#configuring-the-shardhandlerfactory[Configuring the ShardHandlerFactory].== Limitations to User-Managed Distributed Search@@ -96,12 +96,12 @@ Document adds and deletes are forwarded to the appropriate server/shard based onFormerly a limitation was that TF/IDF relevancy computations only used shard-local statistics.This is still the case by default.-If your data isn't randomly distributed, or if you want more exact statistics, then you can configure the <<solrcloud-distributed-requests#distributedidf,`ExactStatsCache`>>.+If your data isn't randomly distributed, or if you want more exact statistics, then you can configure the xref:solrcloud-distributed-requests.adoc#distributedidf[`ExactStatsCache`].== Avoiding Distributed DeadlockLike in SolrCloud mode, inter-shard requests could lead to a distributed deadlock.-It can be avoided by following the instructions in the section <<solrcloud-distributed-requests.adoc#,Distributed Requests>>.+It can be avoided by following the instructions in the section xref:solrcloud-distributed-requests.adoc[].== Load Balancing Requestsdiff --git a/solr/solr-ref-guide/src/user-managed-index-replication.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/user-managed-index-replication.adocsimilarity index 96%rename from solr/solr-ref-guide/src/user-managed-index-replication.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/user-managed-index-replication.adocindex 287066de155..b09be99ca8c 100644--- a/solr/solr-ref-guide/src/user-managed-index-replication.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/user-managed-index-replication.adoc@@ -25,7 +25,7 @@ The figure below shows a Solr configuration using index replication.The leader server's index is replicated on the followers..A Solr index can be replicated across multiple follower servers, which then process requests.-image::images/user-managed-index-replication/user-managed-replication.png[]+image::user-managed-index-replication/user-managed-replication.png[]== Index Replication in Solr@@ -43,7 +43,7 @@ Configuring replication is therefore similar to any normal request handler..Replication In SolrCloud[NOTE]====-Although there is no explicit concept of leader or follower nodes in a <<cluster-types.adoc#solrcloud-mode,SolrCloud>> cluster, the `ReplicationHandler` discussed on this page is still used by SolrCloud as needed to support "shard recovery" – but this is done in a peer to peer manner.+Although there is no explicit concept of leader or follower nodes in a xref:cluster-types.adoc#solrcloud-mode[SolrCloud cluster], the `ReplicationHandler` discussed on this page is still used by SolrCloud as needed to support "shard recovery" – but this is done in a peer to peer manner.When using SolrCloud, the `ReplicationHandler` must be available via the `/replication` path.Solr does this implicitly unless overridden explicitly in your `solrconfig.xml`.@@ -55,7 +55,7 @@ If you wish to override the default behavior, make certain that you do not set aIn addition to `ReplicationHandler` configuration options specific to the leader and follower roles described below, there are a few special configuration options that are generally supported (even when using SolrCloud).* `maxNumberOfBackups` an integer value dictating the maximum number of backups this node will keep on disk as it receives `backup` commands.-* Similar to most other request handlers in Solr you may configure a set of <<requesthandlers-searchcomponents.adoc#search-handlers,defaults, invariants, and/or appends>> parameters corresponding with any request parameters supported by the `ReplicationHandler` when <<HTTP API Commands for the ReplicationHandler,processing commands>>.+* Similar to most other request handlers in Solr you may configure a set of xref:configuration-guide:requesthandlers-searchcomponents.adoc#search-handlers[defaults, invariants, and/or appends] parameters corresponding with any request parameters supported by the `ReplicationHandler` when <<HTTP API Commands for the ReplicationHandler,processing commands>>.=== Configuring a Leader Server@@ -304,7 +304,7 @@ If you are using Leader-Follower index replication, you can use this screen to:. View the current replication status (on a follower node). Disable replication (on a leader node)-image::images/user-managed-index-replication/replication.png[image,width=412,height=250]+image::user-managed-index-replication/replication.png[image,width=412,height=250]== Follower Replication@@ -519,6 +519,6 @@ No query followers need to be taken out of service.The optimized index can be distributed in the background as queries are being normally serviced.The optimization can occur at any time convenient to the application providing index updates.-While optimizing may have some benefits in some situations, a rapidly changing index will not retain those benefits for long, and since optimization is an intensive process, it may be better to consider other options, such as lowering the merge factor (discussed in the section on <<index-segments-merging.adoc#merge-factors,Index Configuration>>).+While optimizing may have some benefits in some situations, a rapidly changing index will not retain those benefits for long, and since optimization is an intensive process, it may be better to consider other options, such as lowering the merge factor (discussed in the section on xref:configuration-guide:index-segments-merging.adoc#merge-factors[Controlling Segment Sizes]).TIP: Do not elect to optimize your index unless you have tangible evidence that it will significantly improve your search performance.diff --git a/solr/solr-ref-guide/src/zookeeper-access-control.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-access-control.adocsimilarity index 96%rename from solr/solr-ref-guide/src/zookeeper-access-control.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-access-control.adocindex 9642d359d88..4125e4b1d96 100644--- a/solr/solr-ref-guide/src/zookeeper-access-control.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-access-control.adoc@@ -18,7 +18,7 @@This section describes using ZooKeeper access control lists (ACLs) with Solr.-For information about ZooKeeper ACLs, see the http://zookeeper.apache.org/doc/r{ivy-zookeeper-version}/zookeeperProgrammers.html#sc_ZooKeeperAccessControl[ZooKeeper ACL documentation].+For information about ZooKeeper ACLs, see the http://zookeeper.apache.org/doc/r{dep-version-zookeeper}/zookeeperProgrammers.html#sc_ZooKeeperAccessControl[ZooKeeper ACL documentation].== About ZooKeeper ACLs@@ -71,7 +71,7 @@ If you use `SolrZkClient` in your application, the descriptions below will be tr=== Controlling Credentials-You control which credentials provider will be used by configuring the `zkCredentialsProvider` property in the `<solrcloud>` section of <<configuring-solr-xml.adoc#,`solr.xml`>> to the name of a class (on the classpath) implementing the {solr-javadocs}/solrj/org/apache/solr/common/cloud/ZkCredentialsProvider.html[`ZkCredentialsProvider`] interface.+You control which credentials provider will be used by configuring the `zkCredentialsProvider` property in the `<solrcloud>` section of xref:configuration-guide:configuring-solr-xml.adoc[`solr.xml`] to the name of a class (on the classpath) implementing the {solr-javadocs}/solrj/org/apache/solr/common/cloud/ZkCredentialsProvider.html[`ZkCredentialsProvider`] interface.`solr.xml` defines the `zkCredentialsProvider` such that it will take on the value of the same-named `zkCredentialsProvider` system property if it is defined (in `solr.in.sh/.cmd` - see <<ZooKeeper ACLs in Solr Scripts,below>>), or if not, default to the `DefaultZkCredentialsProvider` implementation.@@ -91,7 +91,7 @@ This set of credentials will be added to the list of credentials returned by `ge=== Controlling ACLs-You control which ACLs will be added by configuring `zkACLProvider` property in the `<solrcloud>` section of <<configuring-solr-xml.adoc#,`solr.xml`>> to the name of a class (on the classpath) implementing the {solr-javadocs}/solrj/org/apache/solr/common/cloud/ZkACLProvider.html[`ZkACLProvider`] interface.+You control which ACLs will be added by configuring `zkACLProvider` property in the `<solrcloud>` section of xref:configuration-guide:configuring-solr-xml.adoc[`solr.xml`] to the name of a class (on the classpath) implementing the {solr-javadocs}/solrj/org/apache/solr/common/cloud/ZkACLProvider.html[`ZkACLProvider`] interface.`solr.xml` defines the `zkACLProvider` such that it will take on the value of the same-named `zkACLProvider` system property if it is defined (in `solr.in.sh/.cmd` - see <<ZooKeeper ACLs in Solr Scripts,below>>), or if not, default to the `DefaultZkACLProvider` implementation.diff --git a/solr/solr-ref-guide/src/zookeeper-ensemble.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-ensemble.adocsimilarity index 96%rename from solr/solr-ref-guide/src/zookeeper-ensemble.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-ensemble.adocindex 26d3e483cd6..54086f29858 100644--- a/solr/solr-ref-guide/src/zookeeper-ensemble.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-ensemble.adoc@@ -30,7 +30,7 @@ The first question to answer is the number of ZooKeeper nodes you will run in yoWhen planning how many ZooKeeper nodes to configure, keep in mind that the main principle for a ZooKeeper ensemble is maintaining a majority of servers to serve requests.This majority is called a _quorum_.-[quote,ZooKeeper Administrator's Guide,http://zookeeper.apache.org/doc/r{ivy-zookeeper-version}/zookeeperAdmin.html]+[quote,ZooKeeper Administrator's Guide,http://zookeeper.apache.org/doc/r{dep-version-zookeeper}/zookeeperAdmin.html]____"For a ZooKeeper service to be active, there must be a majority of non-failing machines that can communicate with each other.*To create a deployment that can tolerate the failure of F machines, you should count on deploying 2xF+1 machines*.@@ -48,14 +48,14 @@ It's not generally recommended to go above 5 nodes.While it may seem that more nodes provide greater fault-tolerance and availability, in practice it becomes less efficient because of the amount of inter-node coordination that occurs.Unless you have a truly massive Solr cluster (on the scale of 1,000s of nodes), try to stay to 3 as a general rule, or maybe 5 if you have a larger cluster.-More information on ZooKeeper clusters is available from the ZooKeeper documentation at http://zookeeper.apache.org/doc/r{ivy-zookeeper-version}/zookeeperAdmin.html#sc_zkMulitServerSetup.+More information on ZooKeeper clusters is available from the ZooKeeper documentation at http://zookeeper.apache.org/doc/r{dep-version-zookeeper}/zookeeperAdmin.html#sc_zkMulitServerSetup.== Download Apache ZooKeeperThe first step in setting up Apache ZooKeeper is, of course, to download the software.It's available from http://zookeeper.apache.org/releases.html.-Solr currently uses Apache ZooKeeper v{ivy-zookeeper-version}.+Solr currently uses Apache ZooKeeper v{dep-version-zookeeper}.[WARNING]====@@ -71,7 +71,7 @@ The actual directory itself doesn't matter, as long as you know where it is.The command to unpack the ZooKeeper package is:[source,bash,subs="attributes"]-tar xvf zookeeper-{ivy-zookeeper-version}.tar.gz+tar xvf zookeeper-{dep-version-zookeeper}.tar.gzThis location is the `<ZOOKEEPER_HOME>` for ZooKeeper on this server.@@ -327,7 +327,7 @@ At this point, you are ready to start your ZooKeeper ensemble.=== More Information about ZooKeeperZooKeeper provides a great deal of power through additional configurations, but delving into them is beyond the scope of Solr's documentation.-For more information, see the http://zookeeper.apache.org/doc/r{ivy-zookeeper-version}[ZooKeeper documentation].+For more information, see the http://zookeeper.apache.org/doc/r{dep-version-zookeeper}[ZooKeeper documentation].== Starting and Stopping ZooKeeper@@ -383,7 +383,7 @@ Creating a chroot is done with a `bin/solr` command:[source,text]bin/solr zk mkroot /solr -z zk1:2181,zk2:2181,zk3:2181-See the section <<solr-control-script-reference.adoc#create-a-znode-supports-chroot,Create a znode>> for more examples of this command.+See the section xref:solr-control-script-reference.adoc#create-a-znode-supports-chroot[Create a znode] for more examples of this command.Once the znode is created, it behaves in a similar way to a directory on a filesystem: the data stored by Solr in ZooKeeper is nested beneath the main data directory and won't be mixed with data from another system or process that uses the same ZooKeeper ensemble.@@ -474,7 +474,7 @@ By default, ZooKeeper's file size limit is 1MB.Attempting to write or read files larger than this will cause errors.Some Solr features, e.g., text analysis synonyms, LTR, and OpenNLP named entity recognition, require configuration resources that can be larger than the default limit.-ZooKeeper can be configured, via Java system property https://zookeeper.apache.org/doc/r{ivy-zookeeper-version}/zookeeperAdmin.html#Unsafe+Options[`jute.maxbuffer`], to increase this limit.+ZooKeeper can be configured, via Java system property https://zookeeper.apache.org/doc/r{dep-version-zookeeper}/zookeeperAdmin.html#Unsafe+Options[`jute.maxbuffer`], to increase this limit.Note that this configuration, which is required both for ZooKeeper server(s) and for all clients that connect to the server(s), must be the same everywhere it is specified.=== Configuring jute.maxbuffer on ZooKeeper Nodes@@ -549,4 +549,4 @@ set SOLR_OPTS=%SOLR_OPTS% -Djute.maxbuffer=0x200000You may also want to secure the communication between ZooKeeper and Solr.-To setup ACL protection of znodes, see the section <<zookeeper-access-control.adoc#,ZooKeeper Access Control>>.+To setup ACL protection of znodes, see the section xref:zookeeper-access-control.adoc[].diff --git a/solr/solr-ref-guide/src/zookeeper-file-management.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-file-management.adocsimilarity index 80%rename from solr/solr-ref-guide/src/zookeeper-file-management.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-file-management.adocindex e0852fc5c84..fa5ee7c38c0 100644--- a/solr/solr-ref-guide/src/zookeeper-file-management.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-file-management.adoc@@ -1,6 +1,4 @@= ZooKeeper File Management-:solr-root-path: ../../-:example-source-dir: {solr-root-path}solrj/src/test/org/apache/solr/client/ref_guide_examples/// 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,16 +43,15 @@ bin/solr create -c mycollection -d _default----The create command will upload a copy of the `_default` configuration directory to ZooKeeper under `/configs/mycollection`.-Refer to the <<solr-control-script-reference.adoc#,Solr Control Script Reference>> page for more details about the create command for creating collections.+Refer to the xref:solr-control-script-reference.adoc[] for more details about the create command for creating collections.-Once a configuration directory has been uploaded to ZooKeeper, you can update them using the <<solr-control-script-reference.adoc#,Solr Control Script>>+Once a configuration directory has been uploaded to ZooKeeper, you can update them using the xref:solr-control-script-reference.adoc[Solr Control Script].IMPORTANT: It's a good idea to keep these files under version control.-== Uploading Configuration Files using bin/solr or SolrJ-In production situations, <<config-sets.adoc#,Configsets>> can also be uploaded to ZooKeeper independent of collection creation using either Solr's <<solr-control-script-reference.adoc#,Solr Control Script>> or SolrJ.+In production situations, xref:configuration-guide:config-sets.adoc[] can also be uploaded to ZooKeeper independent of collection creation using either Solr's xref:solr-control-script-reference.adoc[Solr Control Script] or xref:solrj.adoc[].The below command can be used to upload a new configset using the bin/solr script.@@ -66,7 +63,7 @@ bin/solr zk upconfig -n <name for configset> -d <path to directory with configseThe following code shows how this can also be achieved using SolrJ:[source,java,indent=0]-----include::{example-source-dir}ZkConfigFilesTest.java[tag=zk-configset-upload]+include::example$ZkConfigFilesTest.java[tag=zk-configset-upload]----It is strongly recommended that the configurations be kept in a version control system, Git, SVN or similar.@@ -84,7 +81,7 @@ To update or change your SolrCloud configuration files:== Preparing ZooKeeper before First Cluster StartIf you will share the same ZooKeeper instance with other applications you should use a _chroot_ in ZooKeeper.-Please see <<taking-solr-to-production.adoc#zookeeper-chroot,ZooKeeper chroot>> for instructions.+Please see xref:taking-solr-to-production.adoc#zookeeper-chroot[ZooKeeper chroot] for instructions.There are certain configuration files containing cluster wide configuration.Since some of these are crucial for the cluster to function properly, you may need to upload such files to ZooKeeper before starting your Solr cluster for the first time.@@ -97,4 +94,4 @@ If you for example would like to keep your `solr.xml` in ZooKeeper to avoid havibin/solr zk cp file:local/file/path/to/solr.xml zk:/solr.xml -z localhost:2181-----NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see <<zookeeper-ensemble#updating-solr-include-files,instructions>>) you can omit `-z <zk host string>` from the above command.+NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see xref:zookeeper-ensemble.adoc#updating-solr-include-files,Updating Solr Include Files>>) you can omit `-z <zk host string>` from the above command.diff --git a/solr/solr-ref-guide/src/zookeeper-utilities.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-utilities.adocsimilarity index 91%rename from solr/solr-ref-guide/src/zookeeper-utilities.adocrename to solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-utilities.adocindex db3ec44d9a2..48e6f9de6c4 100644--- a/solr/solr-ref-guide/src/zookeeper-utilities.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-utilities.adoc@@ -20,12 +20,12 @@ A ZooKeeper Command Line Interface (CLI) script is available to allow you to intWhile Solr's Admin UI includes pages dedicated to the state of your SolrCloud cluster, it does not allow you to download or modify related configuration files.-TIP: See the section <<cloud-screens.adoc#,Cloud Screens>> for more information about using the Admin UI screens.+TIP: See the section xref:cloud-screens.adoc[] for more information about using the Admin UI screens.The ZooKeeper CLI script found in `server/scripts/cloud-scripts` let you upload configuration information to ZooKeeper.It also provides a few other commands that let you link collection sets to collections, make ZooKeeper paths or clear them, and download configurations from ZooKeeper to the local filesystem.-Many of the functions provided by the zkCli.sh script are also provided by the <<solr-control-script-reference.adoc#,Solr Control Script>>, which may be more familiar as the start script ZooKeeper maintenance commands are very similar to Unix commands.+Many of the functions provided by the `zkCli.sh` script are also provided by the xref:solr-control-script-reference.adoc[Solr Control Script], which may be more familiar as the start script ZooKeeper maintenance commands are very similar to Unix commands..Solr's zkcli.sh vs ZooKeeper's zkCli.sh[IMPORTANT]@@ -156,7 +156,7 @@ This can be useful to create a chroot path in ZooKeeper before first cluster staThis command will add or modify a single cluster property in `clusterprops.json`.Use this command instead of the usual getfile -> edit -> putfile cycle.-Unlike the CLUSTERPROP command on the <<cluster-node-management.adoc#clusterprop,Collections API>>, this command does *not* require a running Solr cluster.+Unlike the xref:cluster-node-management.adoc#clusterprop[CLUSTERPROP] command on the Collections API, this command does *not* require a running Solr cluster.[source,bash]----diff --git a/solr/solr-ref-guide/modules/getting-started/getting-started-nav.adoc b/solr/solr-ref-guide/modules/getting-started/getting-started-nav.adocnew file mode 100644index 00000000000..b080246eba5--- /dev/null+++ b/solr/solr-ref-guide/modules/getting-started/getting-started-nav.adoc@@ -0,0 +1,19 @@+.Getting Started+* xref:introduction.adoc[]++* Solr Concepts+** xref:documents-fields-schema-design.adoc[]+** xref:solr-indexing.adoc[]+** xref:searching-in-solr.adoc[]+** xref:relevance.adoc[]+** xref:solr-glossary.adoc[]++* xref:solr-tutorial.adoc[]+** xref:tutorial-techproducts.adoc[]+** xref:tutorial-films.adoc[]+** xref:tutorial-diy.adoc[]+** xref:tutorial-solrcloud.adoc[]+** xref:tutorial-aws.adoc[]++* xref:solr-admin-ui.adoc[]+* xref:about-this-guide.adoc[]diff --git a/solr/solr-ref-guide/src/images/searching-in-solr/cnet-faceting.png b/solr/solr-ref-guide/modules/getting-started/images/searching-in-solr/cnet-faceting.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/searching-in-solr/cnet-faceting.pngrename to solr/solr-ref-guide/modules/getting-started/images/searching-in-solr/cnet-faceting.pngdiff --git a/solr/solr-ref-guide/src/images/searching-in-solr/search-process.png b/solr/solr-ref-guide/modules/getting-started/images/searching-in-solr/search-process.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/searching-in-solr/search-process.pngrename to solr/solr-ref-guide/modules/getting-started/images/searching-in-solr/search-process.pngdiff --git a/solr/solr-ref-guide/src/images/solr-admin-ui/Assistance.png b/solr/solr-ref-guide/modules/getting-started/images/solr-admin-ui/Assistance.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/solr-admin-ui/Assistance.pngrename to solr/solr-ref-guide/modules/getting-started/images/solr-admin-ui/Assistance.pngdiff --git a/solr/solr-ref-guide/src/images/solr-admin-ui/collection_dashboard.png b/solr/solr-ref-guide/modules/getting-started/images/solr-admin-ui/collection_dashboard.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/solr-admin-ui/collection_dashboard.pngrename to solr/solr-ref-guide/modules/getting-started/images/solr-admin-ui/collection_dashboard.pngdiff --git a/solr/solr-ref-guide/src/images/solr-admin-ui/core_dashboard.png b/solr/solr-ref-guide/modules/getting-started/images/solr-admin-ui/core_dashboard.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/solr-admin-ui/core_dashboard.pngrename to solr/solr-ref-guide/modules/getting-started/images/solr-admin-ui/core_dashboard.pngdiff --git a/solr/solr-ref-guide/src/images/solr-admin-ui/dashboard.png b/solr/solr-ref-guide/modules/getting-started/images/solr-admin-ui/dashboard.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/solr-admin-ui/dashboard.pngrename to solr/solr-ref-guide/modules/getting-started/images/solr-admin-ui/dashboard.pngdiff --git a/solr/solr-ref-guide/src/images/solr-admin-ui/login.png b/solr/solr-ref-guide/modules/getting-started/images/solr-admin-ui/login.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/solr-admin-ui/login.pngrename to solr/solr-ref-guide/modules/getting-started/images/solr-admin-ui/login.pngdiff --git a/solr/solr-ref-guide/src/images/solr-admin-ui/schema-designer.png b/solr/solr-ref-guide/modules/getting-started/images/solr-admin-ui/schema-designer.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/solr-admin-ui/schema-designer.pngrename to solr/solr-ref-guide/modules/getting-started/images/solr-admin-ui/schema-designer.pngdiff --git a/solr/solr-ref-guide/src/images/solr-admin-ui/security.png b/solr/solr-ref-guide/modules/getting-started/images/solr-admin-ui/security.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/solr-admin-ui/security.pngrename to solr/solr-ref-guide/modules/getting-started/images/solr-admin-ui/security.pngdiff --git a/solr/solr-ref-guide/src/images/solr-tutorial/tutorial-add-copy-field.png b/solr/solr-ref-guide/modules/getting-started/images/solr-tutorial/tutorial-add-copy-field.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/solr-tutorial/tutorial-add-copy-field.pngrename to solr/solr-ref-guide/modules/getting-started/images/solr-tutorial/tutorial-add-copy-field.pngdiff --git a/solr/solr-ref-guide/src/images/solr-tutorial/tutorial-add-field.png b/solr/solr-ref-guide/modules/getting-started/images/solr-tutorial/tutorial-add-field.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/solr-tutorial/tutorial-add-field.pngrename to solr/solr-ref-guide/modules/getting-started/images/solr-tutorial/tutorial-add-field.pngdiff --git a/solr/solr-ref-guide/src/images/solr-tutorial/tutorial-admin-ui-facet-options.png b/solr/solr-ref-guide/modules/getting-started/images/solr-tutorial/tutorial-admin-ui-facet-options.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/solr-tutorial/tutorial-admin-ui-facet-options.pngrename to solr/solr-ref-guide/modules/getting-started/images/solr-tutorial/tutorial-admin-ui-facet-options.pngdiff --git a/solr/solr-ref-guide/src/images/solr-tutorial/tutorial-query-screen.png b/solr/solr-ref-guide/modules/getting-started/images/solr-tutorial/tutorial-query-screen.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/solr-tutorial/tutorial-query-screen.pngrename to solr/solr-ref-guide/modules/getting-started/images/solr-tutorial/tutorial-query-screen.pngdiff --git a/solr/solr-ref-guide/src/images/solr-tutorial/tutorial-range-facet.png b/solr/solr-ref-guide/modules/getting-started/images/solr-tutorial/tutorial-range-facet.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/solr-tutorial/tutorial-range-facet.pngrename to solr/solr-ref-guide/modules/getting-started/images/solr-tutorial/tutorial-range-facet.pngdiff --git a/solr/solr-ref-guide/src/images/solr-tutorial/tutorial-solrcloud.png b/solr/solr-ref-guide/modules/getting-started/images/solr-tutorial/tutorial-solrcloud.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/solr-tutorial/tutorial-solrcloud.pngrename to solr/solr-ref-guide/modules/getting-started/images/solr-tutorial/tutorial-solrcloud.pngdiff --git a/solr/solr-ref-guide/src/images/solr-tutorial/tutorial-spatial.png b/solr/solr-ref-guide/modules/getting-started/images/solr-tutorial/tutorial-spatial.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/solr-tutorial/tutorial-spatial.pngrename to solr/solr-ref-guide/modules/getting-started/images/solr-tutorial/tutorial-spatial.pngdiff --git a/solr/solr-ref-guide/src/images/tutorial-aws/aws-key.png b/solr/solr-ref-guide/modules/getting-started/images/tutorial-aws/aws-key.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/tutorial-aws/aws-key.pngrename to solr/solr-ref-guide/modules/getting-started/images/tutorial-aws/aws-key.pngdiff --git a/solr/solr-ref-guide/src/images/tutorial-aws/aws-security-create.png b/solr/solr-ref-guide/modules/getting-started/images/tutorial-aws/aws-security-create.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/tutorial-aws/aws-security-create.pngrename to solr/solr-ref-guide/modules/getting-started/images/tutorial-aws/aws-security-create.pngdiff --git a/solr/solr-ref-guide/src/images/tutorial-aws/aws-security-edit.png b/solr/solr-ref-guide/modules/getting-started/images/tutorial-aws/aws-security-edit.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/tutorial-aws/aws-security-edit.pngrename to solr/solr-ref-guide/modules/getting-started/images/tutorial-aws/aws-security-edit.pngdiff --git a/solr/solr-ref-guide/src/about-this-guide.adoc b/solr/solr-ref-guide/modules/getting-started/pages/about-this-guide.adocsimilarity index 92%rename from solr/solr-ref-guide/src/about-this-guide.adocrename to solr/solr-ref-guide/modules/getting-started/pages/about-this-guide.adocindex e21f375cba5..7ea258ce3cb 100644--- a/solr/solr-ref-guide/src/about-this-guide.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/about-this-guide.adoc@@ -33,7 +33,6 @@ The default port when running Solr is 8983.The samples, URLs and screenshots in this guide may show different ports, because the port number that Solr uses is configurable.If you have not customized your installation of Solr, please make sure that you use port 8983 when following the examples, or configure your own installation to use the port numbers shown in the examples.-For information about configuring port numbers, see the section <<monitoring-solr.adoc#,Monitoring Solr>>.Similarly, URL examples use `localhost` throughout; if you are accessing Solr from a location remote to the server hosting Solr, replace `localhost` with the proper domain or IP where Solr is running.@@ -59,7 +58,7 @@ However, there can be exceptions, particularly if your installation has customizIn several cases of this Guide, our examples are built from the "techproducts" example (i.e., you have started Solr with the command `bin/solr -e techproducts`).In this case, `solr.home` will be a sub-directory of the `example/` directory created for you automatically.-See also the section <<configuration-files.adoc#solr-home,Solr Home>> for further details on what is contained in this directory.+See also the section xref:configuration-guide:configuration-files.adoc#solr-home[Solr Home] for further details on what is contained in this directory.== API Examples@@ -72,7 +71,7 @@ In all cases the paths and endpoints used are different.Throughout this Guide, we have added examples of both styles with sections labeled "V1 API" and "V2 API".As of the 7.2 version of this Guide, these examples are not yet complete - more coverage will be added as future versions of the Guide are released.-The section <<v2-api.adoc#,V2 API>> provides more information about how to work with the new API structure, including how to disable it if you choose to do so.+The section xref:configuration-guide:v2-api.adoc[] provides more information about how to work with the new API structure, including how to disable it if you choose to do so.All APIs return a response header that includes the status of the request and the time to process it.Some APIs will also include the parameters used for the request.diff --git a/solr/solr-ref-guide/src/documents-fields-schema-design.adoc b/solr/solr-ref-guide/modules/getting-started/pages/documents-fields-schema-design.adocsimilarity index 96%rename from solr/solr-ref-guide/src/documents-fields-schema-design.adocrename to solr/solr-ref-guide/modules/getting-started/pages/documents-fields-schema-design.adocindex 08c34438fc2..bebda694ecb 100644--- a/solr/solr-ref-guide/src/documents-fields-schema-design.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/documents-fields-schema-design.adoc@@ -77,7 +77,7 @@ For the biography field, you can tell Solr how to break apart the biography intoYou can tell Solr that you want to make all the words lower case, and you can tell Solr to remove accents marks.Field analysis is an important part of a field type.-<<document-analysis.adoc#,Document Analysis in Solr>> is a detailed description of field analysis.+xref:indexing-guide:document-analysis.adoc[] is a detailed description of field analysis.== Solr's Schema File@@ -98,4 +98,4 @@ If you aren't sure yet, plan on some test indexing runs to see how the data in yBuild into your implementation plan some time for iteration and start small.The more you're able to define your schema before indexing all of your documents, the higher your chances for a successful search application for your users.-More information about the schema is in the section <<schema-elements.adoc#,Schema Elements>>.+More information about the schema is in the section xref:indexing-guide:schema-elements.adoc[].diff --git a/solr/solr-ref-guide/src/introduction.adoc b/solr/solr-ref-guide/modules/getting-started/pages/introduction.adocsimilarity index 86%rename from solr/solr-ref-guide/src/introduction.adocrename to solr/solr-ref-guide/modules/getting-started/pages/introduction.adocindex 28fe32d7ef3..98ab8b8e80e 100644--- a/solr/solr-ref-guide/src/introduction.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/introduction.adoc@@ -23,20 +23,20 @@ Solr is based on open standards and it is highly extensible.Solr queries are simple HTTP request URLs and the response is a structured document: mainly JSON, but it could also be XML, CSV, or other formats.This means that a wide variety of clients will be able to use Solr, from other web applications to browser clients, rich client applications, and mobile devices.Any platform capable of HTTP can talk to Solr.-See <<client-apis.adoc#,Client APIs>> for details on client APIs.+See xref:deployment-guide:client-apis.adoc[] for details on client APIs.Flexible schema configurations allow nearly any type of data to be stored in Solr.-The <<schema-indexing-guide.adoc#,Schema and Indexing Guide>> has more details on these options.+The xref:indexing-guide:schema-elements.adoc[] has more details on these options.Solr offers support for the simplest keyword searching through to complex queries on multiple fields and faceted search results.Collapsing and clustering results offer compelling features for e-commerce and storefronts.Powerful math expressions provide the backbone for advanced analytics use cases.-The <<query-guide.adoc#,Query Guide>> has more information about searching and queries.+The xref:query-guide:query-syntax-and-parsers.adoc[] has more information about searching and queries.If Solr's capabilities are not impressive enough, its ability to handle very high-volume applications should do the trick.A relatively common scenario is that you have so much data, or so many queries, that a single Solr server is unable to handle your entire workload.-In this case, you can scale up the capabilities of your application using <<scaling-solr.adoc#,SolrCloud>> to better distribute the data, and the processing of requests, across many servers.+In this case, you can scale up the capabilities of your application using xref:deployment-guide:cluster-types.adoc[] to better distribute the data, and the processing of requests, across many servers.Multiple options can be mixed and matched depending on the scalability you need.Best of all, this talk about high-volume applications is not just hypothetical: some of the famous Internet sites that use Solr today are Macy's, EBay, and Zappo's.diff --git a/solr/solr-ref-guide/src/relevance.adoc b/solr/solr-ref-guide/modules/getting-started/pages/relevance.adocsimilarity index 100%rename from solr/solr-ref-guide/src/relevance.adocrename to solr/solr-ref-guide/modules/getting-started/pages/relevance.adocdiff --git a/solr/solr-ref-guide/src/searching-in-solr.adoc b/solr/solr-ref-guide/modules/getting-started/pages/searching-in-solr.adocsimilarity index 77%rename from solr/solr-ref-guide/src/searching-in-solr.adocrename to solr/solr-ref-guide/modules/getting-started/pages/searching-in-solr.adocindex c92bc54c393..1c13abdff3f 100644--- a/solr/solr-ref-guide/src/searching-in-solr.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/searching-in-solr.adoc@@ -30,15 +30,15 @@ In addition, applications can be configured to allow users to override the defauTo process a search query, a request handler calls a _query parser_, which interprets the terms and parameters of a query.Different query parsers support different syntax.-Solr's default query parser is known as the <<standard-query-parser.adoc#,Standard Query Parser>>,or more commonly just the "lucene" query parser.-Solr also includes the <<dismax-query-parser.adoc#,DisMax>>query parser, and the <<edismax-query-parser.adoc#,Extended DisMax>> (eDisMax) query parser.+Solr's default query parser is known as the xref:query-guide:standard-query-parser.adoc[],or more commonly the "lucene" query parser.+Solr also includes the xref:query-guide:dismax-query-parser.adoc[], and the xref:query-guide:edismax-query-parser.adoc[].-The <<standard-query-parser.adoc#,standard>> query parser's syntax allows for greater precision in searches, but the DisMax query parser is much more tolerant of errors.+The Standard query parser's syntax allows for greater precision in searches, but the DisMax query parser is much more tolerant of errors.The DisMax query parser is designed to provide an experience similar to that of popular search engines such as Google, which rarely display syntax errors to users.The Extended DisMax query parser is an improved version of DisMax that handles the full Lucene query syntax while still tolerating syntax errors.It also includes several additional features.-In addition, there are <<common-query-parameters.adoc#,common query parameters>> that are accepted by all query parsers.+In addition, there are xref:query-guide:common-query-parameters.adoc[] accepted by all query parsers.Input to a query parser can include:@@ -55,7 +55,7 @@ Despite their similar names, query filters are not related to analysis filters.Filter queries perform queries at search time against data already in the index, while analysis filters, such as tokenizers, parse content for indexing, following specified rules.A search query can request that certain terms be highlighted in the search response; that is, the selected terms will be displayed in colored boxes so that they "jump out" on the screen of search results.-<<highlighting.adoc#,_Highlighting_>> can make it easier to find relevant passages in long documents returned in a search.+xref:query-guide:highlighting.adoc[] can make it easier to find relevant passages in long documents returned in a search.Solr supports multi-term highlighting.Solr includes a rich set of search parameters for controlling how terms are highlighted.@@ -63,13 +63,13 @@ Search responses can also be configured to include _snippets_ (document excerptsTo help users zero in on the content they're looking for, Solr supports two special ways of grouping search results to aid further exploration: faceting and clustering.-<<faceting.adoc#,*Faceting*>> is the arrangement of search results into categories (which are based on indexed terms).+xref:query-guide:faceting.adoc[] is the arrangement of search results into categories (which are based on indexed terms).Within each category, Solr reports on the number of hits for relevant term, which is called a facet constraint.Faceting makes it easy for users to explore search results on sites such as movie sites and product review sites, where there are many categories and many items within a category.The screen shot below shows an example of faceting from the CNET Web site (CBS Interactive Inc.), which was the first site to use Solr.-image::images/searching-in-solr/cnet-faceting.png[image,width=600,height=300]+image::searching-in-solr/cnet-faceting.png[image,width=600,height=300]Faceting makes use of fields defined when the search applications were indexed.In the example above, these fields include categories of information that are useful for describing digital cameras: manufacturer, resolution, and zoom range.@@ -78,12 +78,12 @@ In the example above, these fields include categories of information that are usThe results of clustering often lack the neat hierarchical organization found in faceted search results, but clustering can be useful nonetheless.It can reveal unexpected commonalities among search results, and it can help users rule out content that isn't pertinent to what they're really searching for.-Solr also supports a feature called <<morelikethis.adoc#,MoreLikeThis>>, which enables users to submit new queries that focus on particular terms returned in an earlier query.+Solr also supports a feature called xref:query-guide:morelikethis.adoc[], which enables users to submit new queries that focus on particular terms returned in an earlier query.MoreLikeThis queries can make use of faceting or clustering to provide additional aid to users.-A Solr component called a <<response-writers.adoc#,*response writer*>> manages the final presentation of the query response.-Solr includes a variety of response writers, including an <<response-writers.adoc#standard-xml-response-writer,XML Response Writer>> and a <<response-writers.adoc#json-response-writer,JSON Response Writer>>.+A Solr component called a xref:query-guide:response-writers.adoc[response writer] manages the final presentation of the query response.+Solr includes a variety of response writers, including an xref:query-guide:response-writers.adoc#standard-xml-response-writer[XML Response Writer] and a xref:query-guide:response-writers.adoc#json-response-writer[JSON Response Writer].The diagram below summarizes some key elements of the search process.-image::images/searching-in-solr/search-process.png[image,width=624,height=401]+image::searching-in-solr/search-process.png[image,width=624,height=401]diff --git a/solr/solr-ref-guide/src/solr-admin-ui.adoc b/solr/solr-ref-guide/modules/getting-started/pages/solr-admin-ui.adocsimilarity index 65%rename from solr/solr-ref-guide/src/solr-admin-ui.adocrename to solr/solr-ref-guide/modules/getting-started/pages/solr-admin-ui.adocindex 9b21923e62f..83f013d5649 100644--- a/solr/solr-ref-guide/src/solr-admin-ui.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/solr-admin-ui.adoc@@ -26,15 +26,15 @@ Solr features a Web interface that provides online access to many Solr configuraAccessing the URL `\http://hostname:8983/solr/` will show the main dashboard, which is divided into two parts..Solr Dashboard-image::images/solr-admin-ui/dashboard.png[image,height=400]+image::solr-admin-ui/dashboard.png[image,height=400]The left-side of the screen is a menu under the Solr logo that provides the navigation through the screens of the UI.-The first set of links are for system-level information and configuration and provide access to <<configuring-logging.adoc#logging-screen,Logging Screen>>, <<collections-core-admin.adoc#,Collection/Core Administration>>, and <<jvm-settings.adoc#java-properties-screen,Java Properties Screen>>, among other things.+The first set of links are for system-level information and configuration and provide access to xref:deployment-guide:configuring-logging.adoc#logging-screen[Logging Screen], xref:deployment-guide:collections-core-admin.adoc[], and xref:deployment-guide:jvm-settings.adoc#java-properties-screen[Java Properties Screen], among other things.At the end of this information is at least one pulldown listing Solr cores configured for this instance.-On <<cluster-types.adoc#solrcloud-mode,SolrCloud>> nodes, an additional pulldown list shows all collections in this cluster.-Clicking on a collection or core name shows secondary menus of information for the specified collection or core, such as a <<schema-browser-screen.adoc#,Schema Browser>>, <<configuration-files.adoc#files-screen,Files Screen>>, <<plugins-stats-screen.adoc#,Plugins & Statistics>>, and an ability to perform <<query-screen.adoc#,Queries>> on indexed data.+On xref:deployment-guide:cluster-types.adoc#solrcloud-mode[SolrCloud] nodes, an additional pulldown list shows all collections in this cluster.+Clicking on a collection or core name shows secondary menus of information for the specified collection or core, such as a xref:indexing-guide:schema-browser-screen.adoc[], xref:configuration-guide:configuration-files.adoc#files-screen[Files Screen], xref:deployment-guide:plugins-stats-screen.adoc[], and a xref:query-guide:query-screen.adoc[] on indexed data.The left-side navigation appears on every screen, while the center changes to the detail of the option selected.The Dashboard shows several information items in the center of the screen, including system uptime, the version being run, system-level data, JVM arguments, and the security plugins enabled (if any).@@ -52,11 +52,10 @@ A convenience redirect is also supported, so simply accessing the Admin UI at `\If authentication has been enabled, Solr will present a login screen to unauthenticated users before allowing them further access to the Admin UI..Login Screen-image::images/solr-admin-ui/login.png[]+image::solr-admin-ui/login.png[]This login screen currently only works with Basic Authentication.-See the section <<basic-authentication-plugin.adoc#,Basic Authentication Plugin>> for- details on how to configure Solr to use this method of authentication.+See the section xref:deployment-guide:basic-authentication-plugin.adoc[] for details on how to configure Solr to use this method of authentication.Once logged in, the left-hand navigation will show the current user with an option to logout.@@ -68,7 +67,7 @@ However, if the user does not have a valid ticket, they will see a message thatAt the bottom of each screen of the Admin UI is a set of links that can be used to get more assistance with configuring and using Solr..Assistance icons-image::images/solr-admin-ui/Assistance.png[Assistance icons]+image::solr-admin-ui/Assistance.png[Assistance icons]These icons include the following links.@@ -80,29 +79,29 @@ These icons include the following links.This server resides at https://issues.apache.org/jira/browse/SOLR.|IRC Channel |Navigates to Solr's http://en.wikipedia.org/wiki/Internet_Relay_Chat[IRC] live-chat room: https://web.libera.chat/?channels=#solr.|Community forum |Navigates to the Apache Wiki page which has further information about ways to engage in the Solr User community mailing lists: https://cwiki.apache.org/confluence/display/solr/UsingMailingLists.-|Solr Query Syntax |Navigates to the section <<query-syntax-and-parsers.adoc#,Query Syntax and Parsing>> in this Reference Guide.+|Solr Query Syntax |Navigates to the section xref:query-guide:query-syntax-and-parsers.adoc[] in this Reference Guide.|===These links cannot be modified without editing the `index.html` in the `server/solr/solr-webapp` directory that contains the Admin UI files.== Security-Users with the `security-edit` permission can manage users, roles, and permissions using the <<security-ui.adoc#,Security>> panel in the Admin UI.+Users with the `security-edit` permission can manage users, roles, and permissions using the xref:deployment-guide:security-ui.adoc[].Users with the `security-read` permission can view the Security panel but all update actions on the panel are disabled..Security Screen-image::images/solr-admin-ui/security.png[image,width=800]+image::solr-admin-ui/security.png[image,width=800]== Schema Designer-The <<schema-designer.adoc#,Schema Designer>> screen provides an interactive experience to create a schema using sample data.+The xref:indexing-guide:schema-designer.adoc[] screen provides an interactive experience to create a schema using sample data.-image::images/solr-admin-ui/schema-designer.png[image]+image::solr-admin-ui/schema-designer.png[image].Only Visible When Using SolrCloud[NOTE]====-The Schema Designer is only available on Solr instances running <<cluster-types.adoc#solrcloud-mode,SolrCloud>>.+The Schema Designer is only available on Solr instances running xref:deployment-guide:cluster-types.adoc#solrcloud-mode[SolrCloud].====== Collection-Specific Tools@@ -112,7 +111,7 @@ In the left-hand navigation bar, you will see a pull-down menu titled Collection.Only Visible When Using SolrCloud[NOTE]====-The Collection Selector pull-down menu is only available on Solr instances running <<cluster-types.adoc#solrcloud-mode,SolrCloud>>.+The Collection Selector pull-down menu is only available on Solr instances running xref:deployment-guide:cluster-types.adoc#solrcloud-mode[SolrCloud].User-managed clusters or single-node installations will not display this menu, instead the Collection specific UI pages described in this section will be available in the <<Core-Specific Tools,Core Selector pull-down menu>>.====@@ -121,7 +120,7 @@ Clicking on the Collection Selector pull-down menu will show a list of the colleWhen a collection is selected, the main body of the page will display some metadata about the collection.A secondary menu will appear in the left nav with links to additional collection specific administration screens.-image::images/solr-admin-ui/collection_dashboard.png[image,width=482,height=250]+image::solr-admin-ui/collection_dashboard.png[image,width=482,height=250]== Core-Specific Tools@@ -133,7 +132,7 @@ Clicking on the menu will show a list of Solr cores hosted on this Solr node, wiWhen you select a core from the pull-down, the main display of the page will show some basic metadata about the core, and a secondary menu will appear in the left nav with links to additional core specific administration screens..Core overview screen-image::images/solr-admin-ui/core_dashboard.png[image,width=515,height=250]+image::solr-admin-ui/core_dashboard.png[image,width=515,height=250]== Links to UI DocumentationHere are sections throughout the Guide describing each screen of the Admin UI:@@ -145,13 +144,13 @@ Here are sections throughout the Guide describing each screen of the Admin UI:// tag::ui-common-tools[][cols="1,1",frame=none,grid=none,stripes=none]|===-| <<configuring-logging.adoc#logging-screen,Logging Screen>>: Recent log messages and configuration of log levels.-| <<security-ui.adoc#,Security>>: Manage users, roles, and permissions.-| <<cloud-screens.adoc#,Cloud Screens>>: Access to SolrCloud node data and status.-| <<schema-designer.adoc#,Schema Designer>>: Interactively create a schema using sample data.-| <<collections-core-admin.adoc#,Collections / Core Admin>>: Collection or Core management tools.-| <<jvm-settings.adoc#java-properties-screen,Java Properties Screen>>: Java information for each core.-| <<thread-dump.adoc#,Thread Dump Screen>>: Detailed thread and state information.+| xref:deployment-guide:configuring-logging.adoc#logging-screen[Logging Screen]: Recent log messages and configuration of log levels.+| xref:deployment-guide:security-ui.adoc[]: Manage users, roles, and permissions.+| xref:deployment-guide:cloud-screens.adoc[]: Access to SolrCloud node data and status.+| xref:indexing-guide:schema-designer.adoc[]: Interactively create a schema using sample data.+| xref:deployment-guide:collections-core-admin.adoc[]: Collection or Core management tools.+| xref:deployment-guide:jvm-settings.adoc#java-properties-screen[Java Properties Screen]: Java information for each core.+| xref:deployment-guide:thread-dump.adoc[]: Detailed thread and state information.||===// end::ui-common-tools[]@@ -164,13 +163,13 @@ Here are sections throughout the Guide describing each screen of the Admin UI:// tag::ui-collection-tools[][cols="1,1",frame=none,grid=none,stripes=none]|===-| <<analysis-screen.adoc#,Analysis Screen>>: Test and validation tool for field type analyzers.-| <<documents-screen.adoc#,Documents Screen>>: Form-based document updates using the Admin UI.-| <<configuration-files.adoc#files-screen,Files Screen>>: Configuration file browser.-| <<query-screen.adoc#,Query Screen>>: Form-based query builder.-| <<stream-screen.adoc#,Stream Screen>>: Submit streaming expressions and see results and parsing explanations.-| <<sql-screen.adoc#,SQL Screen>>: SQL query runner with tabular results.-| <<schema-browser-screen.adoc#,Schema Browser Screen>>: Field-level schema details.+| xref:indexing-guide:analysis-screen.adoc[]: Test and validation tool for field type analyzers.+| xref:indexing-guide:documents-screen.adoc[]: Form-based document updates using the Admin UI.+| xref:configuration-guide:configuration-files.adoc#files-screen[Files Screen]: Configuration file browser.+| xref:query-guide:query-screen.adoc[]: Form-based query builder.+| xref:query-guide:stream-screen.adoc[]: Submit streaming expressions and see results and parsing explanations.+| xref:query-guide:sql-screen.adoc[]: SQL query runner with tabular results.+| xref:query-guide:schema-browser-screen.adoc[]: Field-level schema details.|===// end::ui-collection-tools[]****@@ -182,10 +181,10 @@ Here are sections throughout the Guide describing each screen of the Admin UI:// tag::ui-core-tools[][cols="1,1",frame=none,grid=none,stripes=none]|===-| <<ping.adoc#,Ping>>: Ping a named core to determine whether it is active.-| <<plugins-stats-screen.adoc#,Plugins/Stats Screen>>: Statistics for request handlers, search components, plugins, and other installed components.-| <<user-managed-index-replication.adoc#replication-screen,Replication Screen>>: Enable replication for a core and view current replication status.-| <<index-segments-merging.adoc#segments-info-screen,Segments Info Screen>>: Visualization of the underlying Lucene index segments.+| xref:deployment-guide:ping.adoc[]: Ping a named core to determine whether it is active.+| xref:deployment-guide:plugins-stats-screen.adoc[]: Statistics for request handlers, search components, plugins, and other installed components.+| xref:deployment-guide:user-managed-index-replication.adoc#replication-screen[Replication Screen]: Enable replication for a core and view current replication status.+| xref:configuration-guide:index-segments-merging.adoc#segments-info-screen[Segments Info Screen]: Visualization of the underlying Lucene index segments.|===// end::ui-core-tools[]****diff --git a/solr/solr-ref-guide/src/solr-glossary.adoc b/solr/solr-ref-guide/modules/getting-started/pages/solr-glossary.adocsimilarity index 88%rename from solr/solr-ref-guide/src/solr-glossary.adocrename to solr/solr-ref-guide/modules/getting-started/pages/solr-glossary.adocindex 842bc1ee8aa..456d17e7a0e 100644--- a/solr/solr-ref-guide/src/solr-glossary.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/solr-glossary.adoc@@ -31,7 +31,7 @@ Where possible, terms are linked to relevant parts of the Solr Reference Guide f[[SolrGlossary-A]]=== A-[[atomicupdates]]<<partial-document-updates.adoc#atomic-updates,Atomic updates>>::+[[atomicupdates]]xref:indexing-guide:partial-document-updates.adoc#atomic-updates[Atomic updates]::An approach to updating only one or more fields of a document, instead of reindexing the entire document.@@ -137,7 +137,7 @@ Also known as a Solr server.[[SolrGlossary-O]]=== O-[[optimisticconcurrency]]<<partial-document-updates.adoc#optimistic-concurrency,Optimistic concurrency>>::+[[optimisticconcurrency]]xref:indexing-guide:partial-document-updates.adoc#optimistic-concurrency[Optimistic concurrency]::Also known as "optimistic locking", this is an approach that allows for updates to documents currently in the index while retaining locking or version control.[[overseer]]Overseer::@@ -164,17 +164,17 @@ The appropriateness of a document to the search conducted by the user.[[replica]]Replica::A <<core,Core>> that acts as a physical copy of a <<shard,Shard>> in a <<solrclouddef,SolrCloud>> <<collection,Collection>>.-[[replication]]<<user-managed-index-replication.adoc#,Replication>>::+[[replication]]xref:deployment-guide:user-managed-index-replication.adoc[Replication]::A method of copying a leader index from one server to one or more "follower" or "child" servers.-[[requesthandler]]<<requesthandlers-searchcomponents.adoc#,RequestHandler>>::+[[requesthandler]]xref:configuration-guide:requesthandlers-searchcomponents.adoc[RequestHandler]::Logic and configuration parameters that tell Solr how to handle incoming "requests", whether the requests are to return search results, to index documents, or to handle other custom situations.[[SolrGlossary-S]]=== S-[[searchcomponent]]<<requesthandlers-searchcomponents.adoc#,SearchComponent>>::+[[searchcomponent]]xref:configuration-guide:requesthandlers-searchcomponents.adoc[SearchComponent]::Logic and configuration parameters used by request handlers to process query requests.Examples of search components include faceting, highlighting, and "more like this" functionality.@@ -183,28 +183,28 @@ In SolrCloud, a logical partition of a single <<collection,Collection>>.Every shard consists of at least one physical <<replica,Replica>>, but there may be multiple Replicas distributed across multiple <<node,Nodes>> for fault tolerance.See also <<solrclouddef,SolrCloud>>.-[[solrclouddef]]<<cluster-types.adoc#solrcloud-mode,SolrCloud>>::+[[solrclouddef]]xref:deployment-guide:cluster-types.adoc#solrcloud-mode[SolrCloud]::Umbrella term for a suite of functionality in Solr which allows managing a <<cluster,Cluster>> of Solr <<node,Nodes>> for scalability, fault tolerance, and high availability.-[[schema]]<<solr-schema.adoc#,Solr Schema (managed-schema.xml or schema.xml)>>::+[[schema]]xref:indexing-guide:schema-elements.adoc[Solr Schema (managed-schema.xml or schema.xml)]::The Solr index Schema defines the fields to be indexed and the type for the field (text, integers, etc.).-By default schema data can be "managed" at run time using the <<schema-api.adoc#,Schema API>> and is typically kept in a file named `managed-schema.xml` which Solr modifies as needed, but a collection may be configured to use a static Schema, which is only loaded on startup from a human edited configuration file - typically named `schema.xml`.-See <<schema-factory.adoc#,Schema Factory Definition in SolrConfig>> for details.+By default schema data can be "managed" at run time using the xref:indexing-guide:schema-api.adoc[] and is typically kept in a file named `managed-schema.xml` which Solr modifies as needed, but a collection may be configured to use a static Schema, which is only loaded on startup from a human edited configuration file - typically named `schema.xml`.+See xref:configuration-guide:schema-factory.adoc[] for details.-[[solrconfig]]<<configuring-solrconfig-xml.adoc#,SolrConfig (solrconfig.xml)>>::+[[solrconfig]]xref:configuration-guide:configuring-solrconfig-xml.adoc[SolrConfig (solrconfig.xml)]::The Apache Solr configuration file.Defines indexing options, RequestHandlers, highlighting, spellchecking and various other configurations.The file, `solrconfig.xml`, is located in the Solr home `conf` directory.-[[spellcheck]]<<spell-checking.adoc#,Spell Check>>::+[[spellcheck]]xref:query-guide:spell-checking.adoc[Spell Check]::The ability to suggest alternative spellings of search terms to a user, as a check against spelling errors causing few or zero results.[[stopwords]]Stopwords::Generally, words that have little meaning to a user's search but which may have been entered as part of a <<naturallanguagequery,natural language>> query.Stopwords are generally very small pronouns, conjunctions and prepositions (such as, "the", "with", or "and")-[[suggesterdef]]<<suggester.adoc#,Suggester>>::+[[suggesterdef]]xref:query-guide:suggester.adoc[Suggester]::Functionality in Solr that provides the ability to suggest possible query terms to users as they type.[[synonyms]]Synonyms::diff --git a/solr/solr-ref-guide/src/solr-indexing.adoc b/solr/solr-ref-guide/modules/getting-started/pages/solr-indexing.adocsimilarity index 89%rename from solr/solr-ref-guide/src/solr-indexing.adocrename to solr/solr-ref-guide/modules/getting-started/pages/solr-indexing.adocindex 48db7922ad7..9804b68fadd 100644--- a/solr/solr-ref-guide/src/solr-indexing.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/solr-indexing.adoc@@ -24,18 +24,18 @@ A Solr index can accept data from many different sources, including XML files, cHere are the three most common ways of loading data into a Solr index:-* Using the <<indexing-with-tika.adoc#,Solr Cell>> framework built on Apache Tika for ingesting binary files or structured files such as Office, Word, PDF, and other proprietary formats.+* xref:indexing-guide:indexing-with-tika.adoc[], built on Apache Tika for ingesting binary files or structured files such as Office, Word, PDF, and other proprietary formats.* Uploading XML files by sending HTTP requests to the Solr server from any environment where such requests can be generated.-* Writing a custom Java application to ingest data through Solr's Java Client API (which is described in more detail in <<client-apis.adoc#,Client APIs>>).+* Writing a custom Java application to ingest data through Solr's Java Client API (which is described in more detail in xref:deployment-guide:client-apis.adoc[]).Using the Java API may be the best choice if you're working with an application, such as a Content Management System (CMS), that offers a Java API.Regardless of the method used to ingest data, there is a common basic data structure for data being fed into a Solr index: a _document_ containing multiple _fields,_ each with a _name_ and containing _content,_ which may be empty.One of the fields is usually designated as a unique ID field (analogous to a primary key in a database), although the use of a unique ID field is not strictly required by Solr.If the field name is defined in the Schema that is associated with the index, then the analysis steps associated with that field will be applied to its content when the content is tokenized.-Fields that are not explicitly defined in the Schema will either be ignored or mapped to a dynamic field definition (see <<fields-and-schema-design.adoc#,Fields and Schema Design>>), if one matching the field name exists.+Fields that are not explicitly defined in the Schema will either be ignored or mapped to a xref:indexing-guide:dynamic-fields.adoc[dynamic field definition], if one matching the field name exists.== The Solr Example Directorydiff --git a/solr/solr-ref-guide/src/solr-tutorial.adoc b/solr/solr-ref-guide/modules/getting-started/pages/solr-tutorial.adocsimilarity index 82%rename from solr/solr-ref-guide/src/solr-tutorial.adocrename to solr/solr-ref-guide/modules/getting-started/pages/solr-tutorial.adocindex 6f57ac074ab..31fce6a8c4c 100644--- a/solr/solr-ref-guide/src/solr-tutorial.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/solr-tutorial.adoc@@ -1,10 +1,5 @@= Solr Tutorials:experimental:-:page-children: tutorial-techproducts, \- tutorial-films, \- tutorial-diy, \- tutorial-solrcloud, \- tutorial-aws// 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@@ -26,11 +21,11 @@ This tutorial covers getting Solr up and running, ingesting a variety of data soand getting a feel for the Solr administrative and search interfaces.The tutorial is organized into three sections that each build on the one before it.-The <<tutorial-techproducts.adoc#,first exercise>> will ask you to start Solr, create a collection, index some basic documents, and then perform some searches.+The xref:tutorial-techproducts.adoc[first exercise] will ask you to start Solr, create a collection, index some basic documents, and then perform some searches.-The <<tutorial-films.adoc#,second exercise>> works with a different set of data, and explores requesting facets with the dataset.+The xref:tutorial-films.adoc[second exercise] works with a different set of data, and explores requesting facets with the dataset.-The <<tutorial-diy.adoc#,third exercise>> encourages you to begin to work with your own data and start a plan for your implementation.+The xref:tutorial-diy.adoc[third exercise] encourages you to begin to work with your own data and start a plan for your implementation.Finally, we'll introduce <<Spatial Queries,spatial search>> and show you how to get your Solr instance back into a clean state.@@ -60,7 +55,7 @@ solr-{solr-full-version}.tgz~$ cd solr-{solr-full-version}/-----If you'd like to know more about Solr's directory layout before moving to the first exercise, see the section <<installing-solr.adoc#directory-layout,Directory Layout>> for details.+If you'd like to know more about Solr's directory layout before moving to the first exercise, see the section xref:deployment-guide:installing-solr.adoc#directory-layout[Directory Layout] for details.== Spatial Queries@@ -68,9 +63,9 @@ If you'd like to know more about Solr's directory layout before moving to the fiSolr has sophisticated geospatial support, including searching within a specified distance range of a given location (or within a bounding box), sorting by distance, or even boosting results by the distance.Some of the example techproducts documents we indexed in Exercise 1 have locations associated with them to illustrate the spatial capabilities.-To reindex this data, see <<tutorial-techproducts.adoc#,Exercise 1>>.+To reindex this data, see xref:tutorial-techproducts.adoc[Exercise 1].-To learn more about Solr's spatial capabilities, see the section <<spatial-search.adoc#,Spatial Search>>.+To learn more about Solr's spatial capabilities, see the section xref:query-guide:spatial-search.adoc[].== Wrapping Updiff --git a/solr/solr-ref-guide/src/tutorial-aws.adoc b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-aws.adocsimilarity index 90%rename from solr/solr-ref-guide/src/tutorial-aws.adocrename to solr/solr-ref-guide/modules/getting-started/pages/tutorial-aws.adocindex cef57dc47f5..6439c5f56fe 100644--- a/solr/solr-ref-guide/src/tutorial-aws.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-aws.adoc@@ -21,7 +21,7 @@ This guide is a tutorial on how to set up a multi-node SolrCloud cluster on httpThis tutorial is not meant for production systems.For one, it uses Solr's embedded ZooKeeper instance, and for production you should have at least 3 ZooKeeper nodes in an ensemble.-There are additional steps you should take for a production installation; refer to <<taking-solr-to-production.adoc#,Taking Solr to Production>> for how to deploy Solr in production.+There are additional steps you should take for a production installation; refer to xref:deployment-guide:taking-solr-to-production.adoc[] for how to deploy Solr in production.In this guide we are going to:@@ -42,7 +42,7 @@ To use this guide, you must have the following:* An https://aws.amazon.com[AWS] account.* Familiarity with setting up a single-node SolrCloud on local machine.-Refer to the <<solr-tutorial.adoc#,Solr Tutorial>> if you have never used Solr before.+Refer to the xref:solr-tutorial.adoc[] if you have never used Solr before.== Launch EC2 instances@@ -71,7 +71,7 @@ Choose "SSH" as the type, and again "My IP" for the source and again enter yourYou need SSH access on all instances to install and configure Solr... Review the details, your group configuration should look like this:+-image::images/tutorial-aws/aws-security-create.png[image,width=600,height=400]+image::tutorial-aws/aws-security-create.png[image,width=600,height=400].. Click btn:[Create] when finished... We need to modify the rules so that instances that are part of the group can talk to all other instances that are part of the same group.We could not do this while creating the group, so we need to edit the group after creating it to add this.@@ -82,7 +82,7 @@ Choose `All TCP` from the pulldown list for the type, and enter `0-65535` for thSpecify the name of the current Security Group as the `solr-sample`... Review the details, your group configuration should now look like this:+-image::images/tutorial-aws/aws-security-edit.png[image,width=600,height=400]+image::tutorial-aws/aws-security-edit.png[image,width=600,height=400].. Click btn:[Save] when finished.=== Configure Instances and Launch@@ -112,7 +112,7 @@ You do not have to add any tags for this quick start, but you can add them if yo. If everything looks correct, click btn:[Launch].. Select an existing “private key file” or create a new one and download to your local machine so you will be able to login into the instances via SSH.+-image::images/tutorial-aws/aws-key.png[image,width=600,height=400]+image::tutorial-aws/aws-key.png[image,width=600,height=400]. On the instances list, you can watch the states change.You cannot use the instances until they become *“running”*.@@ -200,7 +200,7 @@ You should able to see Solr UI dashboard for both nodes.== Create Collection, Index and Query-You can refer <<solr-tutorial.adoc#,Solr Tutorial>> for an extensive walkthrough on creating collections with multiple shards and replicas, indexing data via different methods and querying documents accordingly.+You can refer to the xref:solr-tutorial.adoc[] for an extensive walkthrough on creating collections with multiple shards and replicas, indexing data via different methods and querying documents accordingly.== Deploying with External ZooKeeper@@ -222,18 +222,18 @@ $ sudo vim /etc/hostsThese steps will help you install and configure a single instance of ZooKeeper on AWS.This is not sufficient for a production, use, however, where a ZooKeeper ensemble of at least three nodes is recommended.-See the section <<zookeeper-ensemble.adoc#,ZooKeeper Ensemble>> for information about how to change this single-instance into an ensemble.+See the section xref:deployment-guide:zookeeper-ensemble.adoc[] for information about how to change this single-instance into an ensemble.. Download a stable version of ZooKeeper.-In this example we're using ZooKeeper v{ivy-zookeeper-version}.+In this example we're using ZooKeeper v{dep-version-zookeeper}.On the node you're using to host ZooKeeper (`zookeeper-node`), download the package and untar it:+[source,bash,subs="attributes"]-----# download stable version of ZooKeeper, here {ivy-zookeeper-version}-$ wget https://archive.apache.org/dist/zookeeper/zookeeper-{ivy-zookeeper-version}/zookeeper-{ivy-zookeeper-version}.tar.gz+# download stable version of ZooKeeper, here {dep-version-zookeeper}+$ wget https://archive.apache.org/dist/zookeeper/zookeeper-{dep-version-zookeeper}/zookeeper-{dep-version-zookeeper}.tar.gz# untar-$ tar -zxvf zookeeper-{ivy-zookeeper-version}.tar.gz+$ tar -zxvf zookeeper-{dep-version-zookeeper}.tar.gz----+Add an environment variable for ZooKeeper's home directory (`ZOO_HOME`) to the `.bashrc` for the user who will be running the process.@@ -242,10 +242,10 @@ Correct the path to the ZooKeeper installation as appropriate if where you put i+[source,bash,subs="attributes"]-----$ export ZOO_HOME=$PWD/zookeeper-{ivy-zookeeper-version}+$ export ZOO_HOME=$PWD/zookeeper-{dep-version-zookeeper}# put the env variable in .bashrc# vim ~/.bashrc-export ZOO_HOME=/home/ec2-user/zookeeper-{ivy-zookeeper-version}+export ZOO_HOME=/home/ec2-user/zookeeper-{dep-version-zookeeper}----. Change directories to `ZOO_HOME`, and create the ZooKeeper configuration by using the template provided by ZooKeeper.+@@ -300,6 +300,6 @@ $ bin/solr start -c -p 8983 -h solr-node-1 -z zookeeper-node:2181As noted earlier, a single ZooKeeper node is not sufficient for a production installation.See these additional resources for more information about deploying Solr in production, which can be used once you have the EC2 instances up and running:-* <<taking-solr-to-production.adoc#,Taking Solr to Production>>-* <<zookeeper-ensemble.adoc#,ZooKeeper Ensemble>>+* xref:deployment-guide:taking-solr-to-production.adoc[]+* xref:deployment-guide:zookeeper-ensemble.adoc[]====diff --git a/solr/solr-ref-guide/src/tutorial-diy.adoc b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-diy.adocsimilarity index 90%rename from solr/solr-ref-guide/src/tutorial-diy.adocrename to solr/solr-ref-guide/modules/getting-started/pages/tutorial-diy.adocindex 2f961a8d60e..9c9ea1102bd 100644--- a/solr/solr-ref-guide/src/tutorial-diy.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-diy.adoc@@ -63,10 +63,10 @@ Indexing content such as this demonstrates the need to plan Solr for your data,SolrJ::SolrJ is a Java-based client for interacting with Solr.-Use <<solrj.adoc#,SolrJ>> for JVM-based languages or other <<client-apis.adoc#,Solr clients>> to programmatically create documents to send to Solr.+Use xref:deployment-guide:solrj.adoc[] for JVM-based languages or other xref:deployment-guide:client-apis.adoc[] to programmatically create documents to send to Solr.Documents Screen::-Use the Admin UI <<documents-screen.adoc#,Documents tab>> (at http://localhost:8983/solr/#/localDocs/documents) to paste in a document to be indexed, or select `Document Builder` from the `Document Type` dropdown to build a document one field at a time.+Use the Admin UI xref:indexing-guide:documents-screen.adoc[] (at http://localhost:8983/solr/#/localDocs/documents) to paste in a document to be indexed, or select `Document Builder` from the `Document Type` dropdown to build a document one field at a time.Click on the btn:[Submit Document] button below the form to index your document.=== Updating Data@@ -107,4 +107,4 @@ You can also modify the above to only delete documents that match a specific queAt this point, you're ready to start working on your own.-Jump ahead to the overall <<solr-tutorial.adoc#wrapping-up,wrap up>> when you're ready to stop Solr and remove all the examples you worked with and start fresh.+Jump ahead to the overall xref:solr-tutorial.adoc#wrapping-up[wrap up] when you're ready to stop Solr and remove all the examples you worked with and start fresh.diff --git a/solr/solr-ref-guide/src/tutorial-films.adoc b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-films.adocsimilarity index 97%rename from solr/solr-ref-guide/src/tutorial-films.adocrename to solr/solr-ref-guide/modules/getting-started/pages/tutorial-films.adocindex a1ea79df4f6..e53956472b6 100644--- a/solr/solr-ref-guide/src/tutorial-films.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-films.adoc@@ -36,7 +36,7 @@ When it's done start the second node, and tell it how to connect to ZooKeeper:`./bin/solr start -c -p 7574 -s example/cloud/node2/solr -z localhost:9983`-NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see <<zookeeper-ensemble#updating-solr-include-files,instructions>>) you can omit `-z <zk host string>` from the above command.+NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see xref:deployment-guide:zookeeper-ensemble#updating-solr-include-files[Updating Solr Include Files]) you can omit `-z <zk host string>` from the above command.=== Create a New Collection@@ -166,7 +166,7 @@ You can also use the Admin UI to create fields, but it offers a bit less controlIt will work for our case, though:.Creating a field-image::images/solr-tutorial/tutorial-add-field.png[Adding a Field,640,480,pdfwidth=75%]+image::solr-tutorial/tutorial-add-field.png[Adding a Field,640,480,pdfwidth=75%]===== Create a "catchall" Copy Field@@ -189,7 +189,7 @@ curl -X POST -H 'Content-type:application/json' --data-binary '{"add-copy-field"In the Admin UI, choose btn:[Add Copy Field], then fill out the source and destination for your field, as in this screenshot..Creating a copy field-image::images/solr-tutorial/tutorial-add-copy-field.png[Adding a copy field,640,480,pdfwidth=75%]+image::solr-tutorial/tutorial-add-copy-field.png[Adding a copy field,640,480,pdfwidth=75%]What this does is make a copy of all fields and put the data into the "\_text_" field.@@ -277,7 +277,7 @@ In addition to providing search results, a Solr query can return the number of dOn the Admin UI Query tab, if you check the `facet` checkbox, you'll see a few facet-related options appear:.Facet options in the Query screen-image::images/solr-tutorial/tutorial-admin-ui-facet-options.png[Solr Quick Start: Query tab facet options]+image::solr-tutorial/tutorial-admin-ui-facet-options.png[Solr Quick Start: Query tab facet options]To see facet counts from all documents (`q=\*:*`): turn on faceting (`facet=true`), and specify the field to facet on via the `facet.field` parameter.If you only want facets, and no document contents, specify `rows=0`.@@ -326,7 +326,7 @@ If you wanted to control the number of items in a bucket, you could do somethingYou should only see 4 facets returned.There are a great deal of other parameters available to help you control how Solr constructs the facets and facet lists.-We'll cover some of them in this exercise, but you can also see the section <<faceting.adoc#,Faceting>> for more detail.+We'll cover some of them in this exercise, but you can also see the section xref:query-guide:faceting.adoc[] for more detail.==== Range Facetsdiff --git a/solr/solr-ref-guide/src/tutorial-solrcloud.adoc b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-solrcloud.adocsimilarity index 88%rename from solr/solr-ref-guide/src/tutorial-solrcloud.adocrename to solr/solr-ref-guide/modules/getting-started/pages/tutorial-solrcloud.adocindex 546a3938fbf..83f9c2ab667 100644--- a/solr/solr-ref-guide/src/tutorial-solrcloud.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-solrcloud.adoc@@ -31,15 +31,15 @@ In this section you will learn how to start a SolrCloud cluster using startup sc[TIP]====This tutorial assumes that you're already familiar with the basics of using Solr.-If you need a refresher, please see the <<getting-started.adoc#,Getting Started section>> to get a grounding in Solr concepts.+If you need a refresher, please see the xref:solr-tutorial.adoc[] to get a grounding in Solr concepts.If you load documents as part of that exercise, you should start over with a fresh Solr installation for these SolrCloud tutorials.====[WARNING]====-For security reasons, Solr nodes only accept connections from localhost by default.+For security reasons, Solr nodes only accept connections from `localhost` by default.Administrators setting up SolrCloud deployments with multiple nodes must override this setting.-For more details see <<securing-solr.adoc#network-configuration,here>>.+For more details see the section xref:deployment-guide:securing-solr.adoc#network-configuration[Network Configuration].====== SolrCloud Example@@ -97,15 +97,15 @@ After starting up all nodes in the cluster, the script prompts you for the nameThe suggested default is "gettingstarted" but you might want to choose a name more appropriate for your specific search application.Next, the script prompts you for the number of shards to distribute the collection across.-<<solrcloud-shards-indexing.adoc#,Sharding>> is covered in more detail later on, so if you're unsure, we suggest using the default of 2 so that you can see how a collection is distributed across multiple nodes in a SolrCloud cluster.+xref:deployment-guide:solrcloud-shards-indexing.adoc[] are covered in more detail later on, so if you're unsure, we suggest using the default of 2 so that you can see how a collection is distributed across multiple nodes in a SolrCloud cluster.Next, the script will prompt you for the number of replicas to create for each shard.-<<solrcloud-shards-indexing.adoc#,Replication>> is covered in more detail later in the guide, so if you're unsure, then use the default of 2 so that you can see how replication is handled in SolrCloud.+Again, this is covered in more detail later in the guide, so if you're unsure, then use the default of 2 so that you can see how replication is handled in SolrCloud.Lastly, the script will prompt you for the name of a configuration directory for your collection.-You can choose *_default*, or *sample_techproducts_configs*.+You can choose `_default`, or `sample_techproducts_configs`.The configuration directories are pulled from `server/solr/configsets/` so you can review them beforehand if you wish.-The *_default* configuration is useful when you're still designing a schema for your documents and need some flexibility as you experiment with Solr, since it has schemaless functionality.+The `_default` configuration is useful when you're still designing a schema for your documents and need some flexibility as you experiment with Solr, since it has schemaless functionality.However, after creating your collection, the schemaless functionality can be disabled in order to lock down the schema (so that documents indexed after doing so will not alter the schema) or to configure the schema by yourself.This can be done as follows (assuming your collection name is `mycollection`):@@ -150,7 +150,7 @@ bin/solr healthcheck -c gettingstartedThe healthcheck command gathers basic information about each replica in a collection, such as number of docs, current status (active, down, etc.), and address (where the replica lives in the cluster).-Documents can now be added to SolrCloud using the <<post-tool.adoc#,Post Tool>>.+Documents can now be added to SolrCloud using the xref:indexing-guide:post-tool.adoc[].To stop Solr in SolrCloud mode, you would use the `bin/solr` script and issue the `stop` command, as in:@@ -214,4 +214,4 @@ bin/solr start -cloud -s example/cloud/node3/solr -p 8987 -z localhost:9983The previous command will start another Solr node on port 8987 with Solr home set to `example/cloud/node3/solr`.The new node will write its log files to `example/cloud/node3/logs`.-Once you're comfortable with how the SolrCloud example works, we recommend using the process described in <<taking-solr-to-production.adoc#,Taking Solr to Production>> for setting up SolrCloud nodes in production.+Once you're comfortable with how the SolrCloud example works, we recommend using the process described in xref:deployment-guide:taking-solr-to-production.adoc[] for setting up SolrCloud nodes in production.diff --git a/solr/solr-ref-guide/src/tutorial-techproducts.adoc b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-techproducts.adocsimilarity index 96%rename from solr/solr-ref-guide/src/tutorial-techproducts.adocrename to solr/solr-ref-guide/modules/getting-started/pages/tutorial-techproducts.adocindex 6169f40bfb8..c2bfbb4f88a 100644--- a/solr/solr-ref-guide/src/tutorial-techproducts.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-techproducts.adoc@@ -104,7 +104,7 @@ Enter `techproducts` at the prompt and hit kbd:[enter].How many shards would you like to split techproducts into? [2]-----This is asking how many <<solr-glossary.adoc#shard,shards>> you want to split your index into across the two nodes.+This is asking how many xref:solr-glossary.adoc#shard[shards] you want to split your index into across the two nodes.Choosing "2" (the default) means we will split the index relatively evenly across both nodes, which is a good way to start.Accept the default by hitting kbd:[enter].@@ -113,7 +113,7 @@ Accept the default by hitting kbd:[enter].How many replicas per shard would you like to create? [2]-----A replica is a copy of the index that's used for failover (see also the <<solr-glossary.adoc#replica,Solr Glossary definition>>).+A replica is a copy of the index that's used for failover (see also the xref:solr-glossary.adoc#replica[Solr Glossary definition]).Again, the default of "2" is fine to start with here also, so accept the default by hitting kbd:[enter].[source,subs="verbatim,attributes+"]@@ -179,7 +179,7 @@ There is one collection created automatically, `techproducts`, a two shard colleThe http://localhost:8983/solr/#/~cloud[Cloud tab] in the Admin UI diagrams the collection nicely:.SolrCloud Diagram-image::images/solr-tutorial/tutorial-solrcloud.png[]+image::solr-tutorial/tutorial-solrcloud.png[]== Index the Techproducts Data@@ -191,7 +191,7 @@ We'll use this tool for the indexing examples below.You'll need a command shell to run some of the following examples, rooted in the Solr install directory; the shell from where you launched Solr works just fine.NOTE: Currently the `bin/post` tool does not have a comparable Windows script, but the underlying Java program invoked is available.-We'll show examples below for Windows, but you can also see the <<post-tool.adoc#post-tool-windows-support,Windows section>> of the Post Tool documentation for more details.+We'll show examples below for Windows, but you can also see the section xref:indexing-guide:post-tool.adoc#post-tool-windows-support[Post Tool Windows Support].The data we will index is in the `example/exampledocs` directory.The documents are in a mix of document formats (JSON, CSV, etc.), and fortunately we can index them all at once:@@ -253,7 +253,7 @@ The Solr Admin UI includes a query builder interface via the Query tab for the `If you click the btn:[Execute Query] button without changing anything in the form, you'll get 10 documents in JSON format:.Query Screen-image::images/solr-tutorial/tutorial-query-screen.png[Solr Quick Start: techproducts Query screen with results]+image::solr-tutorial/tutorial-query-screen.png[Solr Quick Start: techproducts Query screen with results]The URL sent by the Admin UI to Solr is shown in light grey near the top right of the above screenshot.If you click on it, your browser will show you the raw response.@@ -330,7 +330,7 @@ You should only see the IDs of the matching records returned.All Solr queries look for documents using some field.Often you want to query across multiple fields at the same time, and this is what we've done so far with the "foundation" query.This is possible with the use of copy fields, which are set up already with this set of configurations.-We'll cover copy fields a little bit more in <<tutorial-films.adoc#,Exercise 2>>.+We'll cover copy fields a little bit more in xref:tutorial-films.adoc[Exercise 2].Sometimes, though, you want to limit your query to a single field.This can make your queries more efficient and the results more relevant for users.@@ -486,7 +486,7 @@ This time you get 13 results.=== More Information on SearchingWe have only scratched the surface of the search options available in Solr.-For more Solr search options, see the <<query-guide.adoc#,Query Guide>>.+For more Solr search options, see xref:query-guide:query-syntax-and-parsers.adoc[].== Exercise 1 Wrap Up@@ -506,4 +506,4 @@ To stop both of the Solr nodes we started, issue the command:`bin/solr stop -all`-For more information on start/stop and collection options with `bin/solr`, see <<solr-control-script-reference.adoc#,Solr Control Script Reference>>.+For more information on start/stop and collection options with `bin/solr`, see xref:deployment-guide:solr-control-script-reference.adoc[].diff --git a/solr/solr-ref-guide/modules/indexing-guide/examples/IndexingNestedDocuments.java b/solr/solr-ref-guide/modules/indexing-guide/examples/IndexingNestedDocuments.javanew file mode 120000index 00000000000..05cde5492f7--- /dev/null+++ b/solr/solr-ref-guide/modules/indexing-guide/examples/IndexingNestedDocuments.java@@ -0,0 +1 @@+../../../../solrj/src/test/org/apache/solr/client/ref_guide_examples/IndexingNestedDocuments.java\ No newline at end of filediff --git a/solr/solr-ref-guide/modules/indexing-guide/examples/stemdict.txt b/solr/solr-ref-guide/modules/indexing-guide/examples/stemdict.txtnew file mode 120000index 00000000000..c242c73fe09--- /dev/null+++ b/solr/solr-ref-guide/modules/indexing-guide/examples/stemdict.txt@@ -0,0 +1 @@+../../../../core/src/test-files/solr/collection1/conf/stemdict.txt\ No newline at end of filediff --git a/solr/solr-ref-guide/src/images/analysis-screen/analysis_compare_0.png b/solr/solr-ref-guide/modules/indexing-guide/images/analysis-screen/analysis_compare_0.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/analysis-screen/analysis_compare_0.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/analysis-screen/analysis_compare_0.pngdiff --git a/solr/solr-ref-guide/src/images/analysis-screen/analysis_compare_1.png b/solr/solr-ref-guide/modules/indexing-guide/images/analysis-screen/analysis_compare_1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/analysis-screen/analysis_compare_1.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/analysis-screen/analysis_compare_1.pngdiff --git a/solr/solr-ref-guide/src/images/analysis-screen/analysis_compare_2.png b/solr/solr-ref-guide/modules/indexing-guide/images/analysis-screen/analysis_compare_2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/analysis-screen/analysis_compare_2.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/analysis-screen/analysis_compare_2.pngdiff --git a/solr/solr-ref-guide/src/images/analysis-screen/analysis_compare_3.png b/solr/solr-ref-guide/modules/indexing-guide/images/analysis-screen/analysis_compare_3.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/analysis-screen/analysis_compare_3.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/analysis-screen/analysis_compare_3.pngdiff --git a/solr/solr-ref-guide/src/images/analysis-screen/analysis_compare_4.png b/solr/solr-ref-guide/modules/indexing-guide/images/analysis-screen/analysis_compare_4.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/analysis-screen/analysis_compare_4.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/analysis-screen/analysis_compare_4.pngdiff --git a/solr/solr-ref-guide/src/images/analysis-screen/analysis_normal.png b/solr/solr-ref-guide/modules/indexing-guide/images/analysis-screen/analysis_normal.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/analysis-screen/analysis_normal.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/analysis-screen/analysis_normal.pngdiff --git a/solr/solr-ref-guide/src/images/documents-screen/documents_add_screen.png b/solr/solr-ref-guide/modules/indexing-guide/images/documents-screen/documents_add_screen.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/documents-screen/documents_add_screen.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/documents-screen/documents_add_screen.pngdiff --git a/solr/solr-ref-guide/src/images/indexing-with-tika/sample-pdf-query.png b/solr/solr-ref-guide/modules/indexing-guide/images/indexing-with-tika/sample-pdf-query.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/indexing-with-tika/sample-pdf-query.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/indexing-with-tika/sample-pdf-query.pngdiff --git a/solr/solr-ref-guide/src/images/schema-browser-screen/schema_browser_terms.png b/solr/solr-ref-guide/modules/indexing-guide/images/schema-browser-screen/schema_browser_terms.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/schema-browser-screen/schema_browser_terms.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/schema-browser-screen/schema_browser_terms.pngdiff --git a/solr/solr-ref-guide/src/images/schema-designer/analyze-sample-docs.png b/solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/analyze-sample-docs.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/schema-designer/analyze-sample-docs.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/analyze-sample-docs.pngdiff --git a/solr/solr-ref-guide/src/images/schema-designer/field-filters.png b/solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/field-filters.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/schema-designer/field-filters.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/field-filters.pngdiff --git a/solr/solr-ref-guide/src/images/schema-designer/incompat-change.png b/solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/incompat-change.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/schema-designer/incompat-change.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/incompat-change.pngdiff --git a/solr/solr-ref-guide/src/images/schema-designer/new-schema.png b/solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/new-schema.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/schema-designer/new-schema.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/new-schema.pngdiff --git a/solr/solr-ref-guide/src/images/schema-designer/publish.png b/solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/publish.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/schema-designer/publish.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/publish.pngdiff --git a/solr/solr-ref-guide/src/images/schema-designer/query-tester.png b/solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/query-tester.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/schema-designer/query-tester.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/query-tester.pngdiff --git a/solr/solr-ref-guide/src/images/schema-designer/reload-schema.png b/solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/reload-schema.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/schema-designer/reload-schema.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/reload-schema.pngdiff --git a/solr/solr-ref-guide/src/images/schema-designer/schema-editor-fields.png b/solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/schema-editor-fields.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/schema-designer/schema-editor-fields.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/schema-editor-fields.pngdiff --git a/solr/solr-ref-guide/src/images/schema-designer/schema-editor-root.png b/solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/schema-editor-root.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/schema-designer/schema-editor-root.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/schema-editor-root.pngdiff --git a/solr/solr-ref-guide/src/images/schema-designer/schema-editor-update.png b/solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/schema-editor-update.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/schema-designer/schema-editor-update.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/schema-editor-update.pngdiff --git a/solr/solr-ref-guide/src/images/schema-designer/show-changes.png b/solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/show-changes.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/schema-designer/show-changes.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/show-changes.pngdiff --git a/solr/solr-ref-guide/src/images/schema-designer/text-analysis.png b/solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/text-analysis.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/schema-designer/text-analysis.pngrename to solr/solr-ref-guide/modules/indexing-guide/images/schema-designer/text-analysis.pngdiff --git a/solr/solr-ref-guide/modules/indexing-guide/indexing-nav.adoc b/solr/solr-ref-guide/modules/indexing-guide/indexing-nav.adocnew file mode 100644index 00000000000..a5fbe597ebd--- /dev/null+++ b/solr/solr-ref-guide/modules/indexing-guide/indexing-nav.adoc@@ -0,0 +1,45 @@+.Schema and Indexing Guide++* Solr Schema+** xref:schema-elements.adoc[]+** xref:schema-api.adoc[]+** xref:schemaless-mode.adoc[]+** xref:schema-designer.adoc[]+** xref:schema-browser-screen.adoc[]++* Fields & Schema Design+** xref:fields.adoc[]+** Field Types+*** xref:field-type-definitions-and-properties.adoc[]+*** xref:field-types-included-with-solr.adoc[]+*** xref:currencies-exchange-rates.adoc[]+*** xref:date-formatting-math.adoc[]+*** xref:enum-fields.adoc[]+*** xref:external-files-processes.adoc[]+*** xref:field-properties-by-use-case.adoc[]+** xref:copy-fields.adoc[]+** xref:dynamic-fields.adoc[]+** xref:docvalues.adoc[]+** xref:luke-request-handler.adoc[]++* xref:document-analysis.adoc[]+** xref:analyzers.adoc[]+** xref:tokenizers.adoc[]+** xref:filters.adoc[]+** xref:charfilterfactories.adoc[]+** xref:language-analysis.adoc[]+** xref:phonetic-matching.adoc[]+** xref:analysis-screen.adoc[]++* Indexing & Data Operations+** xref:indexing-with-update-handlers.adoc[]+*** xref:transforming-and-indexing-custom-json.adoc[]+** xref:indexing-with-tika.adoc[]+** xref:indexing-nested-documents.adoc[]+** xref:post-tool.adoc[]+** xref:documents-screen.adoc[]+** xref:partial-document-updates.adoc[]+** xref:reindexing.adoc[]+** xref:language-detection.adoc[]+** xref:de-duplication.adoc[]+** xref:content-streams.adoc[]diff --git a/solr/solr-ref-guide/src/analysis-screen.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/analysis-screen.adocsimilarity index 85%rename from solr/solr-ref-guide/src/analysis-screen.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/analysis-screen.adocindex 39dc213f042..2d78f2f17c6 100644--- a/solr/solr-ref-guide/src/analysis-screen.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/analysis-screen.adoc@@ -16,23 +16,23 @@// specific language governing permissions and limitations// under the License.-Once you've <<field-type-definitions-and-properties.adoc#,defined a field type in your Schema>>, and specified the analysis steps that you want applied to it, you should test it out to make sure that it behaves the way you expect it to.+Once you've xref:field-type-definitions-and-properties.adoc[defined a field type in your Schema], and specified the analysis steps that you want applied to it, you should test it out to make sure that it behaves the way you expect it to.-Luckily, there is a very handy page in the Solr <<solr-admin-ui.adoc#,admin interface>> that lets you do just that.+Luckily, there is a very handy page in the Solr Admin UI that lets you do just that.You can invoke the analyzer for any text field, provide sample input, and display the resulting token stream.For example, let's look at some of the "Text" field types available in the `bin/solr -e techproducts` example configuration, and use the Analysis Screen (`\http://localhost:8983/solr/#/techproducts/analysis`) to compare how the tokens produced at index time for the sentence "Running an Analyzer" match up with a slightly different query text of "run my analyzer".We can begin with `text_ws` - one of the most simplified Text field types available:-image::images/analysis-screen/analysis_normal.png[Normal Analysis]+image::analysis-screen/analysis_normal.png[Normal Analysis]This shows a simple output of only the tokens produced by each step of analysis (a single step in this case).The tokenizer is shown with an abbreviation, hover or click on this to see the full name.If we enable *Verbose Output* by checking the box, more details are shown:-image::images/analysis-screen/analysis_compare_0.png[Verbose Analysis]+image::analysis-screen/analysis_compare_0.png[Verbose Analysis]By looking at the start and end positions for each term, we can see that the only thing this field type does is tokenize text on whitespace.Notice in this image that the term "Running" has a start position of 0 and an end position of 7, while "an" has a start position of 8 and an end position of 10, and "Analyzer" starts at 11 and ends at 19.@@ -50,22 +50,22 @@ In particular we want:For our next attempt, let's try the `text_general` field type:-image::images/analysis-screen/analysis_compare_1.png[image]+image::analysis-screen/analysis_compare_1.png[image]With the verbose output enabled, we can see how each stage of our new analyzers modify the tokens they receive before passing them on to the next stage.As we scroll down to the final output, we can see that we do start to get a match on "analyzer" from each input string, thanks to the "LCF" stage, which if you hover over with your mouse, you'll see is the `LowerCaseFilter`:-image::images/analysis-screen/analysis_compare_2.png[image]+image::analysis-screen/analysis_compare_2.png[image]The `text_general` field type is designed to be generally useful for any language, and it has definitely gotten us closer to our objective than `text_ws` from our first example by solving the problem of case sensitivity.It's still not quite what we are looking for because we don't see stemming or stopword rules being applied.So now let us try the `text_en` field type:-image::images/analysis-screen/analysis_compare_3.png[image]+image::analysis-screen/analysis_compare_3.png[image]Now we can see the "SF" (`StopFilter`) stage of the analyzers solving the problem of removing Stop Words ("an"), and as we scroll down, we also see the "PSF" (`PorterStemFilter`) stage apply stemming rules suitable for our English language input, such that the terms produced by our "index analyzer" and the terms produced by our "query analyzer" match the way we expect.-image::images/analysis-screen/analysis_compare_4.png[image]+image::analysis-screen/analysis_compare_4.png[image]At this point, we can continue to experiment with additional inputs, verifying that our analyzers produce matching tokens when we expect them to match, and disparate tokens when we do not expect them to match, as we iterate and tweak our field type configuration.diff --git a/solr/solr-ref-guide/src/analyzers.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/analyzers.adocsimilarity index 99%rename from solr/solr-ref-guide/src/analyzers.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/analyzers.adocindex 8d5deee0709..280f9289ba3 100644--- a/solr/solr-ref-guide/src/analyzers.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/analyzers.adoc@@ -18,7 +18,7 @@An analyzer examines the text of fields and generates a token stream.-Analyzers are specified as a child of the `<fieldType>` element in <<solr-schema.adoc#,Solr's schema>>.+Analyzers are specified as a child of the `<fieldType>` element in xref:schema-elements.adoc[Solr's schema].In normal usage, only fields of type `solr.TextField` or `solr.SortableTextField` will specify an analyzer.The simplest way to configure an analyzer is with a single `<analyzer>` element whose class attribute is a fully qualified Java class name.diff --git a/solr/solr-ref-guide/src/charfilterfactories.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/charfilterfactories.adocsimilarity index 100%rename from solr/solr-ref-guide/src/charfilterfactories.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/charfilterfactories.adocdiff --git a/solr/solr-ref-guide/src/content-streams.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/content-streams.adocsimilarity index 93%rename from solr/solr-ref-guide/src/content-streams.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/content-streams.adocindex 9e87596efe4..55411b018d5 100644--- a/solr/solr-ref-guide/src/content-streams.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/content-streams.adoc@@ -55,7 +55,7 @@ In `solrconfig.xml`, you can enable it by changing the following `enableRemoteStWhen `enableRemoteStreaming` is not specified in `solrconfig.xml`, the default behavior is to _not_ allow remote streaming (i.e., `enableRemoteStreaming="false"`).-Remote streaming can also be enabled through the <<config-api.adoc#,Config API>> as follows:+Remote streaming can also be enabled through the xref:configuration-guide:config-api.adoc[] as follows:[.dynamic-tabs]--@@ -90,5 +90,5 @@ Gzip doesn't apply to `stream.body`.== Debugging Requests-The implicit "dump" RequestHandler (see <<implicit-requesthandlers.adoc#,Implicit Request Handlers>>) simply outputs the contents of the Solr QueryRequest using the specified writer type `wt`.+The implicit "dump" RequestHandler (see xref:configuration-guide:implicit-requesthandlers.adoc[]) simply outputs the contents of the Solr QueryRequest using the specified writer type `wt`.This is a useful tool to help understand what streams are available to the RequestHandlers.diff --git a/solr/solr-ref-guide/src/copy-fields.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/copy-fields.adocsimilarity index 94%rename from solr/solr-ref-guide/src/copy-fields.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/copy-fields.adocindex 8883d491d1a..93a130d4e2d 100644--- a/solr/solr-ref-guide/src/copy-fields.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/copy-fields.adoc@@ -28,7 +28,7 @@ In the schema file, it's very simple to make copies of fields:----In this example, we want Solr to copy the `cat` field to a field named `text`.-Fields are copied before <<document-analysis.adoc#,analysis>> is done, meaning you can have two fields with identical original content, but which use different analysis chains and are stored in the index differently.+Fields are copied before xref:document-analysis.adoc[analysis], meaning you can have two fields with identical original content, but which use different analysis chains and are stored in the index differently.In the example above, if the `text` destination field has data of its own in the input documents, the contents of the `cat` field will be added as additional values – just as if all of the values had originally been specified by the client.Remember to configure your fields as `multivalued="true"` if they will ultimately get multiple values (either from a multivalued source or from multiple `copyField` directives).diff --git a/solr/solr-ref-guide/src/currencies-exchange-rates.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/currencies-exchange-rates.adocsimilarity index 93%rename from solr/solr-ref-guide/src/currencies-exchange-rates.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/currencies-exchange-rates.adocindex 111acd5afc2..7d089ac9415 100644--- a/solr/solr-ref-guide/src/currencies-exchange-rates.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/currencies-exchange-rates.adoc@@ -35,7 +35,7 @@ The following features are supported:CurrencyField has been deprecated in favor of CurrencyFieldType; all configuration examples below use CurrencyFieldType.====-The `currency` field type is defined in the <<solr-schema.adoc#,schema>>.+The `currency` field type is defined in the xref:schema-elements.adoc[schema].This is the default configuration of this type.[source,xml]@@ -51,7 +51,7 @@ This is a file of exchange rates between our default currency to other currencieThere is an alternate implementation that would allow regular downloading of currency data.See <<Exchange Rates>> below for more.-Many of the example schemas that ship with Solr include a <<dynamic-fields.adoc#,dynamic field>> that uses this type, such as this example:+Many of the example schemas that ship with Solr include a xref:dynamic-fields.adoc[dynamic field] that uses this type, such as this example:[source,xml]----@@ -83,7 +83,7 @@ The currency code field will use the `"*_s_ns"` dynamic field, which must exist.Atomic Updates won't work if dynamic sub-fields are stored[NOTE]====-As noted in <<partial-document-updates.adoc#field-storage,Atomic Update Field Storage>>, stored dynamic sub-fields will cause indexing to fail when you use Atomic Updates.+As noted in xref:partial-document-updates.adoc#field-storage[Atomic Update Field Storage], stored dynamic sub-fields will cause indexing to fail when you use Atomic Updates.To avoid this problem, specify `stored="false"` on those dynamic fields.====diff --git a/solr/solr-ref-guide/src/date-formatting-math.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/date-formatting-math.adocsimilarity index 100%rename from solr/solr-ref-guide/src/date-formatting-math.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/date-formatting-math.adocdiff --git a/solr/solr-ref-guide/src/de-duplication.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/de-duplication.adocsimilarity index 91%rename from solr/solr-ref-guide/src/de-duplication.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/de-duplication.adocindex 183d22f8dd9..8d87504a869 100644--- a/solr/solr-ref-guide/src/de-duplication.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/de-duplication.adoc@@ -40,11 +40,11 @@ When a document is added, a signature will automatically be generated and attach== Configuration Options-There are two places in Solr to configure de-duplication: in `solrconfig.xml` and in the <<solr-schema.adoc#,schema>>.+There are two places in Solr to configure de-duplication: in `solrconfig.xml` and in the xref:schema-elements.adoc[schema].=== In solrconfig.xml-The `SignatureUpdateProcessorFactory` has to be registered in `solrconfig.xml` as part of an <<update-request-processors.adoc#,Update Request Processor Chain>>, as in this example:+The `SignatureUpdateProcessorFactory` has to be registered in `solrconfig.xml` as part of an xref:configuration-guide:update-request-processors.adoc[Update Request Processor Chain], as in this example:[source,xml]----@@ -125,7 +125,7 @@ There are 2 important things to keep in mind when using `SignatureUpdateProcesso. The `overwriteDupes=true` setting does not work _except_ in the special case of using the uniqueKey field as the `signatureField`.Attempting De-duplication on any other `signatureField` will not work correctly because of how updates are forwarded to replicas-. When using the uniqueKey field as the `signatureField`, `SignatureUpdateProcessorFactory` must be run prior to the `<<update-request-processors.adoc#update-processors-in-solrcloud,DistributedUpdateProcessor>>` to ensure that documents can be routed to the correct shard leader based on the (generated) uniqueKey field.+. When using the uniqueKey field as the `signatureField`, `SignatureUpdateProcessorFactory` must be run prior to the xref:configuration-guide:update-request-processors.adoc#update-processors-in-solrcloud[`DistributedUpdateProcessor`] to ensure that documents can be routed to the correct shard leader based on the (generated) uniqueKey field.(Using any other `signatureField` with `overwriteDupes=false` -- to generate a Signature for each document with out De-duplication -- has no limitations.)====diff --git a/solr/solr-ref-guide/src/document-analysis.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/document-analysis.adocsimilarity index 74%rename from solr/solr-ref-guide/src/document-analysis.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/document-analysis.adocindex e24ccaaa507..5b56449c4d3 100644--- a/solr/solr-ref-guide/src/document-analysis.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/document-analysis.adoc@@ -1,11 +1,4 @@= Document Analysis in Solr-:page-children: analyzers, \- tokenizers, \- filters, \- charfilterfactories, \- language-analysis, \- phonetic-matching, \- analysis-screen// 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@@ -26,11 +19,11 @@The following sections describe how Solr breaks down and works with textual data.There are three main concepts to understand: analyzers, tokenizers, and filters.-* <<analyzers.adoc#,Field analyzers>> are used both during ingestion, when a document is indexed, and at query time.+* xref:analyzers.adoc[Field analyzers] are used both during ingestion, when a document is indexed, and at query time.An analyzer examines the text of fields and generates a token stream.Analyzers may be a single class or they may be composed of a series of tokenizer and filter classes.-* <<tokenizers.adoc#,Tokenizers>> break field data into lexical units, or _tokens_.-* <<filters.adoc#,Filters>> examine a stream of tokens and keep them, transform or discard them, or create new ones.+* xref:tokenizers.adoc[] break field data into lexical units, or _tokens_.+* xref:filters.adoc[] examine a stream of tokens and keep them, transform or discard them, or create new ones.Tokenizers and filters may be combined to form pipelines, or _chains_, where the output of one is input to the next.Such a sequence of tokenizers and filters is called an _analyzer_ and the resulting output of an analyzer is used to match query results or build indices.@@ -54,12 +47,12 @@ It also serves as a guide so that you can configure your own analysis classes if// tag::analysis-sections[][cols="1,1",frame=none,grid=none,stripes=none]|===-| <<analyzers.adoc#,Analyzers>>: Overview of Solr analyzers.-| <<tokenizers.adoc#,Tokenizers>>: Tokenizers and tokenizer factory classes.-| <<filters.adoc#,Filters>>: Filters and filter factory classes.-| <<charfilterfactories.adoc#,CharFilterFactories>>: Filters for pre-processing input characters.-| <<language-analysis.adoc#,Language Analysis>>: Tokenizers and filters for character set conversion and specific languages.-| <<analysis-screen.adoc#,Analysis Screen>>: Admin UI for testing field analysis.+| xref:analyzers.adoc[]: Overview of Solr analyzers.+| xref:tokenizers.adoc[]: Tokenizers and tokenizer factory classes.+| xref:filters.adoc[]: Filters and filter factory classes.+| xref:charfilterfactories.adoc[]: Filters for pre-processing input characters.+| xref:language-analysis.adoc[]: Tokenizers and filters for character set conversion and specific languages.+| xref:analysis-screen.adoc[]: Admin UI for testing field analysis.|===// end::analysis-sections[]****diff --git a/solr/solr-ref-guide/src/documents-screen.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/documents-screen.adocsimilarity index 89%rename from solr/solr-ref-guide/src/documents-screen.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/documents-screen.adocindex fa527e14bc7..df17fbf7371 100644--- a/solr/solr-ref-guide/src/documents-screen.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/documents-screen.adoc@@ -19,7 +19,7 @@The Documents screen provides a simple form allowing you to execute various Solr indexing commands in a variety of formats directly from the browser..The Documents Screen-image::images/documents-screen/documents_add_screen.png[image,height=400]+image::documents-screen/documents_add_screen.png[image,height=400]The screen allows you to:@@ -31,8 +31,8 @@ The screen allows you to:====There are other ways to load data, see also these sections:-* <<indexing-with-update-handlers.adoc#,Indexing with Update Handlers>>-* <<indexing-with-tika.adoc#,Indexing with Solr Cell and Apache Tika>>+* xref:indexing-with-update-handlers.adoc[]+* xref:indexing-with-tika.adoc[]====== Common Fields@@ -44,7 +44,7 @@ The remaining parameters may change depending on the document type selected.* Document(s): Enter a properly-formatted Solr document corresponding to the `Document Type` selected.XML and JSON documents must be formatted in a Solr-specific format, a small illustrative document will be shown.CSV files should have headers corresponding to fields defined in the schema.-More details can be found at: <<indexing-with-update-handlers.adoc#,Indexing with Update Handlers>>.+More details can be found in xref:indexing-with-update-handlers.adoc[].* Commit Within: Specify the number of milliseconds between the time the document is submitted and when it is available for searching.* Overwrite: If `true` the new document will replace an existing document with the same value in the `id` field.If `false` multiple documents with the same id can be added.@@ -74,7 +74,7 @@ If using `/update` for the Request-Handler option, you will be limited to XML, COther document types (e.g., Word, PDF, etc.) can be indexed using the ExtractingRequestHandler (aka, Solr Cell).You must modify the RequestHandler to `/update/extract`, which must be defined in your `solrconfig.xml` file with your desired defaults.You should also add `&literal.id` shown in the "Extracting Request Handler Params" field so the file chosen is given a unique id.-More information can be found at: <<indexing-with-tika.adoc#,Indexing with Solr Cell and Apache Tika>>.+More information can be found in xref:indexing-with-tika.adoc[].== Solr Commanddiff --git a/solr/solr-ref-guide/src/docvalues.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/docvalues.adocsimilarity index 87%rename from solr/solr-ref-guide/src/docvalues.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/docvalues.adocindex 8a7be90294a..e56b6beb345 100644--- a/solr/solr-ref-guide/src/docvalues.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/docvalues.adoc@@ -36,9 +36,9 @@ This approach promises to relieve some of the memory requirements of the fieldCaTo use docValues, you only need to enable it for a field that you will use it with.As with all schema design, you need to define a field type and then define fields of that type with docValues enabled.-All of these actions are done in the <<solr-schema.adoc#,schema>>.+All of these actions are done in the xref:schema-elements.adoc[schema].-Enabling a field for docValues only requires adding `docValues="true"` to the field (or field type) definition, as in this example from Solr's `sample_techproducts_configs` <<config-sets.adoc#,configset>>:+Enabling a field for docValues only requires adding `docValues="true"` to the field (or field type) definition, as in this example from Solr's `sample_techproducts_configs` xref:configuration-guide:config-sets.adoc[configset]:[source,xml]----@@ -71,7 +71,7 @@ Entries are kept in sorted order and duplicates are removed.These Lucene types are related to how the {lucene-javadocs}/core/org/apache/lucene/index/DocValuesType.html[values are sorted and stored].-There is an additional configuration option available, which is to modify the `docValuesFormat` <<field-type-definitions-and-properties.adoc#docvaluesformat,used by the field type>>.+There is an additional configuration option available, which is to modify the xref:field-type-definitions-and-properties.adoc#docvaluesformat[`docValuesFormat`] used by the field type.The default implementation employs a mixture of loading some things into memory and keeping some on disk.In some cases, however, you may choose to specify an alternative {lucene-javadocs}/core/org/apache/lucene/codecs/DocValuesFormat.html[DocValuesFormat implementation].For example, you could choose to keep everything in memory by specifying `docValuesFormat="Direct"` on a field type:@@ -91,16 +91,16 @@ If you choose to customize the `docValuesFormat` in your schema, upgrading to a=== Sorting, Faceting & Functions-If `docValues="true"` for a field, then DocValues will automatically be used any time the field is used for <<common-query-parameters.adoc#sort-parameter,sorting>>, <<faceting.adoc#,faceting>> or <<function-queries.adoc#,function queries>>.+If `docValues="true"` for a field, then DocValues will automatically be used any time the field is used for xref:query-guide:common-query-parameters.adoc#sort-parameter[sorting], xref:query-guide:faceting.adoc[faceting], or xref:query-guide:function-queries.adoc[function queries].=== Retrieving DocValues During SearchField values retrieved during search queries are typically returned from stored values.However, non-stored docValues fields will be also returned along with other stored fields when all fields (or pattern matching globs) are specified to be returned (e.g., "`fl=*`") for search queries depending on the effective value of the `useDocValuesAsStored` parameter for each field.For schema versions >= 1.6, the implicit default is `useDocValuesAsStored="true"`.-See <<field-type-definitions-and-properties.adoc#,Field Type Definitions and Properties>> & <<fields.adoc#,Fields>> for more details.+See xref:field-type-definitions-and-properties.adoc[] and xref:fields.adoc[] for more details.-When `useDocValuesAsStored="false"`, non-stored DocValues fields can still be explicitly requested by name in the <<common-query-parameters.adoc#fl-field-list-parameter,`fl` parameter>>, but will not match glob patterns (`"*"`).+When `useDocValuesAsStored="false"`, non-stored DocValues fields can still be explicitly requested by name in the xref:query-guide:common-query-parameters.adoc#fl-field-list-parameter[`fl` parameter], but will not match glob patterns (`"*"`).Returning DocValues along with "regular" stored fields at query time has performance implications that stored fields may not because DocValues are column-oriented and may therefore incur additional cost to retrieve for each returned document.@@ -109,7 +109,7 @@ If you require the multi-valued fields to be returned in the original insertionIn cases where the query is returning _only_ docValues fields performance may improve since returning stored fields requires disk reads and decompression whereas returning docValues fields in the fl list only requires memory access.-When retrieving fields from their docValues form (such as when using the <<exporting-result-sets.adoc#,/export handler>>, <<streaming-expressions.adoc#,streaming expressions>> or if the field is requested in the `fl` parameter), two important differences between regular stored fields and docValues fields must be understood:+When retrieving fields from their docValues form (such as when using the xref:query-guide:exporting-result-sets.adoc[/export handler], xref:query-guide:streaming-expressions.adoc[streaming expressions], or if the field is requested in the `fl` parameter), two important differences between regular stored fields and docValues fields must be understood:. Order is _not_ preserved.When retrieving stored fields, the insertion order is the return order.diff --git a/solr/solr-ref-guide/src/dynamic-fields.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/dynamic-fields.adocsimilarity index 100%rename from solr/solr-ref-guide/src/dynamic-fields.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/dynamic-fields.adocdiff --git a/solr/solr-ref-guide/src/enum-fields.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/enum-fields.adocsimilarity index 100%rename from solr/solr-ref-guide/src/enum-fields.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/enum-fields.adocdiff --git a/solr/solr-ref-guide/src/external-files-processes.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/external-files-processes.adocsimilarity index 97%rename from solr/solr-ref-guide/src/external-files-processes.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/external-files-processes.adocindex 81175c3631e..7d4ade277f1 100644--- a/solr/solr-ref-guide/src/external-files-processes.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/external-files-processes.adoc@@ -29,7 +29,7 @@ Another way to think of this is that, instead of specifying the field in documen====External fields are not searchable.They can be used only for function queries or display.-For more information on function queries, see the section on <<function-queries.adoc#,Function Queries>>.+For more information on function queries, see the section on xref:query-guide:function-queries.adoc[].====The `ExternalFileField` type is handy for cases where you want to update a particular field in many documents more often than you want to update the rest of the documents.@@ -38,7 +38,7 @@ You might want to update the rank of all the documents daily or hourly, while thWithout `ExternalFileField`, you would need to update each document just to change the rank.Using `ExternalFileField` is much more efficient because all document values for a particular field are stored in an external file that can be updated as frequently as you wish.-In the <<solr-schema.adoc#,schema>>, the definition of this field type might look like this:+In the xref:schema-elements.adoc[schema], the definition of this field type might look like this:[source,xml]----@@ -77,7 +77,7 @@ The file does not need to be sorted, but Solr will be able to perform the lookup=== Reloading an External FileIt's possible to define an event listener to reload an external file when either a searcher is reloaded or when a new searcher is started.-See the section <<caches-warming.adoc#query-related-listeners,Query-Related Listeners>> for more information, but a sample definition in `solrconfig.xml` might look like this:+See the section xref:configuration-guide:caches-warming.adoc#query-related-listeners[Query-Related Listeners] for more information, but a sample definition in `solrconfig.xml` might look like this:[source,xml]----diff --git a/solr/solr-ref-guide/src/field-properties-by-use-case.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/field-properties-by-use-case.adocsimilarity index 90%rename from solr/solr-ref-guide/src/field-properties-by-use-case.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/field-properties-by-use-case.adocindex 3b84c6b60df..e39169f7054 100644--- a/solr/solr-ref-guide/src/field-properties-by-use-case.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/field-properties-by-use-case.adoc@@ -44,13 +44,13 @@ Notes:2. [[fpbuc_2,2]] Will be used if present, but not necessary.3. [[fpbuc_3,3]] (if termVectors=true)4. [[fpbuc_4,4]] A tokenizer must be defined for the field, but it doesn't need to be indexed.-5. [[fpbuc_5,5]] Described in <<document-analysis.adoc#,Document Analysis in Solr>>.+5. [[fpbuc_5,5]] Described in xref:document-analysis.adoc[].6. [[fpbuc_6,6]] Term vectors are not mandatory here.If not true, then a stored field is analyzed.So term vectors are recommended, but only required if `stored=false`.7. [[fpbuc_7,7]] For most field types, either `indexed` or `docValues` must be true, but both are not required.-<<docvalues.adoc#,DocValues>> can be more efficient in many cases.+xref:docvalues.adoc[] can be more efficient in many cases.For `[Int/Long/Float/Double/Date]PointFields`, `docValues=true` is required.8. [[fpbuc_8,8]] Stored content will be used by default, but docValues can alternatively be used.-See <<docvalues.adoc#,DocValues>>.-9. [[fpbuc_9,9]] Multi-valued sorting may be performed on docValues-enabled fields using the two-argument `field()` function, e.g., `field(myfield,min)`; see the <<function-queries.adoc#field-function,field() function in Function Queries>>.+See xref:docvalues.adoc[].+9. [[fpbuc_9,9]] Multi-valued sorting may be performed on docValues-enabled fields using the two-argument `field()` function, e.g., `field(myfield,min)`; see the xref:query-guide:function-queries.adoc#field-function[field() function in Function Queries].diff --git a/solr/solr-ref-guide/src/field-type-definitions-and-properties.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/field-type-definitions-and-properties.adocsimilarity index 90%rename from solr/solr-ref-guide/src/field-type-definitions-and-properties.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/field-type-definitions-and-properties.adocindex 7327b20ff87..e415023984e 100644--- a/solr/solr-ref-guide/src/field-type-definitions-and-properties.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/field-type-definitions-and-properties.adoc@@ -27,7 +27,7 @@ A field type definition can include four types of information:== Field Type Definitions in the Schema-Field types are defined in the collection's <<solr-schema.adoc#,schema>>.+Field types are defined in the collection's xref:schema-elements.adoc[schema].Each field type is defined between `fieldType` elements.They can optionally be grouped within a `types` element.@@ -54,7 +54,7 @@ Here is an example of a field type definition for a type called `text_general`:----<1> The first line in the example above contains the field type name, `text_general`, and the name of the implementing class, `solr.TextField`.-<2> The rest of the definition is about field analysis, described in <<document-analysis.adoc#,Document Analysis in Solr>>.+<2> The rest of the definition is about field analysis, described in xref:document-analysis.adoc[].The implementing class is responsible for making sure the field is handled correctly.In the class names, the string `solr` is shorthand for `org.apache.solr.schema` or `org.apache.solr.analysis`.@@ -151,10 +151,10 @@ This blog post http://opensourceconnections.com/blog/2017/11/21/solr-synonyms-me|Optional |Default: `true`|===+-For text fields, applicable when querying with <<standard-query-parser.adoc#standard-query-parser-parameters,`sow=false`>> (which is the default for the `sow` parameter).-Use `true` for field types with query analyzers including graph-aware filters, e.g., <<filters.adoc#synonym-graph-filter,Synonym Graph Filter>> and <<filters.adoc#word-delimiter-graph-filter,Word Delimiter Graph Filter>>.+For text fields, applicable when querying with xref:query-guide:standard-query-parser.adoc#standard-query-parser-parameters[`sow=false`] (the default).+Use `true` for field types with query analyzers including graph-aware filters, e.g., xref:filters.adoc#synonym-graph-filter[Synonym Graph Filter] and xref:filters.adoc#word-delimiter-graph-filter[Word Delimiter Graph Filter].+-Use `false` for field types with query analyzers including filters that can match docs when some tokens are missing, e.g., <<filters.adoc#shingle-filter,Shingle Filter>>.+Use `false` for field types with query analyzers including filters that can match docs when some tokens are missing, e.g., xref:filters.adoc#shingle-filter[Shingle Filter].[[docvaluesformat]]`docValuesFormat`::@@ -197,16 +197,16 @@ The table below includes the default value for most `FieldType` implementations|Property |Description |Implicit Default|`indexed` |If `true`, the value of the field can be used in queries to retrieve matching documents. |`true`|`stored` |If `true`, the actual value of the field can be retrieved by queries. |`true`-|`docValues` |If `true`, the value of the field will be put in a column-oriented <<docvalues.adoc#,DocValues>> structure. |`false`+|`docValues` |If `true`, the value of the field will be put in a column-oriented xref:docvalues.adoc[] structure. |`false`|`sortMissingFirst`, `sortMissingLast` |Control the placement of documents when a sort field is not present. |`false`|`multiValued` |If `true`, indicates that a single document might contain multiple values for this field type. |`false`-|`uninvertible` |If `true`, indicates that an `indexed="true" docValues="false"` field can be "un-inverted" at query time to build up large in memory data structure to serve in place of <<docvalues.adoc#,DocValues>>. *Defaults to `true` for historical reasons, but users are strongly encouraged to set this to `false` for stability and use `docValues="true"` as needed.* |`true`+|`uninvertible` |If `true`, indicates that an `indexed="true" docValues="false"` field can be "un-inverted" at query time to build up large in memory data structure to serve in place of xref:docvalues.adoc[]. *Defaults to `true` for historical reasons, but users are strongly encouraged to set this to `false` for stability and use `docValues="true"` as needed.* |`true`|`omitNorms` |If `true`, omits the norms associated with this field (this disables length normalization for the field, and saves some memory). *Defaults to true for all primitive (non-analyzed) field types, such as int, float, data, bool, and string.* Only full-text fields or fields need norms. |*|`omitTermFreqAndPositions` |If `true`, omits term frequency, positions, and payloads from postings for this field. This can be a performance boost for fields that don't require that information. It also reduces the storage space required for the index. Queries that rely on position that are issued on a field with this option will silently fail to find documents. *This property defaults to true for all field types that are not text fields.* |*|`omitPositions` |Similar to `omitTermFreqAndPositions` but preserves term frequency information. |*|`termVectors`, `termPositions`, `termOffsets`, `termPayloads` |These options instruct Solr to maintain full term vectors for each document, optionally including position, offset, and payload information for each term occurrence in those vectors. These can be used to accelerate highlighting and other ancillary functionality, but impose a substantial cost in terms of index size. They are not necessary for typical uses of Solr. |`false`|`required` |Instructs Solr to reject any attempts to add a document which does not have a value for this field. This property defaults to false. |`false`-|`useDocValuesAsStored` |If the field has <<docvalues.adoc#,docValues>> enabled, setting this to true would allow the field to be returned as if it were a stored field (even if it has `stored=false`) when matching "`*`" in an <<common-query-parameters.adoc#fl-field-list-parameter,fl parameter>>. |`true`+|`useDocValuesAsStored` |If the field has xref:docvalues.adoc[] enabled, setting this to true would allow the field to be returned as if it were a stored field (even if it has `stored=false`) when matching "`*`" in an xref:query-guide:common-query-parameters.adoc#fl-field-list-parameter[fl parameter]. |`true`|`large` |Large fields are always lazy loaded and will only take up space in the document cache if the actual value is < 512KB. This option requires `stored="true"` and `multiValued="false"`. It's intended for fields that might have very large values so that they don't get cached in memory. |`false`|===@@ -216,7 +216,7 @@ The table below includes the default value for most `FieldType` implementationsFor general numeric needs, consider using one of the `IntPointField`, `LongPointField`, `FloatPointField`, or `DoublePointField` classes, depending on the specific values you expect.These "Dimensional Point" based numeric classes use specially encoded data structures to support efficient range queries regardless of the size of the ranges used.-Enable <<docvalues.adoc#,DocValues>> on these fields as needed for sorting and/or faceting.+Enable xref:docvalues.adoc[] on these fields as needed for sorting and/or faceting.Some Solr features may not yet work with "Dimensional Points", in which case you may want to consider the equivalent `TrieIntField`, `TrieLongField`, `TrieFloatField`, and `TrieDoubleField` classes.These field types are deprecated and are likely to be removed in a future major Solr release, but they can still be used if necessary.@@ -255,4 +255,4 @@ Finally, for faceting, use the primary author only via a `StrField`:A field type may optionally specify a `<similarity/>` that will be used when scoring documents that refer to fields with this type, as long as the "global" similarity for the collection allows it.By default, any field type which does not define a similarity, uses `BM25Similarity`.-For more details, and examples of configuring both global & per-type Similarities, please see <<schema-elements.adoc#similarity,Schema Elements>>.+For more details, and examples of configuring both global & per-type similarities, please see xref:schema-elements.adoc#similarity[Similarity].diff --git a/solr/solr-ref-guide/src/field-types-included-with-solr.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/field-types-included-with-solr.adocsimilarity index 75%rename from solr/solr-ref-guide/src/field-types-included-with-solr.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/field-types-included-with-solr.adocindex 6c1463179b5..c5d429a572f 100644--- a/solr/solr-ref-guide/src/field-types-included-with-solr.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/field-types-included-with-solr.adoc@@ -25,63 +25,63 @@ The {solr-javadocs}/core/org/apache/solr/schema/package-summary.html[`org.apache[%autowidth.stretch,options="header"]|===|Class |Description-|BBoxField | Indexes a single rectangle (bounding box) per document field and supports searching via a bounding box. See the section <<spatial-search.adoc#,Spatial Search>> for more information.+|BBoxField | Indexes a single rectangle (bounding box) per document field and supports searching via a bounding box. See the section xref:query-guide:spatial-search.adoc[] for more information.|BinaryField |Binary data.|BoolField |Contains either true or false. Values of `1`, `t`, or `T` in the first character are interpreted as `true`. Any other values in the first character are interpreted as `false`.-|CollationField |Supports Unicode collation for sorting and range queries. The ICUCollationField is a better choice if you can use ICU4J. See the section <<language-analysis.adoc#unicode-collation,Unicode Collation>> for more information.+|CollationField |Supports Unicode collation for sorting and range queries. The ICUCollationField is a better choice if you can use ICU4J. See the section xref:language-analysis.adoc#unicode-collation[Unicode Collation] for more information.-|CurrencyFieldType |Supports currencies and exchange rates. See the section <<currencies-exchange-rates.adoc#,Currencies and Exchange Rates>> for more information.+|CurrencyFieldType |Supports currencies and exchange rates. See the section xref:currencies-exchange-rates.adoc[] for more information.-|DateRangeField |Supports indexing date ranges, to include point in time date instances as well (single-millisecond durations). See the section <<date-formatting-math.adoc#,Date Formatting and Date Math>> for more detail on using this field type. Consider using this field type even if it's just for date instances, particularly when the queries typically fall on UTC year/month/day/hour, etc., boundaries.+|DateRangeField |Supports indexing date ranges, to include point in time date instances as well (single-millisecond durations). See the section xref:date-formatting-math.adoc[] for more detail on using this field type. Consider using this field type even if it's just for date instances, particularly when the queries typically fall on UTC year/month/day/hour, etc., boundaries.-|DenseVectorField |Supports indexing dense vectors of float values. See the section <<dense-vector-search.adoc#,Dense Vector Search>> for more information.+|DenseVectorField |Supports indexing dense vectors of float values. See the section xref:query-guide:dense-vector-search.adoc[] for more information.-|DatePointField |Date field. Represents a point in time with millisecond precision, encoded using a "Dimensional Points" based data structure that allows for very efficient searches for specific values, or ranges of values. See the section <<date-formatting-math.adoc#,Working with Dates>> for more details on the supported syntax. For single valued fields, `docValues="true"` must be used to enable sorting.+|DatePointField |Date field. Represents a point in time with millisecond precision, encoded using a "Dimensional Points" based data structure that allows for very efficient searches for specific values, or ranges of values. See the section xref:date-formatting-math.adoc[] for more details on the supported syntax. For single valued fields, `docValues="true"` must be used to enable sorting.|DoublePointField |Double field (64-bit IEEE floating point). This class encodes double values using a "Dimensional Points" based data structure that allows for very efficient searches for specific values, or ranges of values. For single valued fields, `docValues="true"` must be used to enable sorting.-|ExternalFileField |Pulls values from a file on disk. See the section <<external-files-processes.adoc#,External Files and Processes>> for more information.+|ExternalFileField |Pulls values from a file on disk. See the section xref:external-files-processes.adoc[] for more information.-|EnumFieldType |Allows defining an enumerated set of values which may not be easily sorted by either alphabetic or numeric order (such as a list of severities, for example). This field type takes a configuration file, which lists the proper order of the field values. See the section <<enum-fields.adoc#,Enum Fields>> for more information.+|EnumFieldType |Allows defining an enumerated set of values which may not be easily sorted by either alphabetic or numeric order (such as a list of severities, for example). This field type takes a configuration file, which lists the proper order of the field values. See the section xref:enum-fields.adoc[] for more information.|FloatPointField |Floating point field (32-bit IEEE floating point). This class encodes float values using a "Dimensional Points" based data structure that allows for very efficient searches for specific values, or ranges of values. For single valued fields, `docValues="true"` must be used to enable sorting.-|ICUCollationField |Supports Unicode collation for sorting and range queries. See the section <<language-analysis.adoc#unicode-collation,Unicode Collation>> for more information.+|ICUCollationField |Supports Unicode collation for sorting and range queries. See the section xref:language-analysis.adoc#unicode-collation[Unicode Collation] for more information.|IntPointField |Integer field (32-bit signed integer). This class encodes int values using a "Dimensional Points" based data structure that allows for very efficient searches for specific values, or ranges of values. For single valued fields, `docValues="true"` must be used to enable sorting.-|LatLonPointSpatialField |A latitude/longitude coordinate pair; possibly multi-valued for multiple points. Usually it's specified as "lat,lon" order with a comma. See the section <<spatial-search.adoc#,Spatial Search>> for more information.+|LatLonPointSpatialField |A latitude/longitude coordinate pair; possibly multi-valued for multiple points. Usually it's specified as "lat,lon" order with a comma. See the section xref:query-guide:spatial-search.adoc[] for more information.|LongPointField |Long field (64-bit signed integer). This class encodes foo values using a "Dimensional Points" based data structure that allows for very efficient searches for specific values, or ranges of values. For single valued fields, `docValues="true"` must be used to enable sorting.-|NestPathField | Specialized field type storing ehanced information, when <<indexing-nested-documents.adoc#schema-configuration,working with nested documents>>.+|NestPathField | Specialized field type storing ehanced information, when xref:indexing-nested-documents.adoc#schema-configuration[working with nested documents].-|PointType |A single-valued n-dimensional point. It's both for sorting spatial data that is _not_ lat-lon, and for some more rare use-cases. (NOTE: this is _not_ related to the "Point" based numeric fields). See <<spatial-search.adoc#,Spatial Search>> for more information.+|PointType |A single-valued n-dimensional point. It's both for sorting spatial data that is _not_ lat-lon, and for some more rare use-cases. (NOTE: this is _not_ related to the "Point" based numeric fields). See xref:query-guide:spatial-search.adoc[] for more information.|PreAnalyzedField |Provides a way to send to Solr serialized token streams, optionally with independent stored values of a field, and have this information stored and indexed without any additional text processing.-Configuration and usage of PreAnalyzedField is documented in the section <<external-files-processes.adoc#the-preanalyzedfield-type,The PreAnalyzedField Type>>.+Configuration and usage of PreAnalyzedField is documented in the section xref:external-files-processes.adoc#the-preanalyzedfield-type[PreAnalyzedField Type].|RandomSortField |Does not contain a value. Queries that sort on this field type will return results in random order. Use a dynamic field to use this feature.-|RankField |Can be used to store scoring factors to improve document ranking. To be used in combination with <<other-parsers.adoc#ranking-query-parser,RankQParserPlugin>>+|RankField |Can be used to store scoring factors to improve document ranking. To be used in combination with xref:query-guide:other-parsers.adoc#ranking-query-parser[RankQParserPlugin].-|RptWithGeometrySpatialField |A derivative of `SpatialRecursivePrefixTreeFieldType` that also stores the original geometry. See <<spatial-search.adoc#,Spatial Search>> for more information and usage with geospatial results transformer.+|RptWithGeometrySpatialField |A derivative of `SpatialRecursivePrefixTreeFieldType` that also stores the original geometry. See xref:query-guide:spatial-search.adoc[] for more information and usage with geospatial results transformer.-|SortableTextField |A specialized version of TextField that allows (and defaults to) `docValues="true"` for sorting on the first 1024 characters of the original string prior to analysis. The number of characters used for sorting can be overridden with the `maxCharsForDocValues` attribute. See <<common-query-parameters.adoc#sort-parameter,sort parameter discussion>> for details.+|SortableTextField |A specialized version of TextField that allows (and defaults to) `docValues="true"` for sorting on the first 1024 characters of the original string prior to analysis. The number of characters used for sorting can be overridden with the `maxCharsForDocValues` attribute. See xref:query-guide:common-query-parameters.adoc#sort-parameter[sort parameter discussion] for details.-|SpatialRecursivePrefixTreeFieldType |(RPT for short) Accepts latitude comma longitude strings or other shapes in WKT format. See <<spatial-search.adoc#,Spatial Search>> for more information.+|SpatialRecursivePrefixTreeFieldType |(RPT for short) Accepts latitude comma longitude strings or other shapes in WKT format. See xref:query-guide:spatial-search.adoc[] for more information.|StrField |String (UTF-8 encoded string or Unicode). Strings are intended for small fields and are _not_ tokenized or analyzed in any way. They have a hard limit of slightly less than 32K.-|TextField |Text, usually multiple words or tokens. In normal usage, only fields of type TextField or SortableTextField will specify an <<analyzers.adoc#,analyzer>>.+|TextField |Text, usually multiple words or tokens. In normal usage, only fields of type TextField or SortableTextField will specify an xref:analyzers.adoc[analyzer].|UUIDField |Universally Unique Identifier (UUID). Pass in a value of `NEW` and Solr will create a new UUID.-*Note*: configuring a UUIDField instance with a default value of `NEW` is not advisable for most users when using SolrCloud (and not possible if the UUID value is configured as the unique key field) since the result will be that each replica of each document will get a unique UUID value. Using <<update-request-processors.adoc#,UUIDUpdateProcessorFactory>> to generate UUID values when documents are added is recommended instead.+*Note*: configuring a UUIDField instance with a default value of `NEW` is not advisable for most users when using SolrCloud (and not possible if the UUID value is configured as the unique key field) since the result will be that each replica of each document will get a unique UUID value. Using xref:configuration-guide:update-request-processors.adoc[UUIDUpdateProcessorFactory] to generate UUID values when documents are added is recommended instead.|===== Deprecated Field Typesdiff --git a/solr/solr-ref-guide/src/fields.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/fields.adocsimilarity index 92%rename from solr/solr-ref-guide/src/fields.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/fields.adocindex ce21946dfe6..064a3d2857a 100644--- a/solr/solr-ref-guide/src/fields.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/fields.adoc@@ -16,7 +16,7 @@// specific language governing permissions and limitations// under the License.-Fields are defined in the fields element of a <<solr-schema.adoc#,schema>>.+Fields are defined in the fields element of a xref:schema-elements.adoc[schema].Once you have the field types set up, defining the fields themselves is simple.== Example Field Definition@@ -69,7 +69,7 @@ If this property is not specified, there is no default.Fields can have many of the same properties as field types.Properties from the table below which are specified on an individual field will override any explicit value for that property specified on the `fieldType` of the field, or any implicit default property value provided by the underlying `fieldType` implementation.-The table below is reproduced from <<field-type-definitions-and-properties.adoc#,Field Type Definitions and Properties>>, which has more details:+The table below is reproduced from xref:field-type-definitions-and-properties.adoc[], which has more details:--include::field-type-definitions-and-properties.adoc[tag=field-params]diff --git a/solr/solr-ref-guide/src/filters.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/filters.adocsimilarity index 96%rename from solr/solr-ref-guide/src/filters.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/filters.adocindex 454900e71bf..0a6214a97e3 100644--- a/solr/solr-ref-guide/src/filters.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/filters.adoc@@ -20,7 +20,7 @@ Filters examine a stream of tokens and keep them, transform them, or discard the== About Filters-Like <<tokenizers.adoc#,tokenizers>>, filters consume input and produce a stream of tokens.+Like xref:tokenizers.adoc[tokenizers], filters consume input and produce a stream of tokens.Filters also derive from `org.apache.lucene.analysis.TokenStream` but unlike tokenizers, a filter's input is another TokenStream.The job of a filter is usually easier than that of a tokenizer since in most cases a filter looks at each token in the stream sequentially and decides whether to pass it along, replace it, or discard it.@@ -90,7 +90,7 @@ Solr includes several language-specific stemmers created by the http://snowball.The generic <<Snowball Porter Stemmer Filter>> can be used to configure any of these language stemmers.Solr also includes a convenience wrapper for the English Snowball stemmer.There are also several purpose-built stemmers for non-English languages.-These stemmers are described in <<language-analysis.adoc#,Language Analysis>>.+These stemmers are described in xref:language-analysis.adoc[].=== Filters with Arguments@@ -199,7 +199,7 @@ If `true`, the original token is preserved: "thé" -> "the", "thé"== Beider-Morse FilterImplements the Beider-Morse Phonetic Matching (BMPM) algorithm, which allows identification of similar names, even if they are spelled differently or in different languages.-More information about how this works is available in the section on <<phonetic-matching.adoc#beider-morse-phonetic-matching-bmpm,Phonetic Matching>>.+More information about how this works is available in the section xref:phonetic-matching.adoc#beider-morse-phonetic-matching-bmpm[Beider-Morse Phonetic Matching].[IMPORTANT]====@@ -284,7 +284,7 @@ The value `auto` will allow the filter to identify the language, or a comma-sepa== Classic Filter-This filter takes the output of the <<tokenizers.adoc#classic-tokenizer,Classic Tokenizer>> and strips periods from acronyms and "'s" from possessives.+This filter takes the output of the xref:tokenizers.adoc#classic-tokenizer[Classic Tokenizer] and strips periods from acronyms and "'s" from possessives.*Factory class:* `solr.ClassicFilterFactory`@@ -328,9 +328,9 @@ This filter takes the output of the <<tokenizers.adoc#classic-tokenizer,ClassicThis filter for use in `index` time analysis creates word shingles by combining common tokens such as stop words with regular tokens.This can result in an index with more unique terms, but is useful for creating phrase queries containing common words, such as "the cat", in a way that will typically be much faster then if the combined tokens are not used, because only the term positions of documents containg both terms in sequence have to be considered.-Correct usage requires being paired with <<#common-grams-query-filter,Common Grams Query Filter>> during `query` analysis.+Correct usage requires being paired with <<Common Grams Query Filter>> during `query` analysis.-These filters can also be combined with <<#stop-filter,Stop Filter>> so searching for `"the cat"` would match different documents then `"a cat"`, while pathological searches for either `"the"` or `"a"` would not match any documents.+These filters can also be combined with <<Stop Filter>> so searching for `"the cat"` would match different documents then `"a cat"`, while pathological searches for either `"the"` or `"a"` would not match any documents.*Factory class:* `solr.CommonGramsFilterFactory`@@ -409,18 +409,18 @@ If `true`, the filter ignores the case of words when comparing them to the commo== Common Grams Query Filter-This filter is used for the `query` time analysis aspect of <<#common-grams-filter,Common Grams Filter>> -- see that filer for a description of arguments, example configuration, and sample input/output.+This filter is used for the `query` time analysis aspect of <<Common Grams Filter>> -- see that filer for a description of arguments, example configuration, and sample input/output.== Collation Key FilterCollation allows sorting of text in a language-sensitive way.It is usually used for sorting, but can also be used with advanced searches.-We've covered this in much more detail in the section on <<language-analysis.adoc#unicode-collation,Unicode Collation>>.+We've covered this in much more detail in the section on xref:language-analysis.adoc#unicode-collation[Unicode Collation].== Daitch-Mokotoff Soundex FilterImplements the Daitch-Mokotoff Soundex algorithm, which allows identification of similar names, even if they are spelled differently.-More information about how this works is available in the section on <<phonetic-matching.adoc#,Phonetic Matching>>.+More information about how this works is available in the section on xref:phonetic-matching.adoc[].*Factory class:* `solr.DaitchMokotoffSoundexFilterFactory`@@ -467,8 +467,8 @@ Setting this to `false` will enable phonetic matching, but the exact spelling of== Double Metaphone Filter-This filter creates tokens using the http://commons.apache.org/proper/commons-codec/archives/{ivy-commons-codec-version}/apidocs/org/apache/commons/codec/language/DoubleMetaphone.html[`DoubleMetaphone`] encoding algorithm from commons-codec.-For more information, see the <<phonetic-matching.adoc#,Phonetic Matching>> section.+This filter creates tokens using the http://commons.apache.org/proper/commons-codec/archives/{dep-version-commons-codec}/apidocs/org/apache/commons/codec/language/DoubleMetaphone.html[`DoubleMetaphone`] encoding algorithm from commons-codec.+For more information, see xref:phonetic-matching.adoc[].*Factory class:* `solr.DoubleMetaphoneFilterFactory`@@ -1050,7 +1050,7 @@ This filter is generally only useful at index time.This filter is a custom Unicode normalization form that applies the foldings specified in http://www.unicode.org/reports/tr30/tr30-4.html[Unicode TR #30: Character Foldings] in addition to the `NFKC_Casefold` normalization form as described in <<ICU Normalizer 2 Filter>>.This filter is a better substitute for the combined behavior of the <<ASCII Folding Filter>>, <<Lower Case Filter>>, and <<ICU Normalizer 2 Filter>>.-To use this filter, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).+To use this filter, you must add additional .jars to Solr's classpath (as described in the section xref:configuration-guide:solr-plugins.adoc#installing-plugins[Installing Plugins]).See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.*Factory class:* `solr.ICUFoldingFilterFactory`@@ -1191,7 +1191,7 @@ See the http://icu-project.org/apiref/icu4j/com/ibm/icu/text/UnicodeSet.html[UniFor detailed information about these normalization forms, see http://unicode.org/reports/tr15/[Unicode Normalization Forms].-To use this filter, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).+To use this filter, you must add additional .jars to Solr's classpath (as described in the section xref:configuration-guide:solr-plugins.adoc#installing-plugins[Installing Plugins]).See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.== ICU Transform Filter@@ -1244,7 +1244,7 @@ For a full list of ICU System Transforms, see http://demo.icu-project.org/icu-biFor detailed information about ICU Transforms, see http://userguide.icu-project.org/transforms/general.-To use this filter, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).+To use this filter, you must add additional .jars to Solr's classpath (as described in the section xref:configuration-guide:solr-plugins.adoc#installing-plugins[Installing Plugins]).See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.== Keep Word Filter@@ -1703,7 +1703,7 @@ All other characters are left unchanged.== Managed Stop Filter-This is specialized version of the <<Stop Filter,Stop Words Filter Factory>> that uses a set of stop words that are <<managed-resources.adoc#,managed from a REST API.>>+This is specialized version of the <<Stop Filter,Stop Words Filter Factory>> that uses a set of stop words that are xref:configuration-guide:managed-resources.adoc[managed from a REST API].*Arguments:*@@ -1750,7 +1750,7 @@ See <<Stop Filter>> for example input/output.== Managed Synonym Filter-This is specialized version of the <<Synonym Filter>> that uses a mapping on synonyms that is <<managed-resources.adoc#,managed from a REST API.>>+This is specialized version of the <<Synonym Filter>> that uses a mapping on synonyms that is xref:configuration-guide:managed-resources.adoc[managed from a REST API]..Managed Synonym Filter has been Deprecated[WARNING]@@ -1764,7 +1764,7 @@ For arguments and examples, see the <<Synonym Graph Filter>> below.== Managed Synonym Graph Filter-This is specialized version of the <<Synonym Graph Filter>> that uses a mapping on synonyms that is <<managed-resources.adoc#,managed from a REST API.>>+This is specialized version of the <<Synonym Graph Filter>> that uses a mapping on synonyms that is xref:configuration-guide:managed-resources.adoc[managed from a REST API].This filter maps single- or multi-token synonyms, producing a fully correct graph output.This filter is a replacement for the Managed Synonym Filter, which produces incorrect graphs for multi-token synonyms.@@ -2199,7 +2199,7 @@ Otherwise the token is passed through.== Phonetic FilterThis filter creates tokens using one of the phonetic encoding algorithms in the `org.apache.commons.codec.language` package.-For more information, see the section on <<phonetic-matching.adoc#,Phonetic Matching>>.+For more information, see the section on xref:phonetic-matching.adoc[].*Factory class:* `solr.PhoneticFilterFactory`@@ -2215,13 +2215,13 @@ s|Required |Default: noneThe name of the encoder to use.The encoder name must be one of the following (case insensitive):-* `http://commons.apache.org/proper/commons-codec/archives/{ivy-commons-codec-version}/apidocs/org/apache/commons/codec/language/DoubleMetaphone.html[DoubleMetaphone]`-* `http://commons.apache.org/proper/commons-codec/archives/{ivy-commons-codec-version}/apidocs/org/apache/commons/codec/language/Metaphone.html[Metaphone]`-* `http://commons.apache.org/proper/commons-codec/archives/{ivy-commons-codec-version}/apidocs/org/apache/commons/codec/language/Soundex.html[Soundex]`-* `http://commons.apache.org/proper/commons-codec/archives/{ivy-commons-codec-version}/apidocs/org/apache/commons/codec/language/RefinedSoundex.html[RefinedSoundex]`-* `http://commons.apache.org/proper/commons-codec/archives/{ivy-commons-codec-version}/apidocs/org/apache/commons/codec/language/Caverphone.html[Caverphone]` (v2.0)-* `http://commons.apache.org/proper/commons-codec/archives/{ivy-commons-codec-version}/apidocs/org/apache/commons/codec/language/ColognePhonetic.html[ColognePhonetic]`-* `http://commons.apache.org/proper/commons-codec/archives/{ivy-commons-codec-version}/apidocs/org/apache/commons/codec/language/Nysiis.html[Nysiis]`+* `http://commons.apache.org/proper/commons-codec/archives/{dep-version-commons-codec}/apidocs/org/apache/commons/codec/language/DoubleMetaphone.html[DoubleMetaphone]`+* `http://commons.apache.org/proper/commons-codec/archives/{dep-version-commons-codec}/apidocs/org/apache/commons/codec/language/Metaphone.html[Metaphone]`+* `http://commons.apache.org/proper/commons-codec/archives/{dep-version-commons-codec}/apidocs/org/apache/commons/codec/language/Soundex.html[Soundex]`+* `http://commons.apache.org/proper/commons-codec/archives/{dep-version-commons-codec}/apidocs/org/apache/commons/codec/language/RefinedSoundex.html[RefinedSoundex]`+* `http://commons.apache.org/proper/commons-codec/archives/{dep-version-commons-codec}/apidocs/org/apache/commons/codec/language/Caverphone.html[Caverphone]` (v2.0)+* `http://commons.apache.org/proper/commons-codec/archives/{dep-version-commons-codec}/apidocs/org/apache/commons/codec/language/ColognePhonetic.html[ColognePhonetic]`+* `http://commons.apache.org/proper/commons-codec/archives/{dep-version-commons-codec}/apidocs/org/apache/commons/codec/language/Nysiis.html[Nysiis]``inject`::+@@ -3062,7 +3062,7 @@ s|Required |Default: noneThe path to a file that contains a list of synonyms, one per line.In the (default) `solr` format - see the `format` argument below for alternatives - blank lines and lines that begin with `\#` are ignored.This may be a comma-separated list of paths.-See <<resource-loading.adoc#,Resource Loading>> for more information.+See xref:configuration-guide:resource-loading.adoc[] for more information.+There are two ways to specify synonym mappings:+@@ -3429,7 +3429,7 @@ With the example below, for a token "example.com" with type `<URL>`, the token e== Type Token FilterThis filter denies or allows a specified list of token types, assuming the tokens have type metadata associated with them.-For example, the <<tokenizers.adoc#uax29-url-email-tokenizer,UAX29 URL Email Tokenizer>> emits "<URL>" and "<EMAIL>" typed tokens, as well as other types.+For example, the xref:tokenizers.adoc#uax29-url-email-tokenizer[UAX29 URL Email Tokenizer] emits "<URL>" and "<EMAIL>" typed tokens, as well as other types.This filter would allow you to pull out only e-mail addresses from text as tokens, if you wish.*Factory class:* `solr.TypeTokenFilterFactory`diff --git a/solr/solr-ref-guide/src/indexing-nested-documents.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/indexing-nested-documents.adocsimilarity index 87%rename from solr/solr-ref-guide/src/indexing-nested-documents.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/indexing-nested-documents.adocindex 30030187023..94c66c7d007 100644--- a/solr/solr-ref-guide/src/indexing-nested-documents.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/indexing-nested-documents.adoc@@ -1,6 +1,4 @@= Indexing Nested Documents-:solr-root-path: ../../-:example-source-dir: {solr-root-path}solrj/src/test/org/apache/solr/client/ref_guide_examples/// 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@@ -18,23 +16,20 @@// specific language governing permissions and limitations// under the License.-Solr supports indexing nested documents, described here, and ways to <<searching-nested-documents.adoc#,search and retrieve>> them very efficiently.+Solr supports indexing nested documents, described here, and ways to xref:query-guide:searching-nested-documents.adoc[search and retrieve] them very efficiently.-By way of examples: nested documents in Solr can be used to bind a blog post (parent document)-with comments (child documents) -- or as a way to model major product lines as parent documents,+By way of examples: nested documents in Solr can be used to bind a blog post (parent document) with comments (child documents) -- or as a way to model major product lines as parent documents,with multiple types of child documents representing individual SKUs (with unique sizes / colors) and supporting documentation (either directly nested under the products, or under individual SKUs.The "top most" parent with all children is referred to as a "root" document or formerly "blockdocument" and it explains some of the nomenclature of related features.-At query time, the <<block-join-query-parser.adoc#,Block Join Query Parsers>> can search these relationships,- and the `<<document-transformers.adoc#child-childdoctransformerfactory,[child]>>` Document Transformer can attach child (or other "descendent") documents to the result documents.-In terms of performance, indexing the relationships between documents usually yields much faster queries than an equivalent "<<other-parsers#join-query-parser,query time join>>",+At query time, the xref:query-guide:block-join-query-parser.adoc[] can search these relationships, and the xref:query-guide:document-transformers.adoc#child-childdoctransformerfactory[`[child]`] Document Transformer can attach child (or other "descendent") documents to the result documents.+In terms of performance, indexing the relationships between documents usually yields much faster queries than an equivalent xref:query-guide:join-query-parser.adoc["query time join"],since the relationships are already stored in the index and do not need to be computed.However, nested documents are less flexible than query time joins as it imposes rules that some applications may not be able to accept.-Nested documents may be indexed via either the XML or JSON data syntax, and is also supported by <<solrj.adoc#,SolrJ>> with javabin.-+Nested documents may be indexed via either the XML or JSON data syntax, and is also supported by xref:deployment-guide:solrj.adoc[] with javabin.[CAUTION]====@@ -127,7 +122,7 @@ There is no "child document" field type.[CAUTION]=====-The <<indexing-with-update-handlers#json-update-convenience-paths,`/update/json/docs` convenience path>> will automatically flatten complex JSON documents by default -- so to index nested JSON documents make sure to use `/update`.+The xref:indexing-with-update-handlers#json-update-convenience-paths[`/update/json/docs` convenience path] will automatically flatten complex JSON documents by default -- so to index nested JSON documents make sure to use `/update`.=========@@ -218,7 +213,7 @@ The <<indexing-with-update-handlers#json-update-convenience-paths,`/update/json/[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}IndexingNestedDocuments.java[tag=nest-path]+include::example$IndexingNestedDocuments.java[tag=nest-path]----====--@@ -234,13 +229,13 @@ Indexing nested documents _requires_ an indexed field named `\_root_`:----*Do not add this field to an index that already has data!-<<reindexing.adoc#changes-that-require-reindex,You must reindex.>>*+xref:reindexing.adoc#changes-that-require-reindex[You must reindex].** Solr automatically populates this field in _all_ documents with the `id` value of it's root document-- it's highest ancestor, possibly itself.* This field must be indexed (`indexed="true"`) but doesn't need tobe either stored (`stored="true"`) or use doc values (`docValues="true"`), however you are free to do so if you find it useful.-If you want to use `uniqueBlock(\_root_)` <<json-facet-api#stat-facet-functions,field type limitation>>, then you should enable docValues.+If you want to use `uniqueBlock(\_root_)` xref:query-guide:json-facet-api#stat-facet-functions[field type limitation], then you should enable docValues.Preferably, you will also define `\_nest_path_` which adds features and ease-of-use:@@ -252,11 +247,11 @@ Preferably, you will also define `\_nest_path_` which adds features and ease-of-* Solr automatically populates this field for any child document but not root documents.* This field enables Solr to properly record & reconstruct the named and nested relationship of documents-when using the `<<searching-nested-documents.adoc#child-doc-transformer,[child]>>` doc transformer.-** If this field does not exist, the `[child]` transformer will return all descendent child documents as a flattened list -- just as if they had been <<#indexing-anonymous-children,indexed as anonymous children>>.+when using the xref:query-guide:searching-nested-documents.adoc#child-doc-transformer[`[child]`] doc transformer.+** If this field does not exist, the `[child]` transformer will return all descendent child documents as a flattened list -- just as if they had been <<indexing-anonymous-children,indexed as anonymous children>>.* If you do not use `\_nest_path_` it is strongly recommended that every document have somefield that differentiates root documents from their nested children -- and differentiates different "types" of child documents.-This is not strictly necessary, so long as it's possible to write a "filter" query that can be used to isolate and select only parent documents for use in the <<block-join-query-parser#,block join query parsers>> and <<searching-nested-documents.adoc#child-doc-transformer,[child]>> doc transformer+This is not strictly necessary, so long as it's possible to write a "filter" query that can be used to isolate and select only parent documents for use in the xref:query-guide:block-join-query-parser.adoc[] and xref:query-guide:searching-nested-documents.adoc#child-doc-transformer[`[child]`] doc transformer* It's possible to query on this field, although at present it's only documented how to in thecontext of `[child]`'s `childFilter` parameter.@@ -281,17 +276,16 @@ documents.[TIP]====When using SolrCloud it is a _VERY_ good idea to use-<<solrcloud-shards-indexing.adoc#document-routing,prefix based compositeIds>> with a+xref:deployment-guide:solrcloud-shards-indexing.adoc#document-routing[prefix based compositeIds] with acommon prefix for all documents in the nested document tree.This makes it much easier to apply-<<partial-document-updates#updating-child-documents,atomic updates to individual child documents>>+xref:partial-document-updates.adoc#updating-child-documents[atomic updates] to individual child documents.====-== Maintaining Integrity with Updates and Deletes-Nested document trees can be modified with Solr's-<<partial-document-updates#updating-child-documents,atomic update>> feature to+Nested document trees can be modified with+xref:partial-document-updates.adoc#atomic-updates,atomic updates>> tomanipulate any document in a nested tree, and even to add new child documents.This aspect isn't different than updating any normal document -- Solr internally deletes the oldnested document tree and it adds the newly modified one.@@ -304,14 +298,11 @@ Clients should be very careful to *never* violate this.To delete an entire nested document tree, you can simply delete-by-ID using the `id` of the root document.Delete-by-ID will not work with the `id` of a child document, since only root document IDs are considered.-Instead, use delete-by-query (most efficient) or <<partial-document-updates#,atomic updates>> to remove the child document from it's parent.+Instead, use delete-by-query (most efficient) or xref:partial-document-updates.adoc#atomic-updates[atomic updates] to remove the child document from it's parent.If you use Solr's delete-by-query APIs, you *MUST* be careful to ensure that any deletion query is structured to ensure no descendent children remain of any documents that are being deleted.*_Doing otherwise will violate integrity assumptions that Solr expects._*---== Indexing Anonymous ChildrenAlthough not recommended, it is also possible to index child documents "anonymously":@@ -416,7 +407,7 @@ Although not recommended, it is also possible to index child documents "anonymou[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}IndexingNestedDocuments.java[tag=anon-kids]+include::example$IndexingNestedDocuments.java[tag=anon-kids]----====@@ -426,10 +417,10 @@ include::{example-source-dir}IndexingNestedDocuments.java[tag=anon-kids]This simplified approach was common in older versions of Solr, and can still be used with "Root-Only" schemas that do not contain any other nested related fields apart from `\_root_`.Many schemas in existence are this way simply because default configsets are this way, even if the application isn't using nested documents.-This approach should *NOT* be used when schemas include a `\_nest_path_` field, as the existence of that field triggers assumptions and changes in behavior in various query time functionality, such as the <<searching-nested-documents.adoc#child-doc-transformer,[child]>>, that will not work when nested documents do not have any intrinsic "nested path" information.+This approach should *NOT* be used when schemas include a `\_nest_path_` field, as the existence of that field triggers assumptions and changes in behavior in various query time functionality, such as xref:query-guide:searching-nested-documents.adoc#child-doc-transformer[`[child]`], that will not work when nested documents do not have any intrinsic "nested path" information.The results of indexing anonymous nested children with a "Root-Only" schema are similar to what happens if you attempt to index "pseudo field" nested documents using a "Root-Only" schema.-Notably: since there is no nested path information for the <<searching-nested-documents.adoc#child-doc-transformer,[child]>> transformer to use to reconstruct the structure of a nest of documents, it returns all matching children as a flat list, similar in structure to how they were originally indexed:+Notably: since there is no nested path information for the xref:query-guide:searching-nested-documents.adoc#child-doc-transformer[`[child]`] transformer to use to reconstruct the structure of a nest of documents, it returns all matching children as a flat list, similar in structure to how they were originally indexed:[.dynamic-tabs]--diff --git a/solr/solr-ref-guide/src/indexing-with-tika.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/indexing-with-tika.adocsimilarity index 95%rename from solr/solr-ref-guide/src/indexing-with-tika.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/indexing-with-tika.adocindex bbbd1dac2e5..4c55ae950e5 100644--- a/solr/solr-ref-guide/src/indexing-with-tika.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/indexing-with-tika.adoc@@ -34,7 +34,7 @@ When using the Solr Cell framework, it is helpful to keep the following in mind:* Tika will automatically attempt to determine the input document type (e.g., Word, PDF, HTML) and extract the content appropriately.If you like, you can explicitly specify a MIME type for Tika with the `stream.type` parameter.-See http://tika.apache.org/{ivy-tika-version}/formats.html for the file types supported.+See http://tika.apache.org/{dep-version-tika}/formats.html for the file types supported.* Briefly, Tika internally works by synthesizing an XHTML document from the core content of the parsed document which is passed to a configured http://www.saxproject.org/quickstart.html[SAX] ContentHandler provided by Solr Cell.Solr responds to Tika's SAX events to create one or more text fields from the content.Tika exposes document metadata as well (apart from the XHTML).@@ -47,7 +47,7 @@ You can configure which elements should be included/ignored, and which should ma* Solr Cell maps each piece of metadata onto a field.By default it maps to the same name but several parameters control how this is done.* When Solr Cell finishes creating the internal `SolrInputDocument`, the rest of the Lucene/Solr indexing stack takes over.-The next step after any update handler is the <<update-request-processors.adoc#,Update Request Processor>> chain.+The next step after any update handler is the xref:configuration-guide:update-request-processors.adoc[Update Request Processor] chain.Solr Cell is a module, which means it's not automatically included with Solr but must be configured.The example configsets have Solr Cell configured, but if you are not using those, you will want to pay attention to the section <<solrconfig.xml Configuration>> below.@@ -70,7 +70,7 @@ that have a lot of rich media embedded in them.For these reasons, Solr Cell is not recommended for use in a production system.It is a best practice to use Solr Cell as a proof-of-concept tool during development and then run Tika as an external-process that sends the extracted documents to Solr (via <<solrj.adoc#,SolrJ>>) for indexing.+process that sends the extracted documents to Solr (via xref:deployment-guide:solrj.adoc[]) for indexing.This way, any extraction failures that occur are isolated from Solr itself and can be handled gracefully.For a few examples of how this could be done, see this blog post by Erick Erickson, https://lucidworks.com/2012/02/14/indexing-with-solrj/[Indexing with SolrJ].@@ -120,7 +120,7 @@ bin/post -c gettingstarted example/exampledocs/solr-word.pdf -params "literal.idNow you can execute a query and find that document with a request like `\http://localhost:8983/solr/gettingstarted/select?q=pdf`.The document will look something like this:-image::images/indexing-with-tika/sample-pdf-query.png[float="right",width=50%,pdfwidth=60%]+image::indexing-with-tika/sample-pdf-query.png[float="right",width=50%,pdfwidth=60%]You may notice there are many metadata fields associated with this document.Solr's configuration is by default in "schemaless" (data driven) mode, and thus all metadata fields extracted get their own field.@@ -400,12 +400,12 @@ In this case, you could additionally define a rule in the Schema to not index th|===+When extracting, only return Tika XHTML content that satisfies the given XPath expression.-See http://tika.apache.org/{ivy-tika-version}/ for details on the format of Tika XHTML, it varies with the format being parsed.+See http://tika.apache.org/{dep-version-tika}/ for details on the format of Tika XHTML, it varies with the format being parsed.Also see the section <<Defining XPath Expressions>> for an example.=== solrconfig.xml Configuration-If you have started Solr with one of the supplied <<config-sets.adoc#,example configsets>>, you may already have the `ExtractingRequestHandler` configured by default.+If you have started Solr with one of the supplied xref:configuration-guide:config-sets.adoc[example configsets], you may already have the `ExtractingRequestHandler` configured by default.If it is not already configured, you will need to configure `solrconfig.xml` to find the `ExtractingRequestHandler` and its dependencies:@@ -433,9 +433,9 @@ In this setup, all field names are lower-cased (with the `lowernames` parameter)[TIP]====-You may need to configure <<update-request-processors.adoc#,Update Request Processors>> (URPs) that parse numbers and dates and do other manipulations on the metadata fields generated by Solr Cell.+You may need to configure xref:configuration-guide:update-request-processors.adoc[] (URPs) that parse numbers and dates and do other manipulations on the metadata fields generated by Solr Cell.-In Solr's `_default` configset, <<schemaless-mode.adoc#,"schemaless">> (aka data driven, or field guessing) mode is enabled, which does a variety of such processing already.+In Solr's `_default` configset, xref:schemaless-mode.adoc[schemaless mode] (aka data driven, or field guessing) is enabled, which does a variety of such processing already.If you instead explicitly define the fields for your schema, you can selectively specify the desired URPs.An easy way to specify this is to configure the parameter `processor` (under `defaults`) to `uuid,remove-blank,field-name-mutating,parse-boolean,parse-long,parse-double,parse-date`.@@ -603,7 +603,7 @@ curl "http://localhost:8983/solr/gettingstarted/update/extract?literal.id=doc6&d== Using Solr Cell with SolrJSolrJ is a Java client that you can use to add documents to the index, update the index, or query the index.-You'll find more information on SolrJ in <<solrj.adoc#,SolrJ>>.+You'll find more information on SolrJ in xref:deployment-guide:solrj.adoc[].Here's an example of using Solr Cell and SolrJ to add documents to a Solr index.diff --git a/solr/solr-ref-guide/src/indexing-with-update-handlers.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/indexing-with-update-handlers.adocsimilarity index 92%rename from solr/solr-ref-guide/src/indexing-with-update-handlers.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/indexing-with-update-handlers.adocindex 8a2b63b2710..10c06d7da04 100644--- a/solr/solr-ref-guide/src/indexing-with-update-handlers.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/indexing-with-update-handlers.adoc@@ -18,18 +18,16 @@// under the License.Update handlers are request handlers designed to add, delete and update documents to the index.-In addition to having plugins for importing rich documents <<indexing-with-tika.adoc#,Indexing with Solr Cell and Apache Tika>>, Solr natively supports indexing structured documents in XML, CSV, and JSON.+In addition to having plugins for importing rich documents xref:indexing-with-tika.adoc[], Solr natively supports indexing structured documents in XML, CSV, and JSON.The recommended way to configure and use request handlers is with path based names that map to paths in the request URL.-However, request handlers can also be specified with the `qt` (query type) parameter if the <<requestdispatcher.adoc#,`requestDispatcher`>> is appropriately configured.+However, request handlers can also be specified with the `qt` (query type) parameter if the xref:configuration-guide:requestdispatcher.adoc[`requestDispatcher`] is appropriately configured.It is possible to access the same handler using more than one name, which can be useful if you wish to specify different sets of default options.-A single unified update request handler supports XML, CSV, JSON, and javabin update requests, delegating to the appropriate `ContentStreamLoader` based on the `Content-Type` of the <<content-streams.adoc#,ContentStream>>.+A single unified update request handler supports XML, CSV, JSON, and javabin update requests, delegating to the appropriate `ContentStreamLoader` based on the `Content-Type` of the xref:content-streams.adoc[ContentStream].If you need to pre-process documents after they are loaded but before they are indexed (or even checked against the schema),-Solr has document-preprocessing plugins for Update Request Handlers,-called <<update-request-processors.adoc#,Update Request Processors>>,-which allow for default and custom configuration chains.+Solr has document preprocessing plugins for Update Request Handlers, called xref:configuration-guide:update-request-processors.adoc[], which allow for default and custom configuration chains.== UpdateRequestHandler Configuration@@ -184,7 +182,7 @@ A single delete message can contain multiple delete operations.====When using the Join query parser in a Delete By Query, you should use the `score` parameter with a value of "none" to avoid a `ClassCastException`.-See the section on the <<other-parsers.adoc#,Join Query Parser>> for more details on the `score` parameter.+See the section on the xref:query-guide:join-query-parser.adoc[] for more details on the `score` parameter.====@@ -250,7 +248,7 @@ This alternative `curl` command performs equivalent operations but with minimalcurl http://localhost:8983/solr/my_collection/update -H "Content-Type: text/xml" -T "myfile.xml" -X POST-----Short requests can also be sent using a HTTP GET command, if enabled in <<requestdispatcher.adoc#requestparsers-element,`requestParsers`>> element of `solrconfig.xml`, URL-encoding the request, as in the following.+Short requests can also be sent using a HTTP GET command, if enabled in xref:configuration-guide:requestdispatcher.adoc#requestparsers-element[`requestParsers`] element of `solrconfig.xml`, URL-encoding the request, as in the following.Note the escaping of "<" and ">":[source,bash]@@ -274,10 +272,10 @@ The status field will be non-zero in case of failure.=== Using XSLT to Transform XML Index Updates-The Scripting module provides a separate XSLT Update Request Handler that allows you to index any arbitrary XML by using the `<tr>` parameter to apply an https://en.wikipedia.org/wiki/XSLT[XSL transformation].-You must have an XSLT stylesheet in the `conf/xslt` directory of your <<config-sets.adoc#,configset>> that can transform the incoming data to the expected `<add><doc/></add>` format, and use the `tr` parameter to specify the name of that stylesheet.+The xref:configuration-guide:script-update-processor.adoc[Scripting module] provides a separate XSLT Update Request Handler that allows you to index any arbitrary XML by using the `<tr>` parameter to apply an https://en.wikipedia.org/wiki/XSLT[XSL transformation].+You must have an XSLT stylesheet in the `conf/xslt` directory of your xref:configuration-guide:config-sets.adoc[configset] that can transform the incoming data to the expected `<add><doc/></add>` format, and use the `tr` parameter to specify the name of that stylesheet.-Learn more about adding the `modules/scripting/lib/*` files into Solr's <<libs.adoc#lib-directories,Lib Directories>>.+Learn more about adding the `modules/scripting/lib/*` files into Solr's xref:configuration-guide:libs.adoc#lib-directories[Lib Directories].=== tr Parameter@@ -287,7 +285,7 @@ The transformation must be found in the Solr `conf/xslt` directory.=== XSLT Configuration-The example below, from the `sample_techproducts_configs` <<config-sets.adoc#,configset>> in the Solr distribution, shows how the XSLT Update Request Handler is configured.+The example below, from the `sample_techproducts_configs` xref:configuration-guide:config-sets.adoc[configset] in the Solr distribution, shows how the XSLT Update Request Handler is configured.[source,xml]----@@ -358,12 +356,12 @@ $ curl -o standard_solr_xml_format.xml "http://localhost:8983/solr/techproducts/$ curl -X POST -H "Content-Type: text/xml" -d @standard_solr_xml_format.xml "http://localhost:8983/solr/techproducts/update/xslt?commit=true&tr=updateXml.xsl"-----NOTE: You can see the opposite export/import cycle using the `tr` parameter in <<response-writers.adoc#xslt-writer-example,Response Writer XSLT example>>.+NOTE: You can see the opposite export/import cycle using the `tr` parameter in the xref:query-guide:response-writers.adoc#xslt-writer-example[Response Writer XSLT example].== JSON Formatted Index UpdatesSolr can accept JSON that conforms to a defined structure, or can accept arbitrary JSON-formatted documents.-If sending arbitrarily formatted JSON, there are some additional parameters that need to be sent with the update request, described in the section <<transforming-and-indexing-custom-json.adoc#,Transforming and Indexing Custom JSON>>.+If sending arbitrarily formatted JSON, there are some additional parameters that need to be sent with the update request, described in the section xref:transforming-and-indexing-custom-json.adoc[].=== Solr-Style JSON@@ -507,7 +505,7 @@ The `/update/json` path may be useful for clients sending in JSON formatted upda=== Custom JSON DocumentsSolr can support custom JSON.-This is covered in the section <<transforming-and-indexing-custom-json.adoc#,Transforming and Indexing Custom JSON>>.+This is covered in the section xref:transforming-and-indexing-custom-json.adoc[].== CSV Formatted Index Updatesdiff --git a/solr/solr-ref-guide/src/language-analysis.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/language-analysis.adocsimilarity index 96%rename from solr/solr-ref-guide/src/language-analysis.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/language-analysis.adocindex 415e7100a8c..1b990dabaa9 100644--- a/solr/solr-ref-guide/src/language-analysis.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/language-analysis.adoc@@ -1,5 +1,4 @@= Language Analysis-:example-source-dir: {solr-root-path}core/src/test-files/solr/collection1/conf/// 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@@ -25,7 +24,7 @@ Tokens are delimited by white space and/or a relatively small set of punctuationIn other languages the tokenization rules are often not so simple.Some European languages may also require special tokenization rules, such as rules for decompounding German words.-For information about language detection at index time, see <<language-detection.adoc#,Language Detection>>.+For information about language detection at index time, see xref:language-detection.adoc[].== KeywordMarkerFilterFactory@@ -33,7 +32,7 @@ Protects words from being modified by stemmers.A customized protected word list may be specified with the "protected" attribute in the schema.Any words in the protected word list will not be modified by any stemmer in Solr.-A sample Solr `protwords.txt` with comments can be found in the `sample_techproducts_configs` <<config-sets.adoc#,configset>> directory:+A sample Solr `protwords.txt` with comments can be found in the `sample_techproducts_configs` xref:configuration-guide:config-sets.adoc[configset] directory:[.dynamic-tabs]--@@ -159,7 +158,7 @@ A sample `stemdict.txt` file is shown below:[source,text]-----include::{example-source-dir}stemdict.txt[lines=18..22]+include::example$stemdict.txt[lines=18..22]----If you have a checkout of Solr's source code locally, you can also find this example in Solr's test resources at `solr/core/src/test-files/solr/collection1/conf/stemdict.txt`.@@ -186,7 +185,7 @@ s|Required |Default: noneThe path of a file that contains a list of simple words, one per line.Blank lines and lines that begin with "`#`" are ignored.+-See <<resource-loading.adoc#,Resource Loading>> for more information.+See xref:configuration-guide:resource-loading.adoc[] for more information.`minWordSize`::+@@ -269,7 +268,7 @@ Unicode Collation in Solr is fast, because all the work is done at index time.Rather than specifying an analyzer within `<fieldtype ... class="solr.TextField">`, the `solr.CollationField` and `solr.ICUCollationField` field type classes provide this functionality.`solr.ICUCollationField`, which is backed by http://site.icu-project.org[the ICU4J library], provides more flexible configuration, has more locales, is significantly faster, and requires less memory and less index space, since its keys are smaller than those produced by the JDK implementation that backs `solr.CollationField`.-To use `solr.ICUCollationField`, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).+To use `solr.ICUCollationField`, you must add additional .jars to Solr's classpath (as described in the section xref:configuration-guide:solr-plugins.adoc#installing-plugins[Installing Plugins]).See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.`solr.ICUCollationField` and `solr.CollationField` fields can be created in two ways:@@ -695,13 +694,13 @@ On the other hand, it can reduce precision because language-specific character dThe `lucene/analysis/opennlp` module provides OpenNLP integration via several analysis components: a tokenizer, a part-of-speech tagging filter, a phrase chunking filter, and a lemmatization filter.In addition to these analysis components, Solr also provides an update request processor to extract named entities.-See also <<update-request-processors.adoc#update-processor-factories-that-can-be-loaded-as-plugins,Update Processor Factories That Can Be Loaded as Plugins>>.+See also xref:configuration-guide:update-request-processors.adoc#update-processor-factories-that-can-be-loaded-as-plugins[Update Processor Factories That Can Be Loaded as Plugins].NOTE: The <<OpenNLP Tokenizer>> must be used with all other OpenNLP analysis components, for two reasons.First, the OpenNLP Tokenizer detects and marks the sentence boundaries required by all the OpenNLP filters.Second, since the pre-trained OpenNLP models used by these filters were trained using the corresponding language-specific sentence-detection/tokenization models, the same tokenization using the same models must be used at runtime for optimal performance.-To use the OpenNLP components, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).+To use the OpenNLP components, you must add additional .jars to Solr's classpath (as described in the section xref:configuration-guide:solr-plugins.adoc#installing-plugins[Installing Plugins]).See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.=== OpenNLP Tokenizer@@ -722,7 +721,7 @@ s|Required |Default: none|===+The path of a language-specific OpenNLP sentence detection model file.-See <<resource-loading.adoc#,Resource Loading>> for more information.+See xref:configuration-guide:resource-loading.adoc[] for more information.`tokenizerModel`::+@@ -732,7 +731,7 @@ s|Required |Default: none|===+The path of a language-specific OpenNLP tokenization model file.-See <<resource-loading.adoc#,Resource Loading>> for more information.+See xref:configuration-guide:resource-loading.adoc[] for more information.*Example:*@@ -783,11 +782,12 @@ s|Required |Default: none|===+The path of a language-specific OpenNLP POS tagger model file.-See <<resource-loading.adoc#,Resource Loading>> for more information.+See xref:configuration-guide:resource-loading.adoc[] for more information.*Examples:*-The OpenNLP tokenizer will tokenize punctuation, which is useful for following token filters, but ordinarily you don't want to include punctuation in your index, so the `TypeTokenFilter` (<<filters.adoc#type-token-filter,described here>>) is included in the examples below, with `stop.pos.txt` containing the following:+The OpenNLP tokenizer will tokenize punctuation, which is useful for following token filters.+Ordinarily you don't want to include punctuation in your index, so the xref:filters.adoc#type-token-filter[`TypeTokenFilter`] is included in the examples below, with `stop.pos.txt` containing the following:.stop.pos.txt[source,text]@@ -839,7 +839,7 @@ Index the POS for each token as a payload:====---Index the POS for each token as a synonym, after prefixing the POS with "@" (see the <<filters.adoc#type-as-synonym-filter,TypeAsSynonymFilter description>>):+Index the POS for each token as a synonym, after prefixing the POS with "@" (see the xref:filters.adoc#type-as-synonym-filter[TypeAsSynonymFilter description]):[source,xml]----@@ -888,7 +888,7 @@ s|Required |Default: none|===+The path of a language-specific OpenNLP phrase chunker model file.-See <<resource-loading.adoc#,Resource Loading>> for more information.+See xref:configuration-guide:resource-loading.adoc[] for more information.*Examples*:@@ -928,7 +928,7 @@ Index the phrase chunk label for each token as a payload:====---Index the phrase chunk label for each token as a synonym, after prefixing it with "#" (see the <<filters.adoc#type-as-synonym-filter,TypeAsSynonymFilter description>>):+Index the phrase chunk label for each token as a synonym, after prefixing it with "#" (see the xref:filters.adoc#type-as-synonym-filter[TypeAsSynonymFilter description]):[source,xml]----@@ -963,7 +963,7 @@ Either `dictionary` or `lemmatizerModel` must be provided, and both may be provi|===+The path of a lemmatization dictionary file.-See <<resource-loading.adoc#,Resource Loading>> for more information.+See xref:configuration-guide:resource-loading.adoc[] for more information.The dictionary file must be encoded as UTF-8, with one entry per line, in the form `word[tab]lemma[tab]part-of-speech`, e.g., `wrote[tab]write[tab]VBD`.`lemmatizerModel`::@@ -974,7 +974,7 @@ The dictionary file must be encoded as UTF-8, with one entry per line, in the fo|===+The path of a language-specific OpenNLP lemmatizer model file.-See <<resource-loading.adoc#,Resource Loading>> for more information.+See xref:configuration-guide:resource-loading.adoc[] for more information.*Examples:*@@ -1324,12 +1324,13 @@ The stemmer language, `Catalan` in this case.=== Traditional Chinese-The default configuration of the <<tokenizers.adoc#icu-tokenizer,ICU Tokenizer>> is suitable for Traditional Chinese text.+The default configuration of the xref:tokenizers.adoc#icu-tokenizer[ICU Tokenizer] is suitable for Traditional Chinese text.It follows the Word Break rules from the Unicode Text Segmentation algorithm for non-Chinese text, and uses a dictionary to segment Chinese words.-To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).++To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section xref:configuration-guide:solr-plugins.adoc#installing-plugins[Installing Plugins]).See the `solr/modules/analysis-extras/README.md` for information on which jars you need to add.-<<tokenizers.adoc#standard-tokenizer,Standard Tokenizer>> can also be used to tokenize Traditional Chinese text.+The xref:tokenizers.adoc#standard-tokenizer[Standard Tokenizer] can also be used to tokenize Traditional Chinese text.Following the Word Break rules from the Unicode Text Segmentation algorithm, it produces one token per Chinese character.When combined with <<CJK Bigram Filter>>, overlapping bigrams of Chinese characters are formed.@@ -1377,7 +1378,7 @@ When combined with <<CJK Bigram Filter>>, overlapping bigrams of Chinese charact=== CJK Bigram Filter-Forms bigrams (overlapping 2-character sequences) of CJK characters that are generated from <<tokenizers.adoc#standard-tokenizer,Standard Tokenizer>> or <<tokenizers.adoc#icu-tokenizer,ICU Tokenizer>>.+Forms bigrams (overlapping 2-character sequences) of CJK characters that are generated from the xref:tokenizers.adoc#standard-tokenizer[Standard Tokenizer] or the xref:tokenizers.adoc#icu-tokenizer[ICU Tokenizer].By default, all CJK characters produce bigrams, but finer grained control is available by specifying orthographic type arguments `han`, `hiragana`, `katakana`, and `hangul`.When set to `false`, characters of the corresponding type will be passed through as unigrams, and will not be included in any bigrams.@@ -1440,12 +1441,12 @@ See the example under <<Traditional Chinese>>.For Simplified Chinese, Solr provides support for Chinese sentence and word segmentation with the <<HMM Chinese Tokenizer>>.This component includes a large dictionary and segments Chinese text into words with the Hidden Markov Model.-To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).+To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section xref:configuration-guide:solr-plugins.adoc#installing-plugins[Installing Plugins]).See the `solr/modules/analysis-extras/README.md` for information on which jars you need to add.-The default configuration of the <<tokenizers.adoc#icu-tokenizer,ICU Tokenizer>> is also suitable for Simplified Chinese text.+The default configuration of the xref:tokenizers.adoc#icu-tokenizer[ICU Tokenizer] is also suitable for Simplified Chinese text.It follows the Word Break rules from the Unicode Text Segmentation algorithm for non-Chinese text, and uses a dictionary to segment Chinese words.-To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).+To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section xref:configuration-guide:solr-plugins.adoc#installing-plugins[Installing Plugins]).See the `solr/modules/analysis-extras/README.md` for information on which jars you need to add.Also useful for Chinese analysis:@@ -1503,7 +1504,7 @@ Also useful for Chinese analysis:For Simplified Chinese, Solr provides support for Chinese sentence and word segmentation with the `solr.HMMChineseTokenizerFactory` in the `analysis-extras` module.This component includes a large dictionary and segments Chinese text into words with the Hidden Markov Model.-To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).+To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section <xref:configuration-guide:solr-plugins.adoc#installing-plugins[Installing Plugins]).See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.*Factory class:* `solr.HMMChineseTokenizerFactory`@@ -2346,7 +2347,7 @@ Removes terms with one of the configured parts-of-speech.|===+Filename for a list of parts-of-speech for which to remove terms.-See `conf/lang/stoptags_ja.txt` in the `sample_techproducts_config` <<config-sets.adoc#,configset>> for an example.+See `conf/lang/stoptags_ja.txt` in the `sample_techproducts_config` xref:configuration-guide:config-sets.adoc[configset] for an example.==== Japanese Katakana Stem Filter@@ -2550,10 +2551,10 @@ This filter replaces term text with the Reading Attribute, the Hangul transcript=== Hebrew, Lao, Myanmar, KhmerLucene provides support, in addition to UAX#29 word break rules, for Hebrew's use of the double and single quote characters, and for segmenting Lao, Myanmar, and Khmer into syllables with the `solr.ICUTokenizerFactory` in the `analysis-extras` module.-To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).+To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section xref:configuration-guide:solr-plugins.adoc#installing-plugins[Installing Plugins]).See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.-See <<tokenizers.adoc#icu-tokenizer,the ICUTokenizer>> for more information.+See xref:tokenizers.adoc#icu-tokenizer[ICUTokenizer] for more information.=== Latvian@@ -2825,7 +2826,7 @@ Solr includes support for normalizing Persian, and Lucene includes an example stSolr provides support for Polish stemming with the `solr.StempelPolishStemFilterFactory`, and `solr.MorphologikFilterFactory` for lemmatization, in the `analysis-extras` module.The `solr.StempelPolishStemFilterFactory` component includes an algorithmic stemmer with tables for Polish.-To use either of these filters, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).+To use either of these filters, you must add additional .jars to Solr's classpath (as described in the section xref:configuration-guide:solr-plugins.adoc#installing-plugins[Installing Plugins]).See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.*Factory class:* `solr.StempelPolishStemFilterFactory` and `solr.MorfologikFilterFactory`@@ -3373,7 +3374,7 @@ Solr includes support for stemming Turkish with the `solr.SnowballPorterFilterFa=== UkrainianSolr provides support for Ukrainian lemmatization with the `solr.MorphologikFilterFactory`, in the `analysis-extras` module.-To use this filter, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).+To use this filter, you must add additional .jars to Solr's classpath (as described in the section xref:configuration-guide:solr-plugins.adoc#installing-plugins[Installing Plugins]).See `solr/modules/analysis-extras/README.md` for instructions on which jars you need to add.Lucene also includes an example Ukrainian stopword list, in the `lucene-analyzers-morfologik` jar.diff --git a/solr/solr-ref-guide/src/language-detection.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/language-detection.adocsimilarity index 94%rename from solr/solr-ref-guide/src/language-detection.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/language-detection.adocindex 7318e8322d2..f1e8819b143 100644--- a/solr/solr-ref-guide/src/language-detection.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/language-detection.adoc@@ -20,16 +20,16 @@ Solr can identify languages and map text to language-specific fields during indeSolr supports three implementations of this feature:-* Tika's language detection feature: https://tika.apache.org/{ivy-tika-version}/detection.html+* Tika's language detection feature: https://tika.apache.org/{dep-version-tika}/detection.html* LangDetect language detection: https://github.com/shuyo/language-detection-* OpenNLP language detection: http://opennlp.apache.org/docs/{ivy-opennlp-version}/manual/opennlp.html#tools.langdetect+* OpenNLP language detection: http://opennlp.apache.org/docs/{dep-version-opennlp}/manual/opennlp.html#tools.langdetectYou can see a comparison between the Tika and LangDetect implementations here: http://blog.mikemccandless.com/2011/10/accuracy-and-performance-of-googles.html.In general, the LangDetect implementation supports more languages with higher performance.For specific information on each of these language identification implementations, including a list of supported languages for each, see the relevant project websites.-For more information about language analysis in Solr, see <<language-analysis.adoc#,Language Analysis>>.+For more information about language analysis in Solr, see xref:language-analysis.adoc[].== Configuring Language Detection@@ -92,9 +92,9 @@ s|Required |Default: noneAn OpenNLP language detection model.+The OpenNLP project provides a pre-trained 103 language model on the http://opennlp.apache.org/models.html[OpenNLP site's model dowload page].-Model training instructions are provided on the http://opennlp.apache.org/docs/{ivy-opennlp-version}/manual/opennlp.html#tools.langdetect[OpenNLP website].+Model training instructions are provided on the http://opennlp.apache.org/docs/{dep-version-opennlp}/manual/opennlp.html#tools.langdetect[OpenNLP website].+-See <<resource-loading.adoc#,Resource Loading>> for information on where to put the model.+See xref:configuration-guide:resource-loading.adoc[] for information on where to put the model.==== OpenNLP Language Codesdiff --git a/solr/solr-ref-guide/src/luke-request-handler.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/luke-request-handler.adocsimilarity index 97%rename from solr/solr-ref-guide/src/luke-request-handler.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/luke-request-handler.adocindex 7d3734b1eb9..bb0987d17dd 100644--- a/solr/solr-ref-guide/src/luke-request-handler.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/luke-request-handler.adoc@@ -16,7 +16,7 @@// specific language governing permissions and limitations// under the License.-The Luke Request Handler offers programmatic access to the information provided on the <<schema-browser-screen#schema-browser-screen,Schema Browser>> page of the Admin UI.+The Luke Request Handler offers programmatic access to the information provided on the xref:schema-browser-screen.adoc[] page of the Admin UI.It is modeled after Luke, the Lucene Index Browser by Andrzej Bialecki.It is an implicit handler, so you don't need to define it in `solrconfig.xml`.diff --git a/solr/solr-ref-guide/src/partial-document-updates.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/partial-document-updates.adocsimilarity index 95%rename from solr/solr-ref-guide/src/partial-document-updates.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/partial-document-updates.adocindex d479957133f..bd5dcb6041f 100644--- a/solr/solr-ref-guide/src/partial-document-updates.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/partial-document-updates.adoc@@ -139,13 +139,13 @@ In-place updates avoid that..Routing Updates using child document Ids in SolrCloudWhen SolrCloud receives document updates, the-<<solrcloud-shards-indexing.adoc#document-routing,document routing>> rules for the collection is used to determine which shard should process the update based on the `id` of the document.+xref:deployment-guide:solrcloud-shards-indexing.adoc#document-routing[document routing] rules for the collection is used to determine which shard should process the update based on the `id` of the document.When sending an update that specifies the `id` of a _child document_ this will not work by default: the correct shard to send the document to is based on the `id` of the "Root" document for the block the child document is in, *not* the `id` of the child document being updated.Solr offers two solutions to address this:-* Clients may specify a <<solrcloud-shards-indexing.adoc#document-routing,`\_route_` parameter>>, with the `id` of the Root document as the parameter value, on each update to tell Solr which shard should process the update.+* Clients may specify a xref:deployment-guide:solrcloud-shards-indexing.adoc#document-routing[`\_route_` parameter], with the `id` of the Root document as the parameter value, on each update to tell Solr which shard should process the update.* Clients can use the (default) `compositeId` router's "prefix routing" feature when indexing all documents to ensure that all child/descendent documents in a Block use the same `id` prefix as the Root level document.This will cause Solr's default routing logic to automatically send child document updates to the correct shard.@@ -159,13 +159,13 @@ equivalent, but it may be absent or not equivalent (e.g., when using the `implicAll of the examples below use `id` prefixes, so no `\_route_` parameter will be necessary for these examples.====-For the upcoming examples, we'll assume an index containing the same documents covered in <<indexing-nested-documents#example-indexing-syntax,Indexing Nested Documents>>:+For the upcoming examples, we'll assume an index containing the same documents covered in xref:indexing-nested-documents.adoc#example-indexing-syntax[Indexing Nested Documents]:include::indexing-nested-documents.adoc[tag=sample-indexing-deeply-nested-documents]==== Modifying Child Document Fields-All of the <<#atomic-updates,Atomic Update operations>> mentioned above are supported for "real" fields of Child Documents:+All of the <<atomic-updates,Atomic Update operations>> mentioned above are supported for "real" fields of Child Documents:[source,bash]----@@ -346,7 +346,7 @@ Use the parameter `failOnVersionConflicts=false` to avoid failure of the entireIf the document being updated does not include the `\_version_` field, and atomic updates are not being used, the document will be treated by normal Solr rules, which is usually to discard the previous version.When using Optimistic Concurrency, clients can include an optional `versions=true` request parameter to indicate that the _new_ versions of the documents being added should be included in the response.-This allows clients to immediately know what the `\_version_` is of every document added without needing to make a redundant <<realtime-get.adoc#,`/get` request>>.+This allows clients to immediately know what the `\_version_` is of every document added without needing to make a redundant xref:configuration-guide:realtime-get.adoc[`/get` request].Following are some examples using `versions=true` in queries:@@ -488,7 +488,7 @@ Optimistic Concurrency is extremely powerful, and works very efficiently becauseHowever, in some situations users may want to configure their own document specific version field, where the version values are assigned on a per-document basis by an external system, and have Solr reject updates that attempt to replace a document with an "older" version.In situations like this the {solr-javadocs}/core/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.html[`DocBasedVersionConstraintsProcessorFactory`] can be useful.-The basic usage of `DocBasedVersionConstraintsProcessorFactory` is to configure it in `solrconfig.xml` as part of the <<update-request-processors.adoc#update-request-processor-configuration,UpdateRequestProcessorChain>> and specify the name of your custom `versionField` in your schema that should be checked when validating updates:+The basic usage of `DocBasedVersionConstraintsProcessorFactory` is to configure it in `solrconfig.xml` as part of the xref:configuration-guide:update-request-processors.adoc#update-request-processor-configuration[UpdateRequestProcessorChain] and specify the name of your custom `versionField` in your schema that should be checked when validating updates:[source,xml]----diff --git a/solr/solr-ref-guide/src/phonetic-matching.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/phonetic-matching.adocsimilarity index 85%rename from solr/solr-ref-guide/src/phonetic-matching.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/phonetic-matching.adocindex 04ab0af7ed5..2f6fd1365b9 100644--- a/solr/solr-ref-guide/src/phonetic-matching.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/phonetic-matching.adoc@@ -22,7 +22,7 @@ For overviews of and comparisons between algorithms, see http://en.wikipedia.org== Beider-Morse Phonetic Matching (BMPM)-For examples of how to use this encoding in your analyzer, see <<filters.adoc#beider-morse-filter,Beider Morse Filter>> in the Filter Descriptions section.+For examples of how to use this encoding in your analyzer, see xref:filters.adoc#beider-morse-filter[Beider Morse Filter] in the Filter Descriptions section.Beider-Morse Phonetic Matching (BMPM) is a "soundalike" tool that lets you search using a new phonetic matching system.BMPM helps you search for personal names (or just surnames) in a Solr/Lucene index, and is far superior to the existing phonetic codecs, such as regular soundex, metaphone, caverphone, etc.@@ -65,7 +65,7 @@ For more information, see here: http://stevemorse.org/phoneticinfo.htm and http:== Daitch-Mokotoff Soundex-To use this encoding in your analyzer, see <<filters.adoc#daitch-mokotoff-soundex-filter,Daitch-Mokotoff Soundex Filter>> in the Filter Descriptions section.+To use this encoding in your analyzer, see xref:filters.adoc#daitch-mokotoff-soundex-filter[Daitch-Mokotoff Soundex Filter] in the Filter Descriptions section.The Daitch-Mokotoff Soundex algorithm is a refinement of the Russel and American Soundex algorithms, yielding greater accuracy in matching especially Slavic and Yiddish surnames with similar pronunciation but differences in spelling.@@ -82,15 +82,16 @@ For more information, see http://en.wikipedia.org/wiki/Daitch%E2%80%93Mokotoff_S== Double Metaphone-To use this encoding in your analyzer, see <<filters.adoc#double-metaphone-filter,Double Metaphone Filter>> in the Filter Descriptions section.-Alternatively, you may specify `encoder="DoubleMetaphone"` with the <<filters.adoc#phonetic-filter,Phonetic Filter>>, but note that the Phonetic Filter version will *not* provide the second ("alternate") encoding that is generated by the Double Metaphone Filter for some tokens.+To use this encoding in your analyzer, see xref:filters.adoc#double-metaphone-filter[Double Metaphone Filter] in the Filter Descriptions section.++Alternatively, you may specify `encoder="DoubleMetaphone"` with the xref:filters.adoc#phonetic-filter[Phonetic Filter], but note that the Phonetic Filter version will *not* provide the second ("alternate") encoding that is generated by the Double Metaphone Filter for some tokens.Encodes tokens using the double metaphone algorithm by Lawrence Philips.See the original article at http://www.drdobbs.com/the-double-metaphone-search-algorithm/184401251?pgno=2== Metaphone-To use this encoding in your analyzer, specify `encoder="Metaphone"` with the <<filters.adoc#phonetic-filter,Phonetic Filter>>.+To use this encoding in your analyzer, specify `encoder="Metaphone"` with the xref:filters.adoc#phonetic-filter[Phonetic Filter].Encodes tokens using the Metaphone algorithm by Lawrence Philips, described in "Hanging on the Metaphone" in Computer Language, Dec. 1990.@@ -99,7 +100,7 @@ Another reference for more information is http://www.drdobbs.com/the-double-meta== Soundex-To use this encoding in your analyzer, specify `encoder="Soundex"` with the <<filters.adoc#phonetic-filter,Phonetic Filter>>.+To use this encoding in your analyzer, specify `encoder="Soundex"` with the xref:filters.adoc#phonetic-filter[Phonetic Filter].Encodes tokens using the Soundex algorithm, which is used to relate similar names, but can also be used as a general purpose scheme to find words with similar phonemes.@@ -107,7 +108,7 @@ See also http://en.wikipedia.org/wiki/Soundex.== Refined Soundex-To use this encoding in your analyzer, specify `encoder="RefinedSoundex"` with the <<filters.adoc#phonetic-filter,Phonetic Filter>>.+To use this encoding in your analyzer, specify `encoder="RefinedSoundex"` with xref:filters.adoc#phonetic-filter[Phonetic Filter].Encodes tokens using an improved version of the Soundex algorithm.@@ -115,7 +116,7 @@ See http://en.wikipedia.org/wiki/Soundex.== Caverphone-To use this encoding in your analyzer, specify `encoder="Caverphone"` with the <<filters.adoc#phonetic-filter,Phonetic Filter>>.+To use this encoding in your analyzer, specify `encoder="Caverphone"` with the xref:filters.adoc#phonetic-filter[Phonetic Filter].Caverphone is an algorithm created by the Caversham Project at the University of Otago.The algorithm is optimised for accents present in the southern part of the city of Dunedin, New Zealand.@@ -124,7 +125,7 @@ See http://en.wikipedia.org/wiki/Caverphone and the Caverphone 2.0 specification== Kölner Phonetik a.k.a. Cologne Phonetic-To use this encoding in your analyzer, specify `encoder="ColognePhonetic"` with the <<filters.adoc#phonetic-filter,Phonetic Filter>>.+To use this encoding in your analyzer, specify `encoder="ColognePhonetic"` with the xref:filters.adoc#phonetic-filter[Phonetic Filter].The Kölner Phonetik, an algorithm published by Hans Joachim Postel in 1969, is optimized for the German language.@@ -132,7 +133,7 @@ See http://de.wikipedia.org/wiki/K%C3%B6lner_Phonetik== NYSIIS-To use this encoding in your analyzer, specify `encoder="Nysiis"` with the <<filters.adoc#phonetic-filter,Phonetic Filter>>.+To use this encoding in your analyzer, specify `encoder="Nysiis"` with the xref:filters.adoc#phonetic-filter[Phonetic Filter].NYSIIS is an encoding used to relate similar names, but can also be used as a general purpose scheme to find words with similar phonemes.diff --git a/solr/solr-ref-guide/src/post-tool.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/post-tool.adocsimilarity index 97%rename from solr/solr-ref-guide/src/post-tool.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/post-tool.adocindex d02facb9bbb..f2d303b5abc 100644--- a/solr/solr-ref-guide/src/post-tool.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/post-tool.adoc@@ -121,7 +121,7 @@ bin/post -c signals -params "separator=%09" -type text/csv data.tsv----The content type (`-type`) parameter is required to treat the file as the proper type, otherwise it will be ignored and a WARNING logged as it does not know what type of content a .tsv file is.-The <<indexing-with-update-handlers.adoc#csv-formatted-index-updates,CSV handler>> supports the `separator` parameter, and is passed through using the `-params` setting.+The xref:indexing-with-update-handlers.adoc#csv-formatted-index-updates[CSV handler] supports the `separator` parameter, and is passed through using the `-params` setting.=== Indexing JSONdiff --git a/solr/solr-ref-guide/src/reindexing.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/reindexing.adocsimilarity index 88%rename from solr/solr-ref-guide/src/reindexing.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/reindexing.adocindex 070d50c52b7..7b0bf113ad3 100644--- a/solr/solr-ref-guide/src/reindexing.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/reindexing.adoc@@ -27,7 +27,7 @@ It is strongly recommended that Solr users have a consistent, repeatable process[CAUTION]====-Re-ingesting all the documents in your corpus without first insuring that all documents and Lucene segments have been deleted is *not* sufficient, see the section <<reindexing.adoc#reindexing-strategies,Reindexing Strategies>>.+Re-ingesting all the documents in your corpus without first insuring that all documents and Lucene segments have been deleted is *not* sufficient, see the section <<Reindexing Strategies>>.====Reindexing is recommended during major upgrades, so in addition to covering what types of configuration changes should trigger a reindex, this section will also cover strategies for reindexing.@@ -57,7 +57,7 @@ This type of change is usually only made during or because of a major upgrade.When you change your schema by adding fields, removing fields, or changing the field or field type definitions you generally do so with the intent that those changes alter how documents are searched.The full effects of those changes are not reflected in the corpus as a whole until all documents are reindexed.-Changes to *any* field/field type property described in <<field-type-definitions-and-properties.adoc#field-type-properties,Field Type Properties>> must be reindexed in order for the change to be reflected in _all_ documents.+Changes to *any* field/field type property described in xref:field-type-definitions-and-properties.adoc#field-type-properties[Field Type Properties] must be reindexed in order for the change to be reflected in _all_ documents.[CAUTION]====@@ -69,7 +69,7 @@ Negative impacts on the user may not be immediately apparent.==== Changing Field Analysis-Beyond specific field-level properties, <<analyzers.adoc#,analysis chains>> are also configured on field types, and are applied at index and query time.+Beyond specific field-level properties, xref:analyzers.adoc[analysis chains] are also configured on field types, and are applied at index and query time.If separate analysis chains are defined for query and indexing events for a field and you change _only_ the query-time analysis chain, reindexing is not necessary.@@ -80,11 +80,11 @@ Identifying changes to solrconfig.xml that alter how data is ingested and thus rThe general rule is "anything that changes what gets stored in the index requires reindexing".Here are several known examples.-The parameter `luceneMatchVersion` in solrconfig.xml controls the compatibility of Solr with Lucene.+The parameter `luceneMatchVersion` in `solrconfig.xml` controls the compatibility of Solr with Lucene.Since this parameter can change the rules for analysis behind the scenes, it's always recommended to reindex when changing it.Usually this is only changed in conjunction with a major upgrade.-If you make a change to Solr's <<update-request-processors.adoc#,Update Request Processors>>, it's generally because you want to change something about how _update requests_ (documents) are _processed_ (indexed).+If you make a change to Solr's xref:configuration-guide:update-request-processors.adoc[], it's generally because you want to change something about how _update requests_ (documents) are _processed_ (indexed).In this case, we recommend that you reindex your documents to implement the changes you've made just as if you had changed the schema.Similarly, if you change the `codecFactory` parameter in `solrconfig.xml`, it is again strongly recommended that you@@ -139,7 +139,7 @@ It's important to verify that *all* documents have been deleted, as that ensuresdeleted as well.To verify that there are no segments in your index, look in the data/index directory and confirm it has no segments files.-Since the data directory can be customized, see the section <<index-location-format.adoc#specifying-a-location-for-index-data-with-the-datadir-parameter,Specifying a Location for Index Data with the dataDir Parameter>> for the location of your index files.+Since the data directory can be customized, see the section xref:configuration-guide:index-location-format.adoc#specifying-a-location-for-index-data-with-the-datadir-parameter[Specifying a Location for Index Data with the dataDir Parameter] for the location of your index files.Note you will need to verify the indexes have been removed in every shard and every replica on every node of a cluster.It is not sufficient to only query for the number of documents because you may have no documents but still have index@@ -152,14 +152,14 @@ A variation on this approch is to delete and recreate your collection using the=== Index to Another Collection-Another approach is to use index to a new collection and use Solr's <<alias-management.adoc#createalias,collection alias>> feature to seamlessly point the application to a new collection without downtime.+Another approach is to use index to a new collection and use Solr's xref:deployment-guide:alias-management.adoc#createalias[collection alias] feature to seamlessly point the application to a new collection without downtime.This option is only available for Solr installations running in SolrCloud mode.With this approach, you will index your documents into a new collection that uses your changes and, once indexing and testing are complete, create an alias that points your front-end at the new collection.From that point, new queries and updates will be routed to the new collection seamlessly.-Once the alias is in place and you are satisfied you no longer need the old data, you can delete the old collection with the Collections API <<collection-management.adoc#delete,DELETE command>>.+Once the alias is in place and you are satisfied you no longer need the old data, you can delete the old collection with the Collections API xref:deployment-guide:collection-management.adoc#delete[DELETE command].[NOTE]One advantage of this option is that if you you can switch back to the old collection if you discover problems our testing did not uncover.diff --git a/solr/solr-ref-guide/src/schema-api.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/schema-api.adocsimilarity index 96%rename from solr/solr-ref-guide/src/schema-api.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/schema-api.adocindex b73f082a920..c58ec6421d8 100644--- a/solr/solr-ref-guide/src/schema-api.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/schema-api.adoc@@ -24,7 +24,7 @@ Fields, dynamic fields, field types and copyField rules may be added, removed orFuture Solr releases will extend write access to allow more schema elements to be modified.The Schema API utilizes the `ManagedIndexSchemaFactory` class, which is the default schema factory in modern Solr versions.-See the section <<schema-factory.adoc#,Schema Factory Definition in SolrConfig>> for more information about choosing a schema factory for your index.+See the section xref:configuration-guide:schema-factory.adoc[] for more information about choosing a schema factory for your index..Hand editing of the managed schema is discouraged[NOTE]@@ -55,7 +55,7 @@ You must reindex documents in order to apply schema changes to them.Queries and updates made after the change may encounter errors that were not present before the change.Completely deleting the index and rebuilding it is usually the only option to fix such errors.-See the section <<reindexing.adoc#,Reindexing>> for more information about reindexing.+See the section xref:reindexing.adoc[] for more information about reindexing.====All of the examples in this section assume you are running the "techproducts" Solr example:@@ -96,7 +96,7 @@ The `add-field` command adds a new field definition to your schema.If a field with the same name exists an error is thrown.All of the properties available when defining a field with manual schema edits can be passed via the API.-These request attributes are described in detail in the section <<fields.adoc#,Fields>>.+These request attributes are described in detail in the section xref:fields.adoc[].For example, to define a new stored field named "sell_by", of type "pdate", you would POST the following request:@@ -170,7 +170,7 @@ Note that you must supply the full definition for a field - this command will *nIf the field does not exist in the schema an error is thrown.All of the properties available when defining a field with manual schema edits can be passed via the API.-These request attributes are described in detail in the section <<fields.adoc#,Fields>>.+These request attributes are described in detail in the section xref:fields.adoc[].For example, to replace the definition of an existing field "sell_by", to make it be of type "date" and to not be stored, you would POST the following request:@@ -210,7 +210,7 @@ curl -X POST -H 'Content-type:application/json' --data-binary '{The `add-dynamic-field` command adds a new dynamic field rule to your schema.All of the properties available when editing the schema can be passed with the POST request.-The section <<dynamic-fields.adoc#,Dynamic Fields>> has details on all of the attributes that can be defined for a dynamic field rule.+The section xref:dynamic-fields.adoc[] has details on all of the attributes that can be defined for a dynamic field rule.For example, to create a new dynamic field rule where all incoming fields ending with "_s" would be stored and have field type "string", you can POST a request like this:@@ -284,7 +284,7 @@ Note that you must supply the full definition for a dynamic field rule - this coIf the dynamic field rule does not exist in the schema an error is thrown.All of the properties available when editing the schema can be passed with the POST request.-The section <<dynamic-fields.adoc#,Dynamic Fields>> has details on all of the attributes that can be defined for a dynamic field rule.+The section xref:dynamic-fields.adoc[] has details on all of the attributes that can be defined for a dynamic field rule.For example, to replace the definition of the "*_s" dynamic field rule with one where the field type is "text_general" and it's not stored, you can POST a request like this:@@ -325,7 +325,7 @@ The `add-field-type` command adds a new field type to your schema.All of the field type properties available when editing the schema by hand are available for use in a POST request.The structure of the command is a JSON mapping of the standard field type definition, including the name, class, index and query analyzer definitions, etc.-Details of all of the available options are described in the section <<field-types.adoc#,Field Types>>.+Details of all of the available options are described in the section xref:field-type-definitions-and-properties.adoc[].For example, to create a new field type named "myNewTxtField", you can POST a request as follows:@@ -444,7 +444,7 @@ If the field type does not exist in the schema an error is thrown.All of the field type properties available when editing the schema by hand are available for use in a POST request.The structure of the command is a JSON mapping of the standard field type definition, including the name, class, index and query analyzer definitions, etc.-Details of all of the available options are described in the section <<field-types.adoc#,Field Types>>.+Details of all of the available options are described in the section xref:field-type-definitions-and-properties.adoc[].For example, to replace the definition of a field type named "myNewTxtField", you can make a POST request as follows:@@ -517,7 +517,7 @@ A field or an array of fields to which the source field will be copied.|===+The upper limit for the number of characters to be copied.-The section <<copy-fields.adoc#,Copy Fields>> has more details.+The section xref:copy-fields.adoc[] has more details.For example, to define a rule to copy the field "shelf" to the "location" and "catchall" fields, you would POST the following request:@@ -944,7 +944,7 @@ The output will include each field and any defined configuration for each field.The defined configuration can vary for each field, but will minimally include the field `name`, the `type`, if it is `indexed` and if it is `stored`.If `multiValued` is defined as either true or false (most likely true), that will also be shown.-See the section <<fields.adoc#,Fields>> for more information about each parameter.+See the section xref:fields.adoc[] for more information about each parameter.==== List Fields Examples@@ -1060,7 +1060,7 @@ If `false`, only explicitly specified field properties will be included.The output will include each dynamic field rule and the defined configuration for each rule.The defined configuration can vary for each rule, but will minimally include the dynamic field `name`, the `type`, if it is `indexed` and if it is `stored`.-See the section <<dynamic-fields.adoc#,Dynamic Fields>> for more information about each parameter.+See the section xref:dynamic-fields.adoc[] for more information about each parameter.==== List Dynamic Field Examples@@ -1189,7 +1189,7 @@ If `false`, only explicitly specified field properties will be included.The output will include each field type and any defined configuration for the type.The defined configuration can vary for each type, but will minimally include the field type `name` and the `class`.If query or index analyzers, tokenizers, or filters are defined, those will also be shown with other defined parameters.-See the section <<field-types.adoc#,Field Types>> for more information about how to configure various types of fields.+See the section xref:field-type-definitions-and-properties.adoc[] for more information about how to configure various types of fields.==== List Field Type Examples@@ -1312,7 +1312,7 @@ If not specified, all copyField-s will be included in the response.==== List Copy Field ResponseThe output will include the `source` and `dest` (destination) of each copy field rule defined in `schema.xml`.-For more information about copy fields, see the section <<copy-fields.adoc#,Copy Fields>>.+For more information about copy fields, see the section xref:copy-fields.adoc[].==== List Copy Field Examples@@ -1649,6 +1649,5 @@ curl -X GET "http://localhost:8983/api/collections/techproducts/schema/similarit== Manage Resource Data-The <<managed-resources.adoc#,Managed Resources>> REST API provides a mechanism for any Solr plugin to expose resources that should support CRUD (Create, Read, Update, Delete) operations.+The xref:configuration-guide:managed-resources.adoc[] REST API provides a mechanism for any Solr plugin to expose resources that should support CRUD (Create, Read, Update, Delete) operations.Depending on which field types and analyzers are configured in your Schema, additional `/schema/` REST API paths may exist.-See the <<managed-resources.adoc#,Managed Resources>> section for more information and examples.diff --git a/solr/solr-ref-guide/src/schema-browser-screen.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/schema-browser-screen.adocsimilarity index 81%rename from solr/solr-ref-guide/src/schema-browser-screen.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/schema-browser-screen.adocindex 5ceab10f727..1502eb176b6 100644--- a/solr/solr-ref-guide/src/schema-browser-screen.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/schema-browser-screen.adoc@@ -22,9 +22,9 @@ If you have accessed this window from the Analysis screen, it will be opened toIf there is nothing chosen, use the pull-down menu to choose the field or field type..Schema Browser Screen-image::images/schema-browser-screen/schema_browser_terms.png[image,height=400]+image::schema-browser-screen/schema_browser_terms.png[image,height=400]-The screen provides a great deal of useful information about each particular field and fieldtype in the Schema, and provides a quick UI for adding fields or fieldtypes using the <<schema-api.adoc#,Schema API>> (if enabled).+The screen provides a great deal of useful information about each particular field and fieldtype in the Schema, and provides a quick UI for adding fields or fieldtypes using the xref:schema-api.adoc[] (if enabled).In the example above, we have chosen the `cat` field.On the left side of the main view window, we see the field name, that it is copied to the `\_text_` (because of a copyField rule) and that it uses the `strings` fieldtype.Click on one of those field or fieldtype names, and you can see the corresponding definitions.@@ -32,18 +32,18 @@ Click on one of those field or fieldtype names, and you can see the correspondinIn the right part of the main view, we see the specific properties of how the `cat` field is defined – either explicitly or implicitly via its fieldtype, as well as how many documents have populated this field.Then we see the analyzer used for indexing and query processing.Click the icon to the left of either of those, and you'll see the definitions for the tokenizers and/or filters that are used.-The output of these processes is the information you see when testing how content is handled for a particular field with the <<analysis-screen.adoc#,Analysis Screen>>.+The output of these processes is the information you see when testing how content is handled for a particular field with the xref:analysis-screen.adoc[].Under the analyzer information is a button to *Load Term Info*.Clicking that button will show the top _N_ terms that are in a sample shard for that field, as well as a histogram showing the number of terms with various frequencies.-Click on a term, and you will be taken to the <<query-screen.adoc#,Query Screen>> to see the results of a query of that term in that field.+Click on a term, and you will be taken to the xref:query-guide:query-screen.adoc[] to see the results of a query of that term in that field.If you want to always see the term information for a field, choose *Autoload* and it will always appear when there are terms for a field.A histogram shows the number of terms with a given frequency in the field.[IMPORTANT]====Term Information is loaded from single arbitrarily selected core from the collection, to provide a representative sample for the collection.-Full <<faceting.adoc#,Field Facet>> query results are needed to see precise term counts across the entire collection.+Full xref:query-guide:faceting.adoc[Field Facet] query results are needed to see precise term counts across the entire collection.====-For programmatic access to the underlying information in this screen please reference the <<luke-request-handler.adoc#,Luke Request Handler>>+For programmatic access to the underlying information in this screen please reference the xref:luke-request-handler.adoc[].diff --git a/solr/solr-ref-guide/src/schema-designer.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/schema-designer.adocsimilarity index 86%rename from solr/solr-ref-guide/src/schema-designer.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/schema-designer.adocindex a9a09e5d56b..c01893944ac 100644--- a/solr/solr-ref-guide/src/schema-designer.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/schema-designer.adoc@@ -20,7 +20,7 @@The Schema Designer screen lets you interactively design a new schema using sample data..Schema Designer screen-image::images/solr-admin-ui/schema-designer.png[image]+image::getting-started:solr-admin-ui/schema-designer.png[image]There are a number of panels on the Schema Designer screen to provide immediate feedback when you make changes to the schema, including:@@ -35,17 +35,17 @@ You can safely experiment with changes and see the impact on query results immedOnce data is indexed using a published schema, there are severe restrictions on the type of changes you can make to the schema without needing a full re-index.When designing a new schema, the Schema Designer re-indexes your sample data automatically when you make changes. However, the designer does not re-index data in collections using a published schema.-.Security Requirements+.Authorization Requirements[NOTE]====-If the <<rule-based-authorization-plugin.adoc#,Rule-based Authorization Plugin>> is enabled for your Solr installation, then users need to have the `config-edit` and `config-read` permissions to use the Schema Designer.+If the xref:deployment-guide:rule-based-authorization-plugin.adoc[] is enabled for your Solr installation, then users need to have the `config-edit` and `config-read` permissions to use the Schema Designer.====== Getting StartedUpon entering the Schema Designer for the first time, you'll be prompted to create a New Schema.-image::images/schema-designer/new-schema.png[image,width=500]+image::schema-designer/new-schema.png[image,width=500]Choose a short name that reflects the intended use case for your new schema. You'll need to choose a source schema to copy as the starting point for your new schema.Solr includes a `_default` schema which provides a good starting place for building a custom schema for your search application.@@ -54,7 +54,7 @@ Once a schema is published, it can be used to create new schemas and will be lisOnce you create the new schema, the next step is to upload or paste a sample of the data you intend to index into Solr.The Schema Designer supports JSON, CSV, TSV, XML, and JSON lines (jsonl).-image::images/schema-designer/analyze-sample-docs.png[image,width=400]+image::schema-designer/analyze-sample-docs.png[image,width=400]The advantage of pasting sample documents into the text area is that you can edit the sample and see the impact of your changes immediately in the analyzed schema.The upload feature is useful if you have large or many sample documents; the Schema Designer API allows up to 1,000 sample documents or a max of 5MB upload, but in most cases you only need a handful of documents to get started.@@ -63,14 +63,14 @@ Click on the btn:[Analyze Documents] button to submit the sample documents to th=== Temporary Configset and Collection-Behind the scenes, the Schema Designer API creates a temporary <<config-sets.adoc#,Configset>> (schema + solrconfig.xml + supporting files) in Zookeeper.+Behind the scenes, the Schema Designer API creates a temporary xref:configuration-guide:config-sets.adoc[] (schema + `solrconfig.xml` + supporting files) in Zookeeper.In addition, the Schema Designer API creates a temporary collection with a single shard and replica to hold sample documents.These temporary resources are persisted to disk and exist until the schema is published or manually deleted using the Schema Designer API cleanup endpoint (`/api/schema-designer/cleanup`).If you close your browser screen while designing a new schema, it will be available when you return.Simply choose the name of the schema you created previously in the select box and your schema will load into the designer UI.-image::images/schema-designer/reload-schema.png[image,width=400]+image::schema-designer/reload-schema.png[image,width=400]Previously uploaded sample documents are indexed in the temporary collection even though they do not display in the text area.@@ -116,16 +116,16 @@ After sending the sample documents to the Schema Designer backend, you can open[NOTE]====The Schema Designer API is primarily intended to support an interactive experience in the UI vs. being used programmatically by developers.-To create and manage Configsets and Schemas programmatically, see the <<configsets-api.adoc#,Configset>> and <<schema-api.adoc#,Schema>> APIs.+To create and manage Configsets and Schemas programmatically, see the sections xref:configuration-guide:configsets-api.adoc[] and xref:schema-api.adoc[].====== Schema EditorAfter analyzing your sample documents, the Schema Designer loads the schema in the *Schema Editor* in the middle panel.The editor renders the schema as a tree component composed of Fields, Dynamic Fields, Field Types, and Files.-For more information about schema objects, see <<fields-and-schema-design.adoc#,Fields and Schema Design>>.+For more information about schema objects, see xref:fields.adoc[].-image::images/schema-designer/schema-editor-root.png[image,width=700]+image::schema-designer/schema-editor-root.png[image,width=700].Schema vs. Configset[NOTE]@@ -137,10 +137,10 @@ Consequently, the Schema Designer focuses primarily on the schema aspects of a CWhen you click on the root node of the Schema Editor tree, you can refine top-level schema properties, including:-* Languages: The `_default` schema includes text fields for a number of common languages. You can include all text analyzers in your schema or select a subset based on the languages your search application needs to support. The designer will remove all the unnecessary field types for languages you don't need. For more information about text analysis and languages, see: <<language-analysis.adoc#,Language Analysis>>-* Dynamic fields allow Solr to index fields that you did not explicitly define in your schema. Dynamic fields can make your application less brittle by providing some flexibility in the documents you can add to Solr. It is recommended to keep the default set of dynamic fields enabled for your schema. Unchecking this option removes all dynamic fields from your schema. For more information about dynamic fields, see: <<dynamic-fields.adoc#,Dynamic Fields>>-* Field guessing (aka "schemaless mode") allows Solr to detect the "best" field type for unknown fields encountered during indexing. Field guessing also performs some field transformations, such as removing spaces from field names. If you use the schema designer to create your schema based on sample documents, you may not need to enable this feature. However, with this feature disabled, you need to make sure the incoming data matches the schema exactly or indexing errors may occur. For more information about schemaless mode, see: <<schemaless-mode.adoc#,Schemaless Mode>>-* Enabling this feature adds the `_root_` and `_nest_path_` fields to your schema. For more information about indexing nested child documents, see: <<indexing-nested-documents.adoc#,Indexing Nested Documents>>+* Languages: The `_default` schema includes text fields for a number of common languages. You can include all text analyzers in your schema or select a subset based on the languages your search application needs to support. The designer will remove all the unnecessary field types for languages you don't need. For more information about text analysis and languages, see xref:language-analysis.adoc[].+* Dynamic fields allow Solr to index fields that you did not explicitly define in your schema. Dynamic fields can make your application less brittle by providing some flexibility in the documents you can add to Solr. It is recommended to keep the default set of dynamic fields enabled for your schema. Unchecking this option removes all dynamic fields from your schema. For more information about dynamic fields, see xref:dynamic-fields.adoc[].+* Field guessing (aka "schemaless mode") allows Solr to detect the "best" field type for unknown fields encountered during indexing. Field guessing also performs some field transformations, such as removing spaces from field names. If you use the schema designer to create your schema based on sample documents, you may not need to enable this feature. However, with this feature disabled, you need to make sure the incoming data matches the schema exactly or indexing errors may occur. For more information about schemaless mode, see xref:schemaless-mode.adoc[].+* Enabling this feature adds the `_root_` and `_nest_path_` fields to your schema. For more information about indexing nested child documents, see xref:indexing-nested-documents.adoc[].Only make changes to these top-level schema properties when you fully understand how they impact the behavior of your search application.When first starting out, you can leave the default settings and focus your attention on the fields and field types in the schema.@@ -148,18 +148,18 @@ When first starting out, you can leave the default settings and focus your atten=== Schema FieldsClick on the *Fields* node in the editor tree to see an overview of the fields in your schema,-along with the <<field-type-definitions-and-properties.adoc#,properties>> that govern how the field will be indexed by Solr.+along with the xref:field-type-definitions-and-properties.adoc[properties] that govern how the field will be indexed by Solr.-image::images/schema-designer/schema-editor-fields.png[image,width=750]+image::schema-designer/schema-editor-fields.png[image,width=750]If there are many fields in your schema, you can filter the displayed fields by type or feature using the filters at the top of the tree.For instance, to filter fields with `docValues` enabled, choose `feature` and then `docValues` with `enabled` checked.-image::images/schema-designer/field-filters.png[image,width=500]+image::schema-designer/field-filters.png[image,width=500]To edit a field, click on the name of the field in the tree to load the field information in the main editor panel to the right of the tree.-image::images/schema-designer/schema-editor-update.png[image,width=750]+image::schema-designer/schema-editor-update.png[image,width=750][TIP]====@@ -170,7 +170,7 @@ After making the desired changes, click on the btn:[Update Field] button. The ScSome changes, such as changing a single-valued `docValues` field to multi-valued, may require the underlying Lucene index to be deleted and rebuilt from scratch.The Schema Designer will warn you when your change requires a full rebuild.-image::images/schema-designer/incompat-change.png[image,width=450]+image::schema-designer/incompat-change.png[image,width=450]Moreover, if you change a field to an incompatible type based on the sample data, the designer will undo the changes automatically.For instance, changing a field with text data to a numeric type will be rejected by the designer.@@ -188,17 +188,18 @@ The Schema Designer does not support deleting fields from the schema.When you select a text-based field in the tree, the *Text Analysis* panel shows how the text from a sample document gets analyzed for indexing.-image::images/schema-designer/text-analysis.png[image,width=600]+image::schema-designer/text-analysis.png[image,width=600]-If you need to change the text analysis strategy for a field, you need to edit the Field Type. For more information about text analysis, see: <<analyzers.adoc#,Analyzers>>.+If you need to change the text analysis strategy for a field, you need to edit the Field Type. For more information about text analysis, see xref:analyzers.adoc[].== Query TesterThe *Query Tester* panel lets you experiment with queries executed against your sample document set using the current schema.+Using the Query Tester, you can see how changes to the schema impact the behavior of queries, such as matching, sorting, faceting, and highlighting.-The Query Tester form is not intended to demonstrate all possible <<query-guide.adoc#,query features>> available in Solr.+The Query Tester form is not intended to demonstrate all possible query features available in Solr.-image::images/schema-designer/query-tester.png[image]+image::schema-designer/query-tester.png[image]Whenever you make a change to the schema, the query tester form is re-submitted to refresh the query results.This helps inform you about matching issues where a test query should find a sample document but doesn't return the correct results,@@ -215,7 +216,7 @@ Similarly, the tester form lists all fields that you can compute facets for; ifClick on the btn:[Show Changes] button to view a report of the changes made to the schema during the current editing session.The un-published changes are compared to either the original schema you copied from (such as `_default`) or the published schema.-image::images/schema-designer/show-changes.png[image,width=600]+image::schema-designer/show-changes.png[image,width=600]You need to take care when changing schemas that have already been published if there are collections with data indexed using the schema.@@ -225,7 +226,7 @@ Publishing a new schema makes it available for use when creating new collectionswill be affected by the publish action; of course there will not be any impacted collections for new schemas. You may also create a newcollection during publishing that uses the new schema and choose whether to index your sample documents in the new collection.-image::images/schema-designer/publish.png[image,width=450]+image::schema-designer/publish.png[image,width=450]You can also choose to prevent future changes to this schema by the Schema Designer. However, this setting only applies to the Schema Designer UIand does not prevent someone from changing the schema using the Schema API directly.@@ -233,4 +234,4 @@ and does not prevent someone from changing the schema using the Schema API direcOnce the publish action completes, the temporary Configset and collection are deleted and the Schema Designer UI resets back to a fresh state.Alternatively, instead of publishing to Zookeeper, you can also download the Configset to a zip file containing the schema, solrconfig.xml, and supporting files.-The zip file can be uploaded to other Solr instances using the <<configsets-api.adoc#,Configset API>> or saved in version control.+The zip file can be uploaded to other Solr instances using the xref:configuration-guide:configsets-api.adoc[] or saved in version control.diff --git a/solr/solr-ref-guide/src/schema-elements.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/schema-elements.adocsimilarity index 87%rename from solr/solr-ref-guide/src/schema-elements.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/schema-elements.adocindex 6e19834cc41..abb1b7492cf 100644--- a/solr/solr-ref-guide/src/schema-elements.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/schema-elements.adoc@@ -21,12 +21,12 @@ Solr stores details about the field types and fields it is expected to understan== Solr's Schema FileThe name and location of Solr's schema file may vary depending on how you initially configured Solr or if you modified it later.-* `managed-schema.xml` is the name for the schema file Solr uses by default to support making schema changes at runtime via the <<schema-api.adoc#,Schema API>>, or <<schemaless-mode.adoc#,Schemaless Mode>> features.+* `managed-schema.xml` is the name for the schema file Solr uses by default to support making schema changes at runtime via the xref:schema-api.adoc[], or xref:schemaless-mode.adoc[] features.+-You may <<schema-factory.adoc#,explicitly configure the managed schema features>> to use an alternative filename if you choose, but the contents of the files are still updated automatically by Solr.-* `schema.xml` is the traditional name for a schema file which can be edited manually by users who use the <<schema-factory.adoc#,`ClassicIndexSchemaFactory`>>.+You may xref:configuration-guide:schema-factory.adoc[explicitly configure] the managed schema features to use an alternative filename if you choose, but the contents of the files are still updated automatically by Solr.+* `schema.xml` is the traditional name for a schema file which can be edited manually by users who use the xref:configuration-guide:schema-factory.adoc#classicindexschemafactory[`ClassicIndexSchemaFactory`].* If you are using SolrCloud you may not be able to find any file by these names on the local filesystem.-You will only be able to see the schema through the Schema API (if enabled) or through the Solr Admin UI's <<cloud-screens.adoc#,Cloud Screens>>.+You will only be able to see the schema through the Schema API (if enabled) or through the Solr Admin UI's xref:deployment-guide:cloud-screens.adoc[].Whichever name of the file in use in your installation, the structure of the file is not changed.However, the way you interact with the file will change.@@ -34,7 +34,7 @@ If you are using the managed schema, it is expected that you only interact withIf you do not use the managed schema, you will only be able to make manual edits to the file, the Schema API will not support any modifications.Note that if you are not using the Schema API yet you do use SolrCloud, you will need to interact with the schema file through ZooKeeper using `upconfig` and `downconfig` commands to make a local copy and upload your changes.-The options for doing this are described in <<solr-control-script-reference.adoc#,Solr Control Script Reference>> and <<zookeeper-file-management.adoc#,ZooKeeper File Management>>.+The options for doing this are described in xref:deployment-guide:solr-control-script-reference.adoc[] and xref:deployment-guide:zookeeper-file-management.adoc[].== Structure of the Schema File@@ -55,13 +55,13 @@ This example is not real XML, but shows the primary elements that make up a sche----The most commonly defined elements are `types` and `fields`, where the field types and the actual fields are configured.-The sections <<field-types.adoc#,Field Types>>, and <<fields.adoc#,Fields>> describe how to configure these for your schema.+The sections xref:field-type-definitions-and-properties.adoc[], and xref:fields.adoc[] describe how to configure these for your schema.-These are supplemented by `copyFields`, described in <<copy-fields.adoc#,Copy Fields>>, and `dynamicFields`, described in <<dynamic-fields.adoc#,Dynamic Fields>>.+These are supplemented by `copyFields`, described in xref:copy-fields.adoc[], and `dynamicFields`, described in xref:dynamic-fields.adoc[].The `uniqueKey` described in <<Unique Key>> below must always be defined.-A default `similarity` will be used, but can be modifed as described in the section <<Similarity>> below.+A default `similarity` will be used, but can be modified as described in the section <<Similarity>> below..Types and fields are optional tags[NOTE]diff --git a/solr/solr-ref-guide/src/schemaless-mode.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/schemaless-mode.adocsimilarity index 91%rename from solr/solr-ref-guide/src/schemaless-mode.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/schemaless-mode.adocindex 311b6779041..5e0884e850d 100644--- a/solr/solr-ref-guide/src/schemaless-mode.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/schemaless-mode.adoc@@ -21,13 +21,13 @@ Schemaless Mode is a set of Solr features that, when used together, allow usersThese Solr features, all controlled via `solrconfig.xml`, are:. Managed schema: Schema modifications are made at runtime through Solr APIs, which requires the use of a `schemaFactory` that supports these changes.-See the section <<schema-factory.adoc#,Schema Factory Definition in SolrConfig>> for more details.+See the section xref:configuration-guide:schema-factory.adoc[] for more details.. Field value class guessing: Previously unseen fields are run through a cascading set of value-based parsers, which guess the Java class of field values - parsers for Boolean, Integer, Long, Float, Double, and Date are currently available.-. Automatic schema field addition, based on field value class(es): Previously unseen fields are added to the schema, based on field value Java classes, which are mapped to schema field types - see <<field-types.adoc#,Field Types>>.+. Automatic schema field addition, based on field value class(es): Previously unseen fields are added to the schema, based on field value Java classes, which are mapped to schema field types - see xref:field-type-definitions-and-properties.adoc[].== Using the Schemaless Example-The three features of schemaless mode are pre-configured in the `_default` <<config-sets.adoc#,configset>> in the Solr distribution.+The three features of schemaless mode are pre-configured in the `_default` xref:configuration-guide:config-sets.adoc[configset] in the Solr distribution.To start an example instance of Solr using these configs, run the following command:[source,bash]@@ -37,7 +37,7 @@ bin/solr start -e schemalessThis will launch a single Solr server, and automatically create a collection (named "```gettingstarted```") that contains only three fields in the initial schema: `id`, `\_version_`, and `\_text_`.-You can use the `/schema/fields` <<schema-api.adoc#,Schema API>> to confirm this: `curl \http://localhost:8983/solr/gettingstarted/schema/fields` will output:+You can use the `/schema/fields` xref:schema-api.adoc[] to confirm this: `curl \http://localhost:8983/solr/gettingstarted/schema/fields` will output:[source,json]----@@ -74,9 +74,9 @@ If, however, you would like to implement schemaless on your own, you should make=== Enable Managed Schema-As described in the section <<schema-factory.adoc#,Schema Factory Definition in SolrConfig>>, Managed Schema support is enabled by default, unless your configuration specifies that `ClassicIndexSchemaFactory` should be used.+As described in the section xref:configuration-guide:schema-factory.adoc[], Managed Schema support is enabled by default, unless your configuration specifies that `ClassicIndexSchemaFactory` should be used.-You can configure the `ManagedIndexSchemaFactory` (and control the resource file used, or disable future modifications) by adding an explicit `<schemaFactory/>` like the one below, please see <<schema-factory.adoc#,Schema Factory Definition in SolrConfig>> for more details on the options available.+You can configure the `ManagedIndexSchemaFactory` (and control the resource file used, or disable future modifications) by adding an explicit `<schemaFactory/>` like the one below, please see xref:configuration-guide:schema-factory.adoc[] for more details on the options available.[source,xml]----@@ -88,7 +88,7 @@ You can configure the `ManagedIndexSchemaFactory` (and control the resource file=== Enable Field Class Guessing-In Solr, an <<update-request-processors.adoc#,UpdateRequestProcessorChain>> defines a chain of plugins that are applied to documents before or while they are indexed.+In Solr, an xref:configuration-guide:update-request-processors.adoc[UpdateRequestProcessorChain] defines a chain of plugins that are applied to documents before or while they are indexed.The field guessing aspect of Solr's schemaless mode uses a specially-defined UpdateRequestProcessorChain that allows Solr to guess field types.You can also define the default field type classes to use.@@ -203,7 +203,7 @@ Once the UpdateRequestProcessorChain has been defined, you must instruct your UpThere are two ways to do this.The update chain shown above has a `default=true` attribute which will use it for any update handler.-An alternative, more explicit way is to use <<initparams.adoc#,InitParams>> to set the defaults on all `/update` request handlers:+An alternative, more explicit way is to use xref:configuration-guide:initparams.adoc[] to set the defaults on all `/update` request handlers:[source,xml]----@@ -219,7 +219,7 @@ IMPORTANT: After all of these changes have been made, Solr should be restarted o=== Disabling Automatic Field GuessingAutomatic field creation can be disabled with the `update.autoCreateFields` property.-To do this, you can use <<solr-control-script-reference.adoc#set-or-unset-configuration-properties,`bin/solr config`>> with a command such as:+To do this, you can use xref:deployment-guide:solr-control-script-reference.adoc#set-or-unset-configuration-properties[`bin/solr config`] with a command such as:[source,bash]bin/solr config -c mycollection -p 8983 -action set-user-property -property update.autoCreateFields -value false@@ -304,9 +304,9 @@ In addition string versions of the text fields are indexed, using copyFields to.You Can Still Be Explicit[TIP]====-Even if you want to use schemaless mode for most fields, you can still use the <<schema-api.adoc#,Schema API>> to pre-emptively create some fields, with explicit types, before you index documents that use them.+Even if you want to use schemaless mode for most fields, you can still use the xref:schema-api.adoc[] to pre-emptively create some fields, with explicit types, before you index documents that use them.-Internally, the Schema API and the Schemaless Update Processors both use the same <<schema-factory.adoc#,Managed Schema>> functionality.+Internally, the Schema API and the Schemaless Update Processors both use the same xref:configuration-guide:schema-factory.adoc[Managed Schema] functionality.Also, if you do not need the `*_str` version of a text field, you can simply remove the `copyField` definition from the auto-generated schema and it will not be re-added since the original field is now defined.====diff --git a/solr/solr-ref-guide/src/tokenizers.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/tokenizers.adocsimilarity index 98%rename from solr/solr-ref-guide/src/tokenizers.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/tokenizers.adocindex 853ed398f1a..24d04ec1802 100644--- a/solr/solr-ref-guide/src/tokenizers.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/tokenizers.adoc@@ -31,7 +31,7 @@ It's also possible for more than one token to have the same position or refer toKeep this in mind if you use token metadata for things like highlighting search results in the field text.== About Tokenizers-You configure the tokenizer for a text field type in the <<solr-schema.adoc#,schema>> with a `<tokenizer>` element, as a child of `<analyzer>`:+You configure the tokenizer for a text field type in the xref:schema-elements.adoc[schema] with a `<tokenizer>` element, as a child of `<analyzer>`:[.dynamic-tabs]--@@ -549,7 +549,7 @@ The default configuration for `solr.ICUTokenizerFactory` provides UAX#29 word br[IMPORTANT]====-To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section <<solr-plugins.adoc#installing-plugins,Solr Plugins>>).+To use this tokenizer, you must add additional .jars to Solr's classpath (as described in the section xref:configuration-guide:solr-plugins.adoc#installing-plugins[Installing Plugins]).See the `solr/modules/analysis-extras/README.md` for information on which jars you need to add.====@@ -913,4 +913,4 @@ Valid values:== OpenNLP Tokenizer and OpenNLP Filters-See <<language-analysis.adoc#opennlp-integration,OpenNLP Integration>> for information about using the OpenNLP Tokenizer, along with information about available OpenNLP token filters.+See xref:language-analysis.adoc#opennlp-integration[OpenNLP Integration] for information about using the OpenNLP Tokenizer, along with information about available OpenNLP token filters.diff --git a/solr/solr-ref-guide/src/transforming-and-indexing-custom-json.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/transforming-and-indexing-custom-json.adocsimilarity index 98%rename from solr/solr-ref-guide/src/transforming-and-indexing-custom-json.adocrename to solr/solr-ref-guide/modules/indexing-guide/pages/transforming-and-indexing-custom-json.adocindex e1a2065250c..766ee74f5c2 100644--- a/solr/solr-ref-guide/src/transforming-and-indexing-custom-json.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/transforming-and-indexing-custom-json.adoc@@ -61,7 +61,7 @@ Wildcards can be used here, see <<Using Wildcards for Field Names>> below for mo|Optional |Default: `false`|===+-This parameter is particularly convenient when the fields in the input JSON are not available in the schema and <<schemaless-mode.adoc#,schemaless mode>> is not enabled.+This parameter is particularly convenient when the fields in the input JSON are not available in the schema and xref:schemaless-mode.adoc[schemaless mode] is not enabled.This will index all the fields into the default search field (using the `df` parameter) and only the `uniqueKey` field is mapped to the corresponding field in the schema.If the input JSON does not have a value for the `uniqueKey` field then a UUID is generated for the same.@@ -332,12 +332,12 @@ Solr will automatically attempt to add the content of the field from the JSON in====Documents will be rejected during indexing if the fields do not exist in the schema before indexing.So, if you are NOT using schemaless mode, you must pre-create all fields.-If you are working in <<schemaless-mode.adoc#,Schemaless Mode>>, however, fields that don't exist will be created on the fly with Solr's best guess for the field type.+If you are working in xref:schemaless-mode.adoc[], however, fields that don't exist will be created on the fly with Solr's best guess for the field type.======= Reusing Parameters in Multiple Requests-You can store and re-use parameters with Solr's <<request-parameters-api.adoc#,Request Parameters API>>.+You can store and re-use parameters with Solr's xref:configuration-guide:request-parameters-api.adoc[].Say we wanted to define parameters to split documents at the `exams` field, and map several other fields.We could make an API request such as:diff --git a/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiHeatmapFacetingTest.java b/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiHeatmapFacetingTest.javanew file mode 120000index 00000000000..a2ae1728ca0--- /dev/null+++ b/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiHeatmapFacetingTest.java@@ -0,0 +1 @@+../../../../solrj/src/test/org/apache/solr/client/ref_guide_examples/JsonRequestApiHeatmapFacetingTest.java\ No newline at end of filediff --git a/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java b/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.javanew file mode 120000index 00000000000..3f61155f448--- /dev/null+++ b/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java@@ -0,0 +1 @@+../../../../solrj/src/test/org/apache/solr/client/ref_guide_examples/JsonRequestApiTest.java\ No newline at end of filediff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_1.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_1.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_1.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_11.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_11.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_11.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_11.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_12.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_12.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_12.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_12.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_13.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_13.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_13.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_13.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_14.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_14.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_14.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_14.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_15.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_15.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_15.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_15.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_16.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_16.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_16.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_16.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_17.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_17.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_17.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_17.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_19.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_19.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_19.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_19.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_2.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_2.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_2.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_20.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_20.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_20.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_20.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_3.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_3.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_3.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_3.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_4.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_4.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_4.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_4.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_5.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_5.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_5.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_5.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_6.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_6.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_6.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_6.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_7.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_7.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_7.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_7.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_9.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_9.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_9.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_9.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_1.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_1.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_1.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_10.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_10.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_10.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_10.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_11.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_11.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_11.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_11.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_12.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_12.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_12.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_12.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_13.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_13.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_13.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_13.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_14.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_14.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_14.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_14.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_15.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_15.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_15.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_15.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_2.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_2.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_2.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_3.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_3.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_3.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_3.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_4.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_4.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_4.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_4.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_5.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_5.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_5.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_5.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_7.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_7.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_7.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_7.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_9.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_9.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-squirrel/squirrelsql_solrjdbc_9.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-squirrel/squirrelsql_solrjdbc_9.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-zeppelin/zeppelin_solrjdbc_1.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-zeppelin/zeppelin_solrjdbc_1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-zeppelin/zeppelin_solrjdbc_1.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-zeppelin/zeppelin_solrjdbc_1.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-zeppelin/zeppelin_solrjdbc_2.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-zeppelin/zeppelin_solrjdbc_2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-zeppelin/zeppelin_solrjdbc_2.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-zeppelin/zeppelin_solrjdbc_2.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-zeppelin/zeppelin_solrjdbc_3.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-zeppelin/zeppelin_solrjdbc_3.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-zeppelin/zeppelin_solrjdbc_3.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-zeppelin/zeppelin_solrjdbc_3.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-zeppelin/zeppelin_solrjdbc_4.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-zeppelin/zeppelin_solrjdbc_4.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-zeppelin/zeppelin_solrjdbc_4.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-zeppelin/zeppelin_solrjdbc_4.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-zeppelin/zeppelin_solrjdbc_5.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-zeppelin/zeppelin_solrjdbc_5.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-zeppelin/zeppelin_solrjdbc_5.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-zeppelin/zeppelin_solrjdbc_5.pngdiff --git a/solr/solr-ref-guide/src/images/jdbc-zeppelin/zeppelin_solrjdbc_6.png b/solr/solr-ref-guide/modules/query-guide/images/jdbc-zeppelin/zeppelin_solrjdbc_6.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/jdbc-zeppelin/zeppelin_solrjdbc_6.pngrename to solr/solr-ref-guide/modules/query-guide/images/jdbc-zeppelin/zeppelin_solrjdbc_6.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/2Centroids.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/2Centroids.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/2Centroids.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/2Centroids.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/2DCluster1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/2DCluster1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/2DCluster1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/2DCluster1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/2DCluster2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/2DCluster2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/2DCluster2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/2DCluster2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/2Dcentroids.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/2Dcentroids.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/2Dcentroids.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/2Dcentroids.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/2Dcluster.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/2Dcluster.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/2Dcluster.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/2Dcluster.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/add.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/add.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/add.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/add.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/aggs.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/aggs.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/aggs.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/aggs.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/anomaly.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/anomaly.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/anomaly.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/anomaly.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/array.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/array.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/array.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/array.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/autocorr.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/autocorr.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/autocorr.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/autocorr.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/bar.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/bar.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/bar.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/bar.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/beta.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/beta.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/beta.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/beta.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/binomial.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/binomial.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/binomial.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/binomial.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/bivariate.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/bivariate.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/bivariate.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/bivariate.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/cartesian.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/cartesian.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/cartesian.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/cartesian.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/cartogram.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/cartogram.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/cartogram.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/cartogram.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/centroidplot.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/centroidplot.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/centroidplot.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/centroidplot.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/centroidzoom.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/centroidzoom.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/centroidzoom.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/centroidzoom.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/clusters.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/clusters.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/clusters.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/clusters.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/clusterzip.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/clusterzip.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/clusterzip.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/clusterzip.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/clusterzipplot.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/clusterzipplot.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/clusterzipplot.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/clusterzipplot.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/commit-series.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/commit-series.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/commit-series.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/commit-series.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/constant.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/constant.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/constant.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/constant.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/conv-smooth.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/conv-smooth.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/conv-smooth.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/conv-smooth.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/conv1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/conv1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/conv1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/conv1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/conv2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/conv2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/conv2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/conv2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/conv3.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/conv3.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/conv3.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/conv3.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/conv4.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/conv4.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/conv4.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/conv4.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/convex.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/convex.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/convex.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/convex.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/convex0.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/convex0.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/convex0.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/convex0.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/convex1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/convex1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/convex1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/convex1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/convex2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/convex2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/convex2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/convex2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/correlation.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/correlation.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/correlation.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/correlation.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/corrmatrix.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/corrmatrix.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/corrmatrix.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/corrmatrix.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/corrmatrix2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/corrmatrix2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/corrmatrix2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/corrmatrix2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/corrsim1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/corrsim1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/corrsim1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/corrsim1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/corrsim2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/corrsim2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/corrsim2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/corrsim2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/corrsim3.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/corrsim3.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/corrsim3.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/corrsim3.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/covariance.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/covariance.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/covariance.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/covariance.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/crosscorr.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/crosscorr.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/crosscorr.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/crosscorr.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/csv.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/csv.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/csv.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/csv.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/csvselect.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/csvselect.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/csvselect.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/csvselect.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/csvtable.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/csvtable.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/csvtable.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/csvtable.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/cumPct.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/cumPct.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/cumPct.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/cumPct.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/cumProb.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/cumProb.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/cumProb.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/cumProb.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/curve-fitting.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/curve-fitting.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/curve-fitting.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/curve-fitting.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/custom-hist.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/custom-hist.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/custom-hist.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/custom-hist.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/dbscan1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/dbscan1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/dbscan1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/dbscan1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/dbscan2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/dbscan2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/dbscan2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/dbscan2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/delay.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/delay.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/delay.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/delay.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/derivative.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/derivative.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/derivative.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/derivative.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/derivative1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/derivative1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/derivative1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/derivative1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/derivative2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/derivative2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/derivative2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/derivative2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/derivatives.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/derivatives.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/derivatives.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/derivatives.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/describe.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/describe.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/describe.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/describe.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/diagnostics.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/diagnostics.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/diagnostics.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/diagnostics.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/diff.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/diff.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/diff.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/diff.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/diff1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/diff1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/diff1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/diff1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/diffcorr.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/diffcorr.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/diffcorr.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/diffcorr.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/diffzoom.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/diffzoom.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/diffzoom.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/diffzoom.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/dist.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/dist.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/dist.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/dist.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/distance.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/distance.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/distance.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/distance.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/distanceview.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/distanceview.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/distanceview.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/distanceview.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/empirical.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/empirical.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/empirical.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/empirical.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/enum1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/enum1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/enum1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/enum1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/enum2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/enum2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/enum2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/enum2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/expmoving.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/expmoving.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/expmoving.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/expmoving.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/facet2D.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/facet2D.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/facet2D.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/facet2D.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/facettab1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/facettab1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/facettab1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/facettab1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/facettab2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/facettab2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/facettab2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/facettab2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/facetviz1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/facetviz1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/facetviz1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/facetviz1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/facetviz2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/facetviz2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/facetviz2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/facetviz2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/fft.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/fft.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/fft.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/fft.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/forecast.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/forecast.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/forecast.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/forecast.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/freqTable.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/freqTable.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/freqTable.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/freqTable.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/freqTable1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/freqTable1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/freqTable1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/freqTable1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/fuzzyk.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/fuzzyk.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/fuzzyk.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/fuzzyk.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/gamma.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/gamma.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/gamma.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/gamma.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/gaussfit.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/gaussfit.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/gaussfit.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/gaussfit.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/gaussfit2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/gaussfit2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/gaussfit2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/gaussfit2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/geometric.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/geometric.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/geometric.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/geometric.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/graph1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/graph1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/graph1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/graph1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/graph2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/graph2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/graph2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/graph2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/harmfit.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/harmfit.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/harmfit.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/harmfit.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/harmfit2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/harmfit2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/harmfit2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/harmfit2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/hashRollup.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/hashRollup.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/hashRollup.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/hashRollup.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/having.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/having.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/having.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/having.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/having2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/having2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/having2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/having2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/having3.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/having3.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/having3.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/having3.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/havingId.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/havingId.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/havingId.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/havingId.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/havingIsNull.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/havingIsNull.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/havingIsNull.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/havingIsNull.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/havingNotNull.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/havingNotNull.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/havingNotNull.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/havingNotNull.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/heat.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/heat.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/heat.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/heat.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/hfit.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/hfit.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/hfit.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/hfit.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/hidden-signal-autocorrelation.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/hidden-signal-autocorrelation.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/hidden-signal-autocorrelation.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/hidden-signal-autocorrelation.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/hidden-signal-fft.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/hidden-signal-fft.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/hidden-signal-fft.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/hidden-signal-fft.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/hidden-signal.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/hidden-signal.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/hidden-signal.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/hidden-signal.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/hist.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/hist.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/hist.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/hist.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/histtable.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/histtable.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/histtable.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/histtable.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/hullplot.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/hullplot.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/hullplot.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/hullplot.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/ifIsNull.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/ifIsNull.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/ifIsNull.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/ifIsNull.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/integral.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/integral.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/integral.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/integral.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/interpolate1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/interpolate1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/interpolate1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/interpolate1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/knn.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/knn.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/knn.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/knn.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/knnRegress.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/knnRegress.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/knnRegress.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/knnRegress.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/knnSearch.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/knnSearch.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/knnSearch.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/knnSearch.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/line.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/line.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/line.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/line.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/line1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/line1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/line1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/line1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/linear.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/linear.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/linear.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/linear.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/loess.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/loess.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/loess.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/loess.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/lognormal.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/lognormal.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/lognormal.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/lognormal.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/logs-collection.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-collection.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/logs-collection.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-collection.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/logs-dates.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-dates.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/logs-dates.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-dates.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/logs-sample.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-sample.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/logs-sample.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-sample.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/logs-time-series.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-time-series.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/logs-time-series.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-time-series.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/logs-time-series2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-time-series2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/logs-time-series2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-time-series2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/logs-time-series3.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-time-series3.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/logs-time-series3.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-time-series3.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/logs-type-collection.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-type-collection.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/logs-type-collection.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-type-collection.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/logs-type.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-type.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/logs-type.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/logs-type.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/mad.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/mad.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/mad.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/mad.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/maddist.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/maddist.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/maddist.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/maddist.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/madsort.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/madsort.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/madsort.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/madsort.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/map.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/map.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/map.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/map.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/matches.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/matches.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/matches.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/matches.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/matrix.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/matrix.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/matrix.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/matrix.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/minmaxscale.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/minmaxscale.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/minmaxscale.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/minmaxscale.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/mnorm.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/mnorm.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/mnorm.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/mnorm.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/mnorm1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/mnorm1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/mnorm1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/mnorm1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/mnorm2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/mnorm2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/mnorm2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/mnorm2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/monte-carlo.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/monte-carlo.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/monte-carlo.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/monte-carlo.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/movingMedian.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/movingMedian.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/movingMedian.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/movingMedian.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/movingavg.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/movingavg.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/movingavg.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/movingavg.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/multitime1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/multitime1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/multitime1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/multitime1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/nodestab.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/nodestab.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/nodestab.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/nodestab.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/nodesviz.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/nodesviz.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/nodesviz.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/nodesviz.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/noise-autocorrelation.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/noise-autocorrelation.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/noise-autocorrelation.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/noise-autocorrelation.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/noise-fft.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/noise-fft.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/noise-fft.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/noise-fft.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/noise.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/noise.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/noise.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/noise.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/num.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/num.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/num.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/num.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/number.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/number.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/number.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/number.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/outliers.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/outliers.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/outliers.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/outliers.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/overlay-series.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/overlay-series.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/overlay-series.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/overlay-series.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/paging.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/paging.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/paging.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/paging.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/poisson.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/poisson.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/poisson.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/poisson.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/polyfit-predict.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/polyfit-predict.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/polyfit-predict.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/polyfit-predict.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/polyfit-resid.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/polyfit-resid.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/polyfit-resid.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/polyfit-resid.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/polyfit.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/polyfit.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/polyfit.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/polyfit.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/qtime-dist.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/qtime-dist.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/qtime-dist.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/qtime-dist.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/qtime-highest-scatter.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/qtime-highest-scatter.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/qtime-highest-scatter.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/qtime-highest-scatter.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/qtime-scatter.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/qtime-scatter.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/qtime-scatter.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/qtime-scatter.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/qtime-series.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/qtime-series.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/qtime-series.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/qtime-series.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/quantile-plot.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/quantile-plot.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/quantile-plot.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/quantile-plot.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/quantiles.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/quantiles.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/quantiles.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/quantiles.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/quantiles1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/quantiles1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/quantiles1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/quantiles1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/query-ids.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/query-ids.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/query-ids.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/query-ids.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/query-qq.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/query-qq.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/query-qq.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/query-qq.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/query-shard-level.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/query-shard-level.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/query-shard-level.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/query-shard-level.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/query-spike.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/query-spike.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/query-spike.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/query-spike.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/query-top-level.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/query-top-level.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/query-top-level.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/query-top-level.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/randomwalk1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/randomwalk1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/randomwalk1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/randomwalk1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/randomwalk2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/randomwalk2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/randomwalk2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/randomwalk2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/randomwalk3.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/randomwalk3.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/randomwalk3.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/randomwalk3.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/randomwalk4.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/randomwalk4.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/randomwalk4.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/randomwalk4.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/randomwalk5.1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/randomwalk5.1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/randomwalk5.1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/randomwalk5.1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/randomwalk5.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/randomwalk5.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/randomwalk5.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/randomwalk5.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/randomwalk6.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/randomwalk6.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/randomwalk6.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/randomwalk6.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/ratscatter.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/ratscatter.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/ratscatter.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/ratscatter.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/recNum.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/recNum.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/recNum.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/recNum.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/redwine1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/redwine1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/redwine1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/redwine1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/redwine2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/redwine2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/redwine2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/redwine2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/regression-plot.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/regression-plot.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/regression-plot.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/regression-plot.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/residual-plot.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/residual-plot.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/residual-plot.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/residual-plot.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/residual-plot2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/residual-plot2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/residual-plot2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/residual-plot2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/residuals.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/residuals.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/residuals.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/residuals.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/sample-overlay.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/sample-overlay.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/sample-overlay.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/sample-overlay.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/sample-scatter.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/sample-scatter.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/sample-scatter.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/sample-scatter.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/sample-scatter1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/sample-scatter1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/sample-scatter1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/sample-scatter1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/scalar.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/scalar.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/scalar.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/scalar.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/scoring.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/scoring.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/scoring.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/scoring.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/search-error.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/search-error.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/search-error.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/search-error.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/search-matches.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/search-matches.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/search-matches.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/search-matches.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/search-page.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/search-page.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/search-page.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/search-page.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/search-resort.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/search-resort.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/search-resort.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/search-resort.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/search-sort-plot.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/search-sort-plot.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/search-sort-plot.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/search-sort-plot.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/search-sort.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/search-sort.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/search-sort.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/search-sort.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/search.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/search.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/search.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/search.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/search1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/search1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/search1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/search1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/searchiris.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/searchiris.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/searchiris.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/searchiris.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/season.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/season.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/season.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/season.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/seasondiff.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/seasondiff.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/seasondiff.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/seasondiff.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/select-math.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/select-math.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/select-math.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/select-math.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/select1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/select1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/select1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/select1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/select2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/select2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/select2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/select2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/selectconcat.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/selectconcat.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/selectconcat.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/selectconcat.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/selectupper.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/selectupper.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/selectupper.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/selectupper.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/selectuuid.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/selectuuid.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/selectuuid.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/selectuuid.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/signal-autocorrelation.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/signal-autocorrelation.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/signal-autocorrelation.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/signal-autocorrelation.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/signal-fft.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/signal-fft.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/signal-fft.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/signal-fft.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/signal.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/signal.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/signal.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/signal.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/significantTerms2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/significantTerms2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/significantTerms2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/significantTerms2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/significantTermsCompare.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/significantTermsCompare.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/significantTermsCompare.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/significantTermsCompare.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/sined.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/sined.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/sined.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/sined.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/sinewave.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/sinewave.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/sinewave.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/sinewave.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/sinewave256.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/sinewave256.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/sinewave256.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/sinewave256.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/skipping.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/skipping.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/skipping.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/skipping.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/slow-nodes.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/slow-nodes.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/slow-nodes.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/slow-nodes.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/slow-queries.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/slow-queries.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/slow-queries.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/slow-queries.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/spline.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/spline.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/spline.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/spline.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/sqlagg.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/sqlagg.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/sqlagg.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/sqlagg.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/stack.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/stack.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/stack.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/stack.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/standardize.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/standardize.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/standardize.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/standardize.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/stats-table.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/stats-table.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/stats-table.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/stats-table.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/stats.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/stats.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/stats.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/stats.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/sterms.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/sterms.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/sterms.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/sterms.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/stream.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/stream.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/stream.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/stream.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/striding.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/striding.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/striding.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/striding.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/table.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/table.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/table.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/table.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/text-analytics.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/text-analytics.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/text-analytics.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/text-analytics.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/timecompare.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/timecompare.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/timecompare.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/timecompare.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/timemodel.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/timemodel.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/timemodel.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/timemodel.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/timeseries.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/timeseries.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/timeseries.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/timeseries.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/timeseries1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/timeseries1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/timeseries1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/timeseries1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/timeseries2.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/timeseries2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/timeseries2.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/timeseries2.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/trend.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/trend.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/trend.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/trend.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/triangular.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/triangular.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/triangular.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/triangular.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/uniform.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/uniform.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/uniform.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/uniform.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/uniformr.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/uniformr.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/uniformr.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/uniformr.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/unitize.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/unitize.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/unitize.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/unitize.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/univariate.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/univariate.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/univariate.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/univariate.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/update.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/update.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/update.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/update.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/valueat.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/valueat.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/valueat.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/valueat.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/variables.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/variables.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/variables.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/variables.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/variables1.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/variables1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/variables1.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/variables1.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/vector.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/vector.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/vector.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/vector.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/weibull.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/weibull.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/weibull.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/weibull.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/xy.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/xy.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/xy.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/xy.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/xyscatter.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/xyscatter.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/xyscatter.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/xyscatter.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/zepconf.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/zepconf.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/zepconf.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/zepconf.pngdiff --git a/solr/solr-ref-guide/src/images/math-expressions/zipf.png b/solr/solr-ref-guide/modules/query-guide/images/math-expressions/zipf.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/math-expressions/zipf.pngrename to solr/solr-ref-guide/modules/query-guide/images/math-expressions/zipf.pngdiff --git a/solr/solr-ref-guide/src/images/other-parsers/graph_qparser_example.png b/solr/solr-ref-guide/modules/query-guide/images/other-parsers/graph_qparser_example.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/other-parsers/graph_qparser_example.pngrename to solr/solr-ref-guide/modules/query-guide/images/other-parsers/graph_qparser_example.pngdiff --git a/solr/solr-ref-guide/src/images/other-parsers/graph_qparser_example.svg b/solr/solr-ref-guide/modules/query-guide/images/other-parsers/graph_qparser_example.svgsimilarity index 100%rename from solr/solr-ref-guide/src/images/other-parsers/graph_qparser_example.svgrename to solr/solr-ref-guide/modules/query-guide/images/other-parsers/graph_qparser_example.svgdiff --git a/solr/solr-ref-guide/src/images/query-screen/query-top.png b/solr/solr-ref-guide/modules/query-guide/images/query-screen/query-top.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/query-screen/query-top.pngrename to solr/solr-ref-guide/modules/query-guide/images/query-screen/query-top.pngdiff --git a/solr/solr-ref-guide/src/images/result-clustering/carrot2-docs-attrs1.png b/solr/solr-ref-guide/modules/query-guide/images/result-clustering/carrot2-docs-attrs1.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/result-clustering/carrot2-docs-attrs1.pngrename to solr/solr-ref-guide/modules/query-guide/images/result-clustering/carrot2-docs-attrs1.pngdiff --git a/solr/solr-ref-guide/src/images/result-clustering/carrot2-docs-attrs2.png b/solr/solr-ref-guide/modules/query-guide/images/result-clustering/carrot2-docs-attrs2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/result-clustering/carrot2-docs-attrs2.pngrename to solr/solr-ref-guide/modules/query-guide/images/result-clustering/carrot2-docs-attrs2.pngdiff --git a/solr/solr-ref-guide/src/images/result-clustering/carrot2.png b/solr/solr-ref-guide/modules/query-guide/images/result-clustering/carrot2.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/result-clustering/carrot2.pngrename to solr/solr-ref-guide/modules/query-guide/images/result-clustering/carrot2.pngdiff --git a/solr/solr-ref-guide/src/images/spatial-search/bbox.png b/solr/solr-ref-guide/modules/query-guide/images/spatial-search/bbox.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/spatial-search/bbox.pngrename to solr/solr-ref-guide/modules/query-guide/images/spatial-search/bbox.pngdiff --git a/solr/solr-ref-guide/src/images/spatial-search/circle.png b/solr/solr-ref-guide/modules/query-guide/images/spatial-search/circle.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/spatial-search/circle.pngrename to solr/solr-ref-guide/modules/query-guide/images/spatial-search/circle.pngdiff --git a/solr/solr-ref-guide/modules/query-guide/images/sql-query/cluster.png b/solr/solr-ref-guide/modules/query-guide/images/sql-query/cluster.pngnew file mode 100644index 00000000000..10f134ffba4Binary files /dev/null and b/solr/solr-ref-guide/modules/query-guide/images/sql-query/cluster.png differdiff --git a/solr/solr-ref-guide/src/images/sql-screen/sql-query-ui.png b/solr/solr-ref-guide/modules/query-guide/images/sql-screen/sql-query-ui.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/sql-screen/sql-query-ui.pngrename to solr/solr-ref-guide/modules/query-guide/images/sql-screen/sql-query-ui.pngdiff --git a/solr/solr-ref-guide/src/images/stream-screen/StreamScreen.png b/solr/solr-ref-guide/modules/query-guide/images/stream-screen/StreamScreen.pngsimilarity index 100%rename from solr/solr-ref-guide/src/images/stream-screen/StreamScreen.pngrename to solr/solr-ref-guide/modules/query-guide/images/stream-screen/StreamScreen.pngdiff --git a/solr/solr-ref-guide/src/analytics-expression-sources.adoc b/solr/solr-ref-guide/modules/query-guide/pages/analytics-expression-sources.adocsimilarity index 89%rename from solr/solr-ref-guide/src/analytics-expression-sources.adocrename to solr/solr-ref-guide/modules/query-guide/pages/analytics-expression-sources.adocindex 8e823446652..267762b567a 100644--- a/solr/solr-ref-guide/src/analytics-expression-sources.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/analytics-expression-sources.adoc@@ -16,16 +16,16 @@// specific language governing permissions and limitations// under the License.-Expression sources are the source of the data being aggregated in <<analytics.adoc#expressions,analytics expressions>>.+Expression sources are the source of the data being aggregated in xref:analytics.adoc#expressions[analytics expressions].These sources can be either Solr fields indexed with docValues, or constants.== Supported Field Types-The following <<field-types-included-with-solr.adoc#, Solr field types>> are supported.+The following xref:indexing-guide:field-types-included-with-solr.adoc[Solr field types] are supported.Fields of these types can be either multi-valued and single-valued.-All fields used in analytics expressions *must* have <<docvalues.adoc#,docValues>> enabled.+All fields used in analytics expressions *must* have xref:indexing-guide:docvalues.adoc[] enabled.// Since Trie* fields are deprecated as of 7.0, we should consider removing Trie* fields from this list...@@ -79,7 +79,7 @@ There are two possible ways of specifying constant strings, as shown below.Dates can be specified in the same way as they are in Solr queries.Just use ISO-8601 format.-For more information, refer to the <<date-formatting-math.adoc#,Working with Dates>> section.+For more information, refer to xref:indexing-guide:date-formatting-math.adoc[].* `2017-07-17T19:35:08Z`diff --git a/solr/solr-ref-guide/src/analytics-mapping-functions.adoc b/solr/solr-ref-guide/modules/query-guide/pages/analytics-mapping-functions.adocsimilarity index 98%rename from solr/solr-ref-guide/src/analytics-mapping-functions.adocrename to solr/solr-ref-guide/modules/query-guide/pages/analytics-mapping-functions.adocindex ab4367c1276..b1a2e7b62ec 100644--- a/solr/solr-ref-guide/src/analytics-mapping-functions.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/analytics-mapping-functions.adoc@@ -318,7 +318,7 @@ Explicitly converts the values of a `String` or `Long` expression into `Dates`.[[analytics-date-math]]=== Date MathCompute the given date math strings for the values of a `Date` expression.-The date math strings *must* be <<analytics-expression-sources.adoc#strings, constant>>.+The date math strings *must* be xref:analytics-expression-sources.adoc#strings[constant].`date_math(< _Date_ >, < _Constant String_ >...)` => `< _Date_ >`::* `date_math(1800-04-15, '+1DAY', '-1MONTH')` => `1800-03-16`@@ -348,7 +348,7 @@ Concatenations the values of the `String` expression(s) together._Empty values are ignored_=== Separated Concatenation-Concatenations the values of the `String` expression(s) together using the given <<analytics-expression-sources.adoc#strings, constant string>> value as a separator.+Concatenations the values of the `String` expression(s) together using the given xref:analytics-expression-sources.adoc#strings[constant string] value as a separator.`concat_sep(< _Constant String_ >, < _Multi String_ >)` => `< _Single String_ >`::* `concat_sep('-', ['a','b'])` => `'a-b'`diff --git a/solr/solr-ref-guide/src/analytics-reduction-functions.adoc b/solr/solr-ref-guide/modules/query-guide/pages/analytics-reduction-functions.adocsimilarity index 90%rename from solr/solr-ref-guide/src/analytics-reduction-functions.adocrename to solr/solr-ref-guide/modules/query-guide/pages/analytics-reduction-functions.adocindex b6f57d8093c..25255deabf5 100644--- a/solr/solr-ref-guide/src/analytics-reduction-functions.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/analytics-reduction-functions.adoc@@ -17,8 +17,8 @@// specific language governing permissions and limitations// under the License.-Reduction functions reduce the values of <<analytics-expression-sources.adoc#,sources>>-and/or unreduced <<analytics-mapping-functions.adoc#,mapping functions>>+Reduction functions reduce the values of xref:analytics-expression-sources.adoc[sources>]+and/or unreduced xref:analytics-mapping-functions.adoc[mapping functions]for every Solr Document to a single value.Below is a list of all reduction functions provided by the Analytics Component.@@ -109,14 +109,14 @@ This function accepts `Numeric` and `Date` expressions.Calculates the given percentile of all values for the expression.This function accepts `Numeric`, `Date` and `String` expressions for the 2^nd^ parameter.-The percentile, given as the 1^st^ parameter, must be a <<analytics-expression-sources.adoc#numeric,constant double>> between [0, 100).+The percentile, given as the 1^st^ parameter, must be a xref:analytics-expression-sources.adoc#numeric[constant double] between [0, 100).`percentile(<Constant Double>, < T >)` => `< _Single_ T >`=== OrdinalCalculates the given ordinal of all values for the expression.This function accepts `Numeric`, `Date` and `String` expressions for the 2^nd^ parameter.-The ordinal, given as the 1^st^ parameter, must be a <<analytics-expression-sources.adoc#numeric,constant integer>>.+The ordinal, given as the 1^st^ parameter, must be a xref:analytics-expression-sources.adoc#numeric[constant integer].*0 is not accepted as an ordinal value.*If the ordinal is positive, the returned value will be the _n_^th^ smallest value.diff --git a/solr/solr-ref-guide/src/analytics.adoc b/solr/solr-ref-guide/modules/query-guide/pages/analytics.adocsimilarity index 93%rename from solr/solr-ref-guide/src/analytics.adocrename to solr/solr-ref-guide/modules/query-guide/pages/analytics.adocindex 9c236244020..131c031f185 100644--- a/solr/solr-ref-guide/src/analytics.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/analytics.adoc@@ -32,9 +32,9 @@ Since the Analytics framework is a _search component_, it must be declared as suFor distributed analytics requests over cloud collections, the component uses the `AnalyticsHandler` strictly for inter-shard communication.The Analytics Handler should not be used by users to submit analytics requests.-To use the Analytics Component, the first step is to install this module's plugins into Solr -- see the <<solr-plugins.adoc#installing-plugins,Solr Plugins>> section on how to do this.+To use the Analytics Component, the first step is to install this module's plugins into Solr -- see the xref:configuration-guide:solr-plugins.adoc#installing-plugins[Installing Plugins] section on how to do this.Note: Method with `<lib/>` directive doesn't work.-Instead copy `${solr.install.dir}/modules/analytics/lib/solr-analytics-{solr-full-version}.jar` to `${solr.install.dir}/server/solr-webapp/webapp/WEB-INF/lib/`, as described in the <<libs.adoc#lib-directories,lib directories documentation>>.+Instead, copy `${solr.install.dir}/modules/analytics/lib/solr-analytics-{solr-full-version}.jar` to `${solr.install.dir}/server/solr-webapp/webapp/WEB-INF/lib/`, as described in the xref:configuration-guide:libs.adoc[lib directories documentation].Next you need to register the request handler and search component.Add the following lines to `solrconfig.xml`, near the defintions for other request handlers:@@ -60,14 +60,14 @@ For these changes to take effect, restart Solr or reload the core or collection.== Request SyntaxAn Analytics request is passed to Solr with the parameter `analytics` in a request sent to the-<<requesthandlers-searchcomponents.adoc#search-handlers,Search Handler>>.+xref:configuration-guide:requesthandlers-searchcomponents.adoc#search-handlers[search handler].Since the analytics request is sent inside of a search handler request, it will compute results based on the result set determined by the search handler.For example, this curl command encodes and POSTs a simple analytics request to the search handler:[source,bash]-----curl --data-binary 'analytics={+$ curl --data-binary 'analytics={"expressions" : {"revenue" : "sum(mult(price,quantity))"}@@ -162,14 +162,14 @@ The ways that these can be defined are described below.Sources::* Constants: The values defined in the expression.-The supported constant types are described in the <<analytics-expression-sources.adoc#constants, Analytics Expression Source Reference>>.+The supported constant types are described in the section xref:analytics-expression-sources.adoc#constants[Constants].* Fields: Solr fields that are read from the index.-The supported fields are listed in the <<analytics-expression-sources.adoc#supported-field-types, Analytics Expression Source Reference>>.+The supported fields are listed in the section xref:analytics-expression-sources.adoc#supported-field-types[Supported Field Types].Mapping Functions::Mapping functions map values for each Solr Document or Reduction.-The provided mapping functions are detailed in the <<analytics-mapping-functions.adoc#,Analytics Mapping Function Reference>>.+The provided mapping functions are detailed in the xref:analytics-mapping-functions.adoc[].* Unreduced Mapping: Mapping a Field with another Field or Constant returns a value for every Solr Document.Unreduced mapping functions can take fields, constants as well as other unreduced mapping functions as input.@@ -178,7 +178,7 @@ Unreduced mapping functions can take fields, constants as well as other unreduceReduction Functions::Functions that reduce the values of sources and/or unreduced mapping functions for every Solr Document to a single value.-The provided reduction functions are detailed in the <<analytics-reduction-functions.adoc#,Analytics Reduction Function Reference>>.+The provided reduction functions are detailed in the xref:analytics-reduction-functions.adoc[].==== Component Ordering@@ -212,25 +212,25 @@ With the above definitions and ordering, an example expression can be broken updiv(sum(a,fill_missing(b,0)),add(10.5,count(mult(a,c)))))As a whole, this is a reduced mapping function.-The `div` function is a reduced mapping function since it is a <<analytics-mapping-functions.adoc#division,provided mapping function>> and has reduced arguments.+The `div` function is a reduced mapping function since it is a xref:analytics-mapping-functions.adoc#division[provided mapping function] and has reduced arguments.If we break down the expression further:* `sum(a,fill_missing(b,0))`: Reduction Function +-`sum` is a <<analytics-reduction-functions.adoc#sum,provided reduction function>>.+`sum` is a xref:analytics-reduction-functions.adoc#sum[provided reduction function].** `a`: Field** `fill_missing(b,0)`: Unreduced Mapping Function +-`fill_missing` is an unreduced mapping function since it is a <<analytics-mapping-functions.adoc#fill-missing,provided mapping function>> and has a field argument.+`fill_missing` is an unreduced mapping function since it is a xref:analytics-mapping-functions.adoc#fill-missing[provided mapping function] and has a field argument.*** `b`: Field*** `0`: Constant* `add(10.5,count(mult(a,c)))`: Reduced Mapping Function +-`add` is a reduced mapping function since it is a <<analytics-mapping-functions.adoc#addition,provided mapping function>> and has a reduction function argument.+`add` is a reduced mapping function since it is a xref:analytics-mapping-functions.adoc#addition[provided mapping function] and has a reduction function argument.** `10.5`: Constant** `count(mult(a,c))`: Reduction Function +-`count` is a <<analytics-reduction-functions.adoc#count,provided reduction function>>+`count` is a xref:analytics-reduction-functions.adoc#count[provided reduction function].*** `mult(a,c)`: Unreduced Mapping Function +-`mult` is an unreduced mapping function since it is a <<analytics-mapping-functions.adoc#multiplication,provided mapping function>> and has two field arguments.+`mult` is an unreduced mapping function since it is a xref:analytics-mapping-functions.adoc#multiplication[provided mapping function] and has two field arguments.**** `a`: Field**** `c`: Field@@ -771,7 +771,7 @@ A <<Facet Sorting,sort>> for the results of the pivot.Range Facets are used to group documents by the value of a field into a given set of ranges.The inputs for analytics range facets are identical to those used for Solr range facets.-Refer to the <<faceting.adoc#range-faceting,Range Facet documentation>> for additional questions regarding use.+Refer to the section xref:faceting.adoc#range-faceting[Range Faceting] for more information regarding use.==== Parametersdiff --git a/solr/solr-ref-guide/src/block-join-query-parser.adoc b/solr/solr-ref-guide/modules/query-guide/pages/block-join-query-parser.adocsimilarity index 89%rename from solr/solr-ref-guide/src/block-join-query-parser.adocrename to solr/solr-ref-guide/modules/query-guide/pages/block-join-query-parser.adocindex 27e8932c3c6..95ad96d0a53 100644--- a/solr/solr-ref-guide/src/block-join-query-parser.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/block-join-query-parser.adoc@@ -17,7 +17,7 @@// under the LicenseThere are two query parsers that support block joins.-These parsers allow indexing and searching for relational content that has been <<indexing-nested-documents.adoc#,indexed as Nested Documents>>.+These parsers allow indexing and searching for relational content that has been xref:indexing-guide:indexing-nested-documents.adoc[indexed as Nested Documents].The example usage of the query parsers below assumes the following documents have been indexed:@@ -54,7 +54,7 @@ This parser wraps a query that matches some parent documents and returns the chiThe syntax for this parser is: `q={!child of=<blockMask>}<someParents>`.* The inner subordinate query string (`someParents`) must be a query that will match some parent documents-* The `of` parameter must be a query string to use as a <<#block-mask,Block Mask>> -- typically a query that matches the set of all possible parent documents+* The `of` parameter must be a query string to use as a <<block-mask,Block Mask>> -- typically a query that matches the set of all possible parent documentsThe resulting query will match all documents which do _not_ match the `<blockMask>` query and are children (or descendents) of the documents matched by `<someParents>`.@@ -74,7 +74,7 @@ We only get one document in response:[CAUTION]====-The query for `someParents` *MUST* match a strict subset of the documents matched by the <<#block-mask,Block Mask>> or your query may result in an Error:+The query for `someParents` *MUST* match a strict subset of the documents matched by the <<block-mask,Block Mask>> or your query may result in an Error:[literal]Parent query must not match any docs besides parent filter.@@ -99,7 +99,7 @@ This is equivalent to:q={!child of=<blockMask>}+<someParents> +BRAND:Foo +NAME:BarNotice "$" syntax in `filters` for referencing queries; comma-separated tags `excludeTags` allows to exclude certain queries by tagging.-Overall the idea is similar to <<faceting.adoc#tagging-and-excluding-filters, excluding fq in facets>>.+Overall the idea is similar to xref:faceting.adoc#tagging-and-excluding-filters[excluding `fq` in facets].Note, that filtering is applied to the subordinate clause (`<someParents>`), and the intersection result is joined to the children.=== All Children Syntax@@ -114,7 +114,7 @@ This parser takes a query that matches child documents and returns their parentsThe syntax for this parser is similar to the `child` parser: `q={!parent which=<blockMask>}<someChildren>`.* The inner subordinate query string (`someChildren`) must be a query that will match some child documents-* The `which` parameter must be a query string to use as a <<#block-mask,Block Mask>> -- typically a query that matches the set of all possible parent documents+* The `which` parameter must be a query string to use as a <<block-mask,Block Mask>> -- typically a query that matches the set of all possible parent documentsThe resulting query will match all documents which _do_ match the `<blockMask>` query and are parents (or ancestors) of the documents matched by `<someChildren>`.@@ -135,7 +135,7 @@ We get this document in response:[CAUTION]====-The query for `someChildren` *MUST NOT* match any documents matched by the <<#block-mask,Block Mask>> or your query may result in an Error:+The query for `someChildren` *MUST NOT* match any documents matched by the <<block-mask,Block Mask>> or your query may result in an Error:[literal]Child query must not match same docs with parent filter.@@ -162,7 +162,7 @@ q={!parent which=<blockMask>}+<someChildren> +COLOR:Red +SIZE:XLNotice the "$" syntax in `filters` for referencing queries.Comma-separated tags in `excludeTags` allow excluding certain queries by tagging.-Overall the idea is similar to <<faceting.adoc#tagging-and-excluding-filters, excluding fq in facets>>.+Overall the idea is similar to xref:faceting.adoc#tagging-and-excluding-filters[excluding `fq` in facets].Note that filtering is applied to the subordinate clause (`<someChildren>`) first, and the intersection result is joined to the parents.=== Scoring with the Block Join Parent Query Parser@@ -210,4 +210,4 @@ A similar problematic situation can arise when mixing parent/child documents wit...then our simple `doc_type:parent` Block Mask would no longer be adequate.We would instead need to use `\*:* -doc_type:child` or `doc_type:(simple parent)` to prevent our "simple" document from mistakenly being treated as a "child" of an adjacent "parent" document.-The <<searching-nested-documents#searching-nested-documents,Searching Nested Documents>> section contains more detailed examples of specifing Block Mask queries with non trivial hierarchicies of documents.+The xref:query-guide:searching-nested-documents.adoc[] section contains more detailed examples of specifying Block Mask queries with non trivial hierarchies of documents.diff --git a/solr/solr-ref-guide/src/collapse-and-expand-results.adoc b/solr/solr-ref-guide/modules/query-guide/pages/collapse-and-expand-results.adocsimilarity index 93%rename from solr/solr-ref-guide/src/collapse-and-expand-results.adocrename to solr/solr-ref-guide/modules/query-guide/pages/collapse-and-expand-results.adocindex c103f024428..2d23b9d2144 100644--- a/solr/solr-ref-guide/src/collapse-and-expand-results.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/collapse-and-expand-results.adoc@@ -19,7 +19,7 @@The Collapsing query parser and the Expand component combine to form an approach to grouping documents for field collapsing in search results.The Collapsing query parser groups documents (collapsing the result set) according to your parameters, while the Expand component provides access to documents in the collapsed group for use in results display or other processing by a client application.-Collapse & Expand can together do what the older <<result-grouping.adoc#,Result Grouping>> (`group=true`) does for _most_ use-cases but not all.+Collapse & Expand can together do what the older xref:result-grouping.adoc[] (`group=true`) does for _most_ use-cases but not all.Collapse and Expand are not supported when Result Grouping is enabled.Generally, you should prefer Collapse & Expand.@@ -27,7 +27,7 @@ Generally, you should prefer Collapse & Expand.====In order to use these features with SolrCloud, the documents must be located on the same shard.To ensure document co-location, you can define the `router.name` parameter as `compositeId` when creating the collection.-For more information on this option, see the section <<solrcloud-shards-indexing.adoc#document-routing,Document Routing>>.+For more information on this option, see the section xref:deployment-guide:solrcloud-shards-indexing.adoc#document-routing[Document Routing].====== Collapsing Query Parser@@ -59,7 +59,7 @@ The field must be a single-valued String, Int or Float-type of field.|Optional |Default: none|===+-Selects the group head document for each group based on which document has the minimum or maximum value of the specified numeric field or <<function-queries.adoc#,function query>>.+Selects the group head document for each group based on which document has the minimum or maximum value of the specified numeric field or xref:function-queries.adoc[function query].+At most only one of the `min`, `max`, or `sort` (see below) parameters may be specified.+@@ -72,7 +72,7 @@ If none are specified, the group head document of each group will be selected ba|Optional |Default: none|===+-Selects the group head document for each group based on which document comes first according to the specified <<common-query-parameters.adoc#sort-parameter,sort string>>.+Selects the group head document for each group based on which document comes first according to the specified xref:common-query-parameters.adoc#sort-parameter[sort string].+At most only one of the `min`, `max`, (see above) or `sort` parameters may be specified.+@@ -107,7 +107,7 @@ The `top_fc` hint is only available when collapsing on String fields.`top_fc` will also result in having the collapsed field cached in memory twice if it's used for faceting or sorting.For very high cardinality (high distinct count) fields, `top_fc` may not fare so well.+-* `block`: This indicates that the field being collapsed on is suitable for the optimzed <<#block-collapsing,Block Collapse>> logic described below.+* `block`: This indicates that the field being collapsed on is suitable for the optimized <<Block Collapsing>> logic described below.`size`::+@@ -128,7 +128,7 @@ Setting the size above the number of results expected in the result set will eli|Optional |Default: `true`|===+-In combination with the <<collapse-and-expand-results.adoc#collapsing-query-parser,Collapse Query Parser>> all elevated docs are visible at the beginning of the result set.+In combination with the <<Collapsing Query Parser>> all elevated docs are visible at the beginning of the result set.If this parameter is `false`, only the representative is visible if the elevated docs has the same collapse key.@@ -186,7 +186,7 @@ fq={!collapse cost=1000 field=group_field}=== Block Collapsing-When collapsing on the `\_root_` field, using `nullPolicy=expand` or `nullPolicy=ignore`, the Collapsing Query Parser can take advantage of the fact that all docs with identical field values are adjacent to each other in the index in a single <<indexing-nested-documents.adoc#,"block" of nested documents>>.+When collapsing on the `\_root_` field, using `nullPolicy=expand` or `nullPolicy=ignore`, the Collapsing Query Parser can take advantage of the fact that all docs with identical field values are adjacent to each other in the index in a single xref:indexing-guide:indexing-nested-documents.adoc["block" of nested documents].This allows the collapsing logic to be much faster and more memory efficient.The default collapsing logic must keep track of all group head documents -- for all groups encountered so far -- until it has evaluated all documents, because each document it considers may become the new group head of any group.diff --git a/solr/solr-ref-guide/src/common-query-parameters.adoc b/solr/solr-ref-guide/modules/query-guide/pages/common-query-parameters.adocsimilarity index 87%rename from solr/solr-ref-guide/src/common-query-parameters.adocrename to solr/solr-ref-guide/modules/query-guide/pages/common-query-parameters.adocindex caf9d82bd29..ddf10abd47e 100644--- a/solr/solr-ref-guide/src/common-query-parameters.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/common-query-parameters.adoc@@ -18,7 +18,7 @@Several query parsers share supported query parameters.-The following sections describe Solr's common query parameters, which are supported by the <<requesthandlers-searchcomponents#search-handlers,Search RequestHandlers>>.+The following sections describe Solr's common query parameters, which are supported by the xref:configuration-guide:requesthandlers-searchcomponents#search-handlers[search request handlers].== defType Parameter@@ -27,7 +27,7 @@ For example:`defType=dismax`-If no `defType` parameter is specified, then by default, the <<standard-query-parser.adoc#,Standard Query Parser>> is used.+If no `defType` parameter is specified, then by default, the xref:standard-query-parser.adoc[] is used.(e.g., `defType=lucene`)== sort Parameter@@ -39,16 +39,16 @@ The directions can be entered in either all lowercase or all uppercase letters (Solr can sort query responses according to:* Document scores-* <<function-queries.adoc#sort-by-function,Function results>>+* xref:function-queries.adoc#sort-by-function[Function results]* The value of any primitive field (numerics, string, boolean, dates, etc.) which has `docValues="true"` (or `multiValued="false"` and `indexed="true"`, in which case the indexed terms will used to build DocValue like structures on the fly at runtime)* A SortableTextField which implicitly uses `docValues="true"` by default to allow sorting on the original input string regardless of the analyzers used for Searching.* A single-valued TextField that uses an analyzer (such as the KeywordTokenizer) that produces only a single term per document.TextField does not support `docValues="true"`, but a DocValue-like structure will be built on the fly at runtime.-** *NOTE:* If you want to be able to sort on a field whose contents you want to tokenize to facilitate searching, <<copy-fields.adoc#,use a `copyField` directive>> in the Schema to clone the field.+** *NOTE:* If you want to be able to sort on a field whose contents you want to tokenize to facilitate searching, xref:indexing-guide:copy-fields.adoc[use a `copyField` directive] in the Schema to clone the field.Then search on the field and sort on its clone.In the case of primitive fields, or SortableTextFields, that are `multiValued="true"` the representative value used for each doc when sorting depends on the sort direction: The minimum value in each document is used for ascending (`asc`) sorting, while the maximal value in each document is used for descending (`desc`) sorting.-This default behavior is equivalent to explicitly sorting using the 2 argument `<<function-queries.adoc#field-function,field()>>` function: `sort=field(name,min) asc` and `sort=field(name,max) desc`+This default behavior is equivalent to explicitly sorting using the 2 argument xref:function-queries.adoc#field-function[`field()`] function: `sort=field(name,min) asc` and `sort=field(name,max) desc`The table below explains how Solr responds to various settings of the `sort` parameter.@@ -98,7 +98,7 @@ That is, by default, Solr returns 10 documents at a time in response to a query.== canCancel ParameterThis parameter defines if this query is cancellable during execution using the-<<task-management.adoc#,task management>> interface.+xref:deployment-guide:task-management.adoc[task management] interface.== queryUUID Parameter@@ -139,8 +139,8 @@ fq=+popularity:[10 TO *] +section:0* The document sets from each filter query are cached independently.Thus, concerning the previous examples: use a single `fq` containing two mandatory clauses if those clauses appear together often, and use two separate `fq` parameters if they are relatively independent.-(To learn about tuning cache sizes and making sure a filter cache actually exists, see <<caches-warming.adoc#caches,Caches>>.)-* It is also possible to use <<standard-query-parser.adoc#differences-between-lucenes-classic-query-parser-and-solrs-standard-query-parser,filter(condition) syntax>> inside the `fq` to cache clauses individually and - among other things - to achieve union of cached filter queries.+(To learn about tuning cache sizes and making sure a filter cache actually exists, see xref:configuration-guide:caches-warming.adoc#caches[Caches].)+* It is also possible to use xref:standard-query-parser.adoc#differences-between-lucenes-classic-query-parser-and-solrs-standard-query-parser[filter(condition) syntax] inside the `fq` to cache clauses individually and - among other things - to achieve union of cached filter queries.* As with all parameters: special characters in an URL need to be properly escaped and encoded as hex values.Online tools are available to help you with URL-encoding.@@ -148,8 +148,8 @@ For example: http://meyerweb.com/eric/tools/dencoder/.=== cache Local Parameter-Solr caches the results of filter queries by default in the <<caches-warming.adoc#filter-cache,filter cache>>.-To disable it, use the boolean `cache` <<local-params.adoc#,local param>>, such as `fq={!geofilt cache=false}...`.+Solr caches the results of filter queries by default in the xref:configuration-guide:caches-warming.adoc#filter-cache[filter cache].+To disable it, use the boolean `cache` xref:local-params.adoc[local param], such as `fq={!geofilt cache=false}...`.Do this when you think a query is unlikely to be repeated.Non-cached filter queries also support the `cost` local parameter to provide a _hint_ as to the order in which they are evaluated.@@ -208,7 +208,7 @@ This table shows some basic examples of how to use `fl`:=== Functions with fl-<<function-queries.adoc#,Functions>> can be computed for each document in the result and returned as a pseudo-field:+xref:function-queries.adoc[] can be computed for each document in the result and returned as a pseudo-field:[source,text]----@@ -217,7 +217,7 @@ fl=id,title,product(price,popularity)=== Document Transformers with fl-<<document-transformers.adoc#,Document Transformers>> can be used to modify the information returned about each documents in the results of a query:+xref:document-transformers.adoc[] can be used to modify the information returned about each documents in the results of a query:[source,text]----@@ -287,9 +287,9 @@ The default value of this parameter is blank, which causes no extra "explain inf== timeAllowed ParameterThis parameter specifies the amount of time, in milliseconds, allowed for a search to complete.-If this time expires before the search is complete, any partial results will be returned, but values such as `numFound`, <<faceting.adoc#,facet>> counts, and result <<stats-component.adoc#,stats>> may not be accurate for the entire result set.+If this time expires before the search is complete, any partial results will be returned, but values such as `numFound`, xref:faceting.adoc[facet] counts, and result xref:stats-component.adoc[stats] may not be accurate for the entire result set.In case of expiration, if `omitHeader` isn't set to `true` the response header contains a special flag called `partialResults`.-When using `timeAllowed` in combination with <<pagination-of-results.adoc#using-cursors,`cursorMark`>>, and the `partialResults` flag is present, some matching documents may have been skipped in the result set.+When using `timeAllowed` in combination with xref:pagination-of-results.adoc#using-cursors[`cursorMark`], and the `partialResults` flag is present, some matching documents may have been skipped in the result set.Additionally, if the `partialResults` flag is present, `cursorMark` can match `nextCursorMark` even if there may be more results[source,json]@@ -326,11 +326,11 @@ Regular search, JSON Facet and the Analytics component abandon requests in accorThis parameter may be set to either `true` or `false`.-If set to `true`, and if <<index-segments-merging.adoc#mergepolicyfactory,the mergePolicyFactory>> for this collection is a {solr-javadocs}/core/org/apache/solr/index/SortingMergePolicyFactory.html[`SortingMergePolicyFactory`] which uses a `sort` option compatible with <<sort Parameter,the sort parameter>> specified for this query, then Solr will be able to skip documents on a per-segment basis that are definitively not candidates for the current page of results.+If set to `true`, and if xref:configuration-guide:index-segments-merging.adoc#mergepolicyfactory[the mergePolicyFactory] for this collection is a {solr-javadocs}/core/org/apache/solr/index/SortingMergePolicyFactory.html[`SortingMergePolicyFactory`] which uses a `sort` option compatible with <<sort Parameter,the sort parameter>> specified for this query, then Solr will be able to skip documents on a per-segment basis that are definitively not candidates for the current page of results.If early termination is used, a `segmentTerminatedEarly` header will be included in the `responseHeader`.-Similar to using <<timeAllowed Parameter,the `timeAllowed` Parameter>>, when early segment termination happens values such as `numFound`, <<faceting.adoc#,Facet>> counts, and result <<stats-component.adoc#,Stats>> may not be accurate for the entire result set.+Similar to using <<timeAllowed Parameter,the `timeAllowed` Parameter>>, when early segment termination happens values such as `numFound`, xref:faceting.adoc[Facet] counts, and result xref:stats-component.adoc[Stats] may not be accurate for the entire result set.The default value of this parameter is `false`.@@ -341,12 +341,12 @@ This parameter may be set to either `true` or `false`.If set to `true`, this parameter excludes the header from the returned results.The header contains information about the request, such as the time it took to complete.The default value for this parameter is `false`.-When using parameters such as <<common-query-parameters.adoc#timeallowed-parameter,`timeAllowed`>>, and <<solrcloud-distributed-requests.adoc#shards-tolerant-parameter,`shards.tolerant`>>, which can lead to partial results, it is advisable to keep the header, so that the `partialResults` flag can be checked, and values such as `numFound`, `nextCursorMark`, <<faceting.adoc#,Facet>> counts, and result <<stats-component.adoc#,Stats>> can be interpreted in the context of partial results.+When using parameters such as <<timeallowed-parameter,`timeAllowed`>>, and xref:deployment-guide:solrcloud-distributed-requests.adoc#shards-tolerant-parameter[`shards.tolerant`], which can lead to partial results, it is advisable to keep the header, so that the `partialResults` flag can be checked, and values such as `numFound`, `nextCursorMark`, xref:faceting.adoc[Facet] counts, and result xref:stats-component.adoc[Stats] can be interpreted in the context of partial results.== wt ParameterThe `wt` parameter selects the Response Writer that Solr should use to format the query's response.-For detailed descriptions of Response Writers, see <<response-writers.adoc#,Response Writers>>.+For detailed descriptions of Response Writers, see xref:response-writers.adoc[].If you do not define the `wt` parameter in your queries, JSON will be returned as the format of the response.diff --git a/solr/solr-ref-guide/src/computational-geometry.adoc b/solr/solr-ref-guide/modules/query-guide/pages/computational-geometry.adocsimilarity index 97%rename from solr/solr-ref-guide/src/computational-geometry.adocrename to solr/solr-ref-guide/modules/query-guide/pages/computational-geometry.adocindex 3be20a023f1..02006bcc6b6 100644--- a/solr/solr-ref-guide/src/computational-geometry.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/computational-geometry.adoc@@ -42,7 +42,7 @@ Before visualizing the convex hull its often useful to visualize the 2D points aIn this example the `random` function draws a sample of records from the NYC311 (complaints database) collection where the complaint description matches "rat sighting" and the zip code is 11238.The latitude and longitude fields are then vectorized and plotted as a scatter plot with longitude on x-axis and latitude on the y-axis.-image::images/math-expressions/convex0.png[]+image::math-expressions/convex0.png[]Notice from the scatter plot that many of the points appear to lie near the border of the plot.@@ -62,7 +62,7 @@ The `colAt` function can then be used to retrieve the latitude and longitude vecso they can visualized by the `zplot` function.In the example below the convex hull points are visualized as a scatter plot.-image::images/math-expressions/hullplot.png[]+image::math-expressions/hullplot.png[]Notice that the 15 points in the scatter plot describe that latitude and longitude points of the convex hull.@@ -75,7 +75,7 @@ The `projectToBorder` function returns a matrix of lat/lon points for the borderIn the example the matrix of border points is then clustered into 7 clusters using kmeans clustering.The `zplot` function is then used to plot the clustered border points.-image::images/math-expressions/convex1.png[]+image::math-expressions/convex1.png[]Notice in the visualization its easy to see which spots along the border have the highest density of points.In the case of the rat sightings this information is useful in understanding which border points are closest for the rats to enter or exit from.@@ -88,7 +88,7 @@ The example below extracts the centroids from the clusters using the `getCentroi`getCentroids` returns the matrix of lat/lon points which represent the centroids of border clusters.The `colAt` function can then be used to extract the lat/lon vectors so they can be plotted on a map using `zplot`.-image::images/math-expressions/convex2.png[]+image::math-expressions/convex2.png[]The map above shows the centroids of the border clusters.The centroids from the highest density clusters can now be zoomed and investigated geo-spatially to determine what might be the best places to begin an investigation of the border.diff --git a/solr/solr-ref-guide/src/curve-fitting.adoc b/solr/solr-ref-guide/modules/query-guide/pages/curve-fitting.adocsimilarity index 94%rename from solr/solr-ref-guide/src/curve-fitting.adocrename to solr/solr-ref-guide/modules/query-guide/pages/curve-fitting.adocindex d5a79ede503..afd90f9a803 100644--- a/solr/solr-ref-guide/src/curve-fitting.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/curve-fitting.adoc@@ -33,7 +33,7 @@ The `polyfit` function can be visualized in a similar manner to linear regressioThe example below uses the `polyfit` function to fit a non-linear curve to a scatter plot of a random sample.The blue points are the scatter plot of the original observations and the red points are the predicted curve.-image::images/math-expressions/polyfit.png[]+image::math-expressions/polyfit.png[]In the example above a random sample containing two fields, `filesize_d` and `response_d`, is drawn from the `logs` collection.The two fields are vectorized and set to the variables `x` and `y`.@@ -44,7 +44,7 @@ The `polyfit` function returns a model that is then directly plotted by `zplot`The fitted model can also be used by the `predict` function in the same manner as linear regression.The example below uses the fitted model to predict a response time for a file size of 42000.-image::images/math-expressions/polyfit-predict.png[]+image::math-expressions/polyfit-predict.png[]If an array of predictor values is provided an array of predictions will be returned.@@ -56,7 +56,7 @@ The residuals can be calculated and visualized in the same manner as linear regrIn the example below the `ebeSubtract` function is used to subtract the fitted model from the observed values, to calculate a vector of residuals.The residuals are then plotted in a *residual plot* with the predictions along the x-axis and the model error on the y-axis.-image::images/math-expressions/polyfit-resid.png[]+image::math-expressions/polyfit-resid.png[]== Gaussian Curve Fitting@@ -83,11 +83,11 @@ The bin count vector is then passed to `gaussfit` as the y-axis.In the example below, the blue line is the bin counts, and the smooth yellow line is the fitted curve.We can see that the binned residuals fit fairly well to a normal distribution.-image::images/math-expressions/gaussfit.png[]+image::math-expressions/gaussfit.png[]The second plot shows the two curves overlaid with an area chart:-image::images/math-expressions/gaussfit2.png[]+image::math-expressions/gaussfit2.png[]== Harmonic Curve Fitting@@ -106,11 +106,11 @@ After the curve has been fit it can be extrapolated to any point in time in theIn the example below the original control points are shown in blue and the fitted curve is shown in yellow.-image::images/math-expressions/harmfit.png[]+image::math-expressions/harmfit.png[]The output of `harmfit` is a model that can be used by the `predict` function to interpolate and extrapolate the sine wave.In the example below the `natural` function creates an x-axis from 0 to 127used to predict results for the model.This extrapolates the sine wave out to 128 points, when the original model curve had only 19 control points.-image::images/math-expressions/harmfit2.png[]+image::math-expressions/harmfit2.png[]diff --git a/solr/solr-ref-guide/src/dense-vector-search.adoc b/solr/solr-ref-guide/modules/query-guide/pages/dense-vector-search.adocsimilarity index 99%rename from solr/solr-ref-guide/src/dense-vector-search.adocrename to solr/solr-ref-guide/modules/query-guide/pages/dense-vector-search.adocindex 273520fc373..c50f4abf1d5 100644--- a/solr/solr-ref-guide/src/dense-vector-search.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/dense-vector-search.adoc@@ -305,7 +305,7 @@ This means the second pass `knn` is executed on the whole index anyway, which isThe final ranked list of results will have the first pass score(main query `q`) added to the second pass score(the approximated similarityFunction distance to the target vector to search) multiplied by a multiplicative factor(reRankWeight).-Details about using the ReRank Query Parser can be found in the <<query-re-ranking.adoc#,Query Re-Ranking>> section.+Details about using the ReRank Query Parser can be found in the xref:query-guide:query-re-ranking.adoc[Query Re-Ranking] section.====== Additional Resourcesdiff --git a/solr/solr-ref-guide/src/dismax-query-parser.adoc b/solr/solr-ref-guide/modules/query-guide/pages/dismax-query-parser.adocsimilarity index 94%rename from solr/solr-ref-guide/src/dismax-query-parser.adocrename to solr/solr-ref-guide/modules/query-guide/pages/dismax-query-parser.adocindex c16489889c2..52d209bafdf 100644--- a/solr/solr-ref-guide/src/dismax-query-parser.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/dismax-query-parser.adoc@@ -182,14 +182,14 @@ The overall impact a particular `bq` parameter will have on a given document can"Multiplicative Boosting" is generally considered to be a more predictable method of influencing document score, because it acts as a "scaling factor" -- increasing (or decreasing) the scores of each document by a _relative_ amount.-The <<other-parsers.adoc#boost-query-parser,`{!boost}` QParser>> provides a convenient wrapper for implementing multiplicative boosting, and the <<edismax-query-parser.adoc#extended-dismax-parameters,`{!edismax}` QParser>> offers a `boost` query parameter shortcut for using it.+The xref:other-parsers.adoc#boost-query-parser[`{!boost}` QParser] provides a convenient wrapper for implementing multiplicative boosting, and the xref:edismax-query-parser.adoc#extended-dismax-parameters[`{!edismax}` QParser] offers a `boost` query parameter shortcut for using it.======= bf (Boost Functions) Parameter-The `bf` parameter specifies functions (with optional <<standard-query-parser.adoc#boosting-a-term-with,query boost>>) that will be used to construct FunctionQueries which will be _added_ to the user's main query as optional clauses that will influence the score.-Any <<function-queries.adoc#available-functions,function supported natively by Solr>> can be used, along with a boost value.+The `bf` parameter specifies functions (with optional xref:standard-query-parser.adoc#boosting-a-term-with[query boost]) that will be used to construct FunctionQueries which will be _added_ to the user's main query as optional clauses that will influence the score.+Any xref:function-queries.adoc#available-functions[function] supported natively by Solr can be used, along with a boost value.For example:[source,text]@@ -198,7 +198,7 @@ q=cheesebf=div(1,sum(1,price))^1.5-----Specifying functions with the bf parameter is essentially just shorthand for using the `bq` parameter (<<#bq-bf-shortcomings,with the same shortcomings>>) combined with the `{!func}` parser -- with the addition of the simplified "query boost" syntax.+Specifying functions with the bf parameter is essentially just shorthand for using the `bq` parameter (<<bq-bf-shortcomings,with the same shortcomings>>) combined with the `{!func}` parser -- with the addition of the simplified "query boost" syntax.For example, the two `bf` parameters listed below, are completely equivalent to the two `bq` parameters below:diff --git a/solr/solr-ref-guide/src/document-transformers.adoc b/solr/solr-ref-guide/modules/query-guide/pages/document-transformers.adocsimilarity index 96%rename from solr/solr-ref-guide/src/document-transformers.adocrename to solr/solr-ref-guide/modules/query-guide/pages/document-transformers.adocindex 8aa005dfb75..c1ddce4ed91 100644--- a/solr/solr-ref-guide/src/document-transformers.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/document-transformers.adoc@@ -126,10 +126,10 @@ A default style can be configured by specifying an `args` parameter in your `sol=== [child] - ChildDocTransformerFactory-This transformer returns all <<indexing-nested-documents.adoc#,descendant documents>> of each parent document matching your query.+This transformer returns all xref:indexing-guide:indexing-nested-documents.adoc[descendant documents] of each parent document matching your query.This is useful when you have indexed nested child documents and want to retrieve the child documents for the relevant parent documents for any type of search query.-Note that this transformer can be used even when the query used to match the result documents is not a <<block-join-query-parser.adoc#,Block Join query>>.+Note that this transformer can be used even when the query used to match the result documents is not a xref:block-join-query-parser.adoc[Block Join query].[source,plain]@@ -137,7 +137,7 @@ Note that this transformer can be used even when the query used to match the resq=book_title:Solr&fl=id,[child childFilter=doc_type:chapter limit=100]-----If the documents involved include a `\_nest_path_` field, then it is used to re-create the hierarchical structure of the descendent documents using the original pseudo-field names the documents were indexed with, otherwise the descendent documents are returned as a flat list of <<indexing-nested-documents#indexing-anonymous-children,anonymous children>>.+If the documents involved include a `\_nest_path_` field, then it is used to re-create the hierarchical structure of the descendent documents using the original pseudo-field names the documents were indexed with, otherwise the descendent documents are returned as a flat list of xref:indexing-guide:indexing-nested-documents#indexing-anonymous-children[anonymous children].`childFilter`::+@@ -224,7 +224,7 @@ DocIdAugmenterFactory does not support any request parameters, or configuration=== [elevated] and [excluded]-These transformers are available only when using the <<query-elevation-component.adoc#,Query Elevation Component>>.+These transformers are available only when using the xref:query-elevation-component.adoc[].* `[elevated]` annotates each document to indicate if it was elevated or not.* `[excluded]` annotates each document to indicate if it would have been excluded - this is only supported if you also use the `markExcludes` parameter.@@ -389,7 +389,7 @@ Formats spatial data from a spatial field using a designated format type name.Two inner parameters are required: `f` for the field name, and `w` for the format name.Example: `geojson:[geo f=mySpatialField w=GeoJSON]`.-Normally you'll simply be consistent in choosing the format type you want by setting the `format` attribute on the spatial field type to `WKT` or `GeoJSON` – see the section <<spatial-search.adoc#,Spatial Search>> for more information.+Normally you'll simply be consistent in choosing the format type you want by setting the `format` attribute on the spatial field type to `WKT` or `GeoJSON` – see the section xref:spatial-search.adoc[] for more information.If you are consistent, it'll come out the way you stored it.This transformer offers a convenience to transform the spatial format to something different on retrieval.@@ -401,7 +401,7 @@ In a sense this double-storage between docValues and stored-value storage isn't=== [features] - LTRFeatureLoggerTransformerFactory-The "LTR" prefix stands for <<learning-to-rank.adoc#,Learning To Rank>>.+The "LTR" prefix stands for xref:learning-to-rank.adoc[].This transformer returns the values of features and it can be used for feature extraction and feature logging.[source,plain]diff --git a/solr/solr-ref-guide/src/dsp.adoc b/solr/solr-ref-guide/modules/query-guide/pages/dsp.adocsimilarity index 94%rename from solr/solr-ref-guide/src/dsp.adocrename to solr/solr-ref-guide/modules/query-guide/pages/dsp.adocindex 7e014b2aaef..e0662bc5416 100644--- a/solr/solr-ref-guide/src/dsp.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/dsp.adoc@@ -36,7 +36,7 @@ Notice that the original vector has 13 elements but the result of the moving aveThis is because the `movingAvg` function only begins generating results when it has a full window.The `ltrim` function is used to trim the first four elements from the original `y` array to line up with the moving average.-image::images/math-expressions/conv1.png[]+image::math-expressions/conv1.png[]=== Convolutional Smoothing@@ -47,14 +47,14 @@ In the example below the `conv` function is used to compute the moving average oLooking at the result, we see that the convolution produced an array with 17 values instead of the 9 values created by the moving average.That is because the `conv` function pads zeros to the front and back of the first vector so that the window size is always full.-image::images/math-expressions/conv2.png[]+image::math-expressions/conv2.png[]We achieve the same result as the `movingAvg` function by trimming the first and last 4 values of the convolution result using the `ltrim` and `rtrim` functions.The example below plots both the trimmed convolution and the moving average on the same plot.Notice that they perfectly overlap.-image::images/math-expressions/conv3.png[]+image::math-expressions/conv3.png[]This demonstrates how convolution can be used to smooth a signal by sliding a filter across the signal and computing the dot product at each point.The smoothing effect is caused by the design of the filter.@@ -83,7 +83,7 @@ The light blue line is the convolution and the orange line is the moving averageNotice that the convolution responds quicker to the movements in the underlying array.This is because more weight has been placed at the front of the filter.-image::images/math-expressions/conv4.png[]+image::math-expressions/conv4.png[]== Cross-Correlation@@ -101,7 +101,7 @@ The `conv` function reverses the second vector so it will be flipped back to itsNotice in the result the highest value is 217.This is the point where the two vectors have the highest correlation.-image::images/math-expressions/crosscorr.png[]+image::math-expressions/crosscorr.png[]== Find Delay@@ -112,7 +112,7 @@ Under the covers `finddelay` uses convolutional math to compute the cross-correlBelow is an example of the `finddelay` function.Notice that the `finddelay` function reports a 3 period delay between the first and second signal.-image::images/math-expressions/delay.png[]+image::math-expressions/delay.png[]== Oscillate (Sine Wave)@@ -127,7 +127,7 @@ Below is an example of the `oscillate` function called with an amplitude of1, and angular frequency of .28 and phase of 1.57.-image::images/math-expressions/sinewave.png[]+image::math-expressions/sinewave.png[]=== Sine Wave Interpolation & Extrapolation@@ -135,7 +135,7 @@ The `oscillate` function returns a function which can be used by the `predict` fThe example below extrapolates the sine wave to an x-axis sequence of 0-256.-image::images/math-expressions/sinewave256.png[]+image::math-expressions/sinewave256.png[]== Autocorrelation@@ -150,14 +150,14 @@ The result of this is plotted in the image below.Notice that there is a structure to the plot that is clearly not random.-image::images/math-expressions/sinewave256.png[]+image::math-expressions/sinewave256.png[]In the next example the `sample` function is used to draw 256 samples from a `uniformDistribution` to create a vector of random data.The result of this is plotted in the image below.Notice that there is no clear structure to the data and the data appears to be random.-image::images/math-expressions/noise.png[]+image::math-expressions/noise.png[]In the next example the random noise is added to the sine wave using the `ebeAdd` function.The result of this is plotted in the image below.@@ -165,7 +165,7 @@ Notice that the sine wave has been hidden somewhat within the noise.Its difficult to say for sure if there is structure.As plots becomes more dense it can become harder to see a pattern hidden within noise.-image::images/math-expressions/hidden-signal.png[]+image::math-expressions/hidden-signal.png[]In the next examples autocorrelation is performed with each of the vectors shown above to see what the autocorrelation plots look like.@@ -179,7 +179,7 @@ Following the peak the correlation moves up and down in decreasing intensity asThis is the autocorrelation plot of a pure signal.-image::images/math-expressions/signal-autocorrelation.png[]+image::math-expressions/signal-autocorrelation.png[]In the example below autocorrelation is performed with the vector of pure noise.Notice that the autocorrelation plot has a very different plot then the sine wave.@@ -189,13 +189,13 @@ This is followed by another long period of low intensity correlation.This is the autocorrelation plot of pure noise.-image::images/math-expressions/noise-autocorrelation.png[]+image::math-expressions/noise-autocorrelation.png[]In the example below autocorrelation is performed on the vector with the sine wave hidden within the noise.Notice that this plot shows very clear signs of structure which is similar to autocorrelation plot of the pure signal.The correlation is less intense due to noise but the shape of the correlation plot suggests strongly that there is an underlying signal hidden within the noise.-image::images/math-expressions/hidden-signal-autocorrelation.png[]+image::math-expressions/hidden-signal-autocorrelation.png[]== Discrete Fourier Transform@@ -243,7 +243,7 @@ This is the power associated with the specific frequency of the sine wave.The vast majority of frequencies in the plot have close to 0 power associated with them.This `fft` shows a clear signal with very low levels of noise.-image::images/math-expressions/signal-fft.png[]+image::math-expressions/signal-fft.png[]In the second example the `fft` function is called on a vector of random data similar to one used in the autocorrelation example.The plot of the real values of the `fft` response is shown below.@@ -252,7 +252,7 @@ Notice that in is this response there is no clear peak.Instead all frequencies have accumulated a random level of power.This `fft` shows no clear sign of signal and appears to be noise.-image::images/math-expressions/noise-fft.png[]+image::math-expressions/noise-fft.png[]In the third example the `fft` function is called on the same signal hidden within noise that was used for the autocorrelation example.The plot of the real values of the `fft` response is shown below.@@ -261,4 +261,4 @@ Notice that there are two clear mirrored peaks, at the same locations as the `ffBut there is also now considerable noise on the frequencies.The `fft` has found the signal and but also shows that there is considerable noise along with the signal.-image::images/math-expressions/hidden-signal-fft.png[]+image::math-expressions/hidden-signal-fft.png[]diff --git a/solr/solr-ref-guide/src/edismax-query-parser.adoc b/solr/solr-ref-guide/modules/query-guide/pages/edismax-query-parser.adocsimilarity index 89%rename from solr/solr-ref-guide/src/edismax-query-parser.adocrename to solr/solr-ref-guide/modules/query-guide/pages/edismax-query-parser.adocindex 1eabda29bb5..fd9a7adf5e2 100644--- a/solr/solr-ref-guide/src/edismax-query-parser.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/edismax-query-parser.adoc@@ -16,11 +16,11 @@// specific language governing permissions and limitations// under the License.-The Extended DisMax (eDisMax) query parser is an improved version of the <<dismax-query-parser.adoc#,DisMax query parser>>.+The Extended DisMax (eDisMax) query parser is an improved version of the xref:dismax-query-parser.adoc[].In addition to supporting all the DisMax query parser parameters, Extended DisMax:-* supports <<standard-query-parser.adoc#,Solr's standard query parser>> syntax such as (non-exhaustive list):+* supports xref:standard-query-parser.adoc[] syntax such as (non-exhaustive list):** boolean operators such as AND (+, &&), OR (||), NOT (-).** optionally treats lowercase "and" and "or" as "AND" and "OR" in Lucene syntax mode** optionally allows embedded queries using other query parsers or functions@@ -28,13 +28,13 @@ In addition to supporting all the DisMax query parser parameters, Extended DisMa* improves proximity boosting by using word shingles; you do not need the query to match all words in the document before proximity boosting is applied.* includes advanced stopword handling: stopwords are not required in the mandatory part of the query but are still used in the proximity boosting part.If a query consists of all stopwords, such as "to be or not to be", then all words are required.-* includes improved boost function: in Extended DisMax, the `boost` function is a multiplier <<dismax-query-parser.adoc#bq-bf-shortcomings,rather than an addend>>, improving your boost results; the additive boost functions of DisMax (`bf` and `bq`) are also supported.+* includes improved boost function: in Extended DisMax, the `boost` function is a multiplier xref:dismax-query-parser.adoc#bq-bf-shortcomings[rather than an addend], improving your boost results; the additive boost functions of DisMax (`bf` and `bq`) are also supported.* supports pure negative nested queries: queries such as `+foo (-foo)` will match all documents.* lets you specify which fields the end user is allowed to query, and to disallow direct fielded searches.== Extended DisMax Parameters-In addition to all the <<dismax-query-parser.adoc#dismax-query-parser-parameters,DisMax parameters>>, Extended DisMax includes these query parameters:+In addition to all the xref:dismax-query-parser.adoc#dismax-query-parser-parameters[DisMax parameters], Extended DisMax includes these query parameters:`sow`::Split on whitespace.@@ -43,7 +43,7 @@ The default is `false`; whitespace-separated term sequences will be provided to`mm`::Minimum should match.-See the <<dismax-query-parser.adoc#mm-minimum-should-match-parameter,DisMax mm parameter>> for a description of `mm`.+See the xref:dismax-query-parser.adoc#mm-minimum-should-match-parameter[DisMax `mm` parameter] for a description of `mm`.The default eDisMax `mm` value differs from that of DisMax:+* The default `mm` value is 0%:@@ -52,14 +52,14 @@ The default eDisMax `mm` value differs from that of DisMax:* The default `mm` value is 100% if `q.op` is "AND" and the query does not contain any explicit operators other than "AND".`mm.autoRelax`::-If `true`, the number of clauses required (<<dismax-query-parser.adoc#mm-minimum-should-match-parameter,minimum should match>>) will automatically be relaxed if a clause is removed (by e.g., stopwords filter) from some but not all <<dismax-query-parser.adoc#qf-query-fields-parameter,`qf`>> fields.+If `true`, the number of clauses required will automatically be relaxed if a clause is removed (by e.g., stopwords filter) from some but not all xref:dismax-query-parser.adoc#qf-query-fields-parameter[`qf`] fields.Use this parameter as a workaround if you experience that queries return zero hits due to uneven stopword removal between the `qf` fields.+Note that relaxing `mm` may cause undesired side effects, such as hurting the precision of the search, depending on the nature of your index content.`boost`::-A multivalued list of strings parsed as <<function-queries.adoc#available-functions,functions>> whose results will be multiplied into the score from the main query for all matching documents.-This parameter is shorthand for wrapping the query produced by eDisMax using the <<other-parsers.adoc#boost-query-parser,`BoostQParserPlugin`>>.+A multivalued list of strings parsed as xref:function-queries.adoc#available-functions[functions] whose results will be multiplied into the score from the main query for all matching documents.+This parameter is shorthand for wrapping the query produced by eDisMax using the xref:other-parsers.adoc#boost-query-parser[`BoostQParserPlugin`].These two examples are equivalent:[source,text]diff --git a/solr/solr-ref-guide/src/exporting-result-sets.adoc b/solr/solr-ref-guide/modules/query-guide/pages/exporting-result-sets.adocsimilarity index 84%rename from solr/solr-ref-guide/src/exporting-result-sets.adocrename to solr/solr-ref-guide/modules/query-guide/pages/exporting-result-sets.adocindex 3c5e3a78099..6719d378013 100644--- a/solr/solr-ref-guide/src/exporting-result-sets.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/exporting-result-sets.adoc@@ -16,7 +16,7 @@// specific language governing permissions and limitations// under the License.-The `/export` request handler allows a fully sorted result set to be streamed out of Solr using a special <<query-re-ranking.adoc#,rank query parser>> and <<response-writers.adoc#,response writer>>.+The `/export` request handler allows a fully sorted result set to be streamed out of Solr using a special xref:query-re-ranking.adoc[rank query parser] and xef:response-writers.adoc[response writer].These have been specifically designed to work together to handle scenarios that involve sorting and exporting millions of records.This feature uses a stream sorting technique that begins to send records within milliseconds and continues to stream results until the entire result set has been sorted and exported.@@ -26,11 +26,11 @@ The cases where this functionality may be useful include: session analysis, dist== Field RequirementsAll the fields being sorted and exported must have docValues set to `true`.-For more information, see the section on <<docvalues.adoc#,DocValues>>.+For more information, see the section on xref:indexing-guide:docvalues.adoc[].== The /export RequestHandler-The `/export` request handler with the appropriate configuration is one of Solr's out-of-the-box request handlers - see <<implicit-requesthandlers.adoc#,Implicit Request Handlers>> for more information.+The `/export` request handler with the appropriate configuration is one of Solr's out-of-the-box request handlers - see xref:configuration-guide:implicit-requesthandlers.adoc[] for more information.Note that this request handler's properties are defined as "invariants", which means they cannot be overridden by other properties passed at another time (such as at query time).@@ -74,13 +74,13 @@ However, returning scores and wildcards are not supported at this time.=== Specifying the Local Streaming Expression-The optional `expr` property defines a <<streaming-expressions.adoc#,stream expression>> that allows documents to be processed locally before they are exported in the result set.+The optional `expr` property defines a xref:streaming-expressions.adoc[stream expression] that allows documents to be processed locally before they are exported in the result set.Expressions have to use a special `input()` stream that represents original results from the `/export` handler.Output from the stream expression then becomes the output from the `/export` handler.The `&streamLocalOnly=true` flag is always set for this streaming expression.-Only stream <<stream-decorator-reference.adoc#,decorators>> and <<stream-evaluator-reference.adoc#,evaluators>> are supported in these expressions - using any of the <<stream-source-reference.adoc#,source>> expressions except for the pre-defined `input()` will result in an error.+Only stream xref:stream-decorator-reference.adoc[decorators] and xref:stream-evaluator-reference.adoc[evaluators] are supported in these expressions - using any of the xref:stream-source-reference.adoc[source] expressions except for the pre-defined `input()` will result in an error.Using stream expressions with the `/export` handler may result in dramatic performance improvements due to the local in-memory reduction of the number of documents to be returned.@@ -104,4 +104,4 @@ http://localhost:8983/solr/core_name/export?q=my-query&sort=reporter+desc,&fl=re== Distributed Support-See the section <<streaming-expressions.adoc#,Streaming Expressions>> for distributed support.+See the section xref:streaming-expressions.adoc[] for distributed support.diff --git a/solr/solr-ref-guide/src/faceting.adoc b/solr/solr-ref-guide/modules/query-guide/pages/faceting.adocsimilarity index 95%rename from solr/solr-ref-guide/src/faceting.adocrename to solr/solr-ref-guide/modules/query-guide/pages/faceting.adocindex e4a15ff4b75..8c1cacf9040 100644--- a/solr/solr-ref-guide/src/faceting.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/faceting.adoc@@ -21,7 +21,7 @@ Faceting is the arrangement of search results into categories based on indexed tSearchers are presented with the indexed terms, along with numerical counts of how many matching documents were found for each term.Faceting makes it easy for users to explore search results, narrowing in on exactly the results they are looking for.-See also <<json-facet-api.adoc#, JSON Facet API>> for an alternative approach to this.+See also xref:json-facet-api.adoc[] for an alternative approach to this.== General Facet Parameters@@ -68,7 +68,7 @@ For text fields that include stemming, lowercasing, or word splitting, the resulIf you want Solr to perform both analysis (for searching) and faceting on the full literal strings, use the `copyField` directive in your Schema to create two versions of the field: one Text and one String.The Text field should have `indexed="true" docValues=“false"` if used for searching but not faceting and the String field should have `indexed="false" docValues="true"` if used for faceting but not searching.-(For more information about the `copyField` directive, see <<fields-and-schema-design.adoc#,Fields and Schema Design>>.)+(For more information about the `copyField` directive, see xref:indexing-guide:copy-fields.adoc[].)Unless otherwise specified, all of the parameters below can be specified on a per-field basis with the syntax of `f.<fieldname>.facet.<parameter>`@@ -140,7 +140,7 @@ There are two options for this parameter.For terms in the ASCII range, this will be alphabetically sorted.+The default is `count` if `facet.limit` is greater than 0, otherwise, the default is `index`.-Note that the default logic is changed when <<#limiting-facet-with-certain-terms>>+Note that the default logic is changed when <<Limiting Facet with Certain Terms>>.`facet.limit`::+@@ -423,16 +423,16 @@ filter::: This method generates the ranges based on other facet.range parametersIt will make use of the filterCache, so it will benefit of a cache large enough to contain all ranges.+dv::: This method iterates the documents that match the main query, and for each of them finds the correct range for the value.-This method will make use of <<docvalues.adoc#,docValues>> (if enabled for the field) or fieldCache.-The `dv` method is not supported for field type DateRangeField or when using <<result-grouping.adoc#,group.facets>>.+This method will make use of xref:indexing-guide:docvalues.adoc[] (if enabled for the field) or fieldCache.+The `dv` method is not supported for field type DateRangeField or when using xref:result-grouping.adoc[group.facets].--.Date Ranges & Time Zones[NOTE]====-Range faceting on date fields is a common situation where the <<date-formatting-math.adoc#tz,`TZ`>> parameter can be useful to ensure that the "facet counts per day" or "facet counts per month" are based on a meaningful definition of when a given day/month "starts" relative to a particular TimeZone.+Range faceting on date fields is a common situation where the xref:indexing-guide:date-formatting-math.adoc#tz[`TZ`] parameter can be useful to ensure that the "facet counts per day" or "facet counts per month" are based on a meaningful definition of when a given day/month "starts" relative to a particular TimeZone.-For more information, see the examples in the <<date-formatting-math.adoc#,Working with Dates>> section.+For more information, see the examples in the section xref:indexing-guide:date-formatting-math.adoc[].======= facet.mincount in Range Faceting@@ -509,7 +509,7 @@ http://localhost:8983/solr/techproducts/select?q=*:*&facet.pivot=cat,popularity,=== Combining Stats Component With Pivots-In addition to some of the <<Local Params for Faceting,general local params>> supported by other types of faceting, a `stats` local params can be used with `facet.pivot` to refer to <<stats-component.adoc#,`stats.field`>> instances (by tag) that you would like to have computed for each Pivot Constraint.+In addition to some of the <<Local Params for Faceting,general local params>> supported by other types of faceting, a `stats` local params can be used with `facet.pivot` to refer to xref:stats-component.adoc[`stats.field`] instances (by tag) that you would like to have computed for each Pivot Constraint.In the example below, two different (overlapping) sets of statistics are computed for each of the facet.pivot result hierarchies:@@ -744,7 +744,7 @@ Even though the same functionality can be achieved by using a facet query with rIf you are concerned about the performance of your searches you should test with both options.Interval faceting tends to be better with multiple intervals for the same fields, while facet query tend to be better in environments where filter cache is more effective (static indexes for example).-This method will use <<docvalues.adoc#,docValues>> if they are enabled for the field, will use fieldCache otherwise.+This method will use xref:indexing-guide:docvalues.adoc[] if they are enabled for the field, will use fieldCache otherwise.Use these parameters for interval faceting:@@ -817,7 +817,7 @@ For example:== Local Params for Faceting-The <<local-params.adoc#,LocalParams syntax>> allows overriding global settings.+The xref:local-params.adoc[LocalParams syntax] allows overriding global settings.It can also provide a method of adding metadata to other parameter values, much like XML attributes.=== Tagging and Excluding Filters@@ -875,6 +875,6 @@ Note: other parameters might not be fully supported when this parameter is suppl== Related Topics-See <<spatial-search.adoc#,Spatial Search>> for examples of faceting by distance and generating heatmaps via faceting.+See xref:spatial-search.adoc[] for examples of faceting by distance and generating heatmaps via faceting.-See <<response-writers.adoc#json-nl, Response Writers>> for details on the `json.nl` parameter for controlling the format for writing out field facet data when using the JSON response writer.+See xref:response-writers.adoc#json-nl[json.nl] for details on the `json.nl` parameter for controlling the format for writing out field facet data when using the JSON response writer.diff --git a/solr/solr-ref-guide/src/function-queries.adoc b/solr/solr-ref-guide/modules/query-guide/pages/function-queries.adocsimilarity index 96%rename from solr/solr-ref-guide/src/function-queries.adocrename to solr/solr-ref-guide/modules/query-guide/pages/function-queries.adocindex f827253b438..be91507526f 100644--- a/solr/solr-ref-guide/src/function-queries.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/function-queries.adoc@@ -18,7 +18,7 @@Function queries enable you to generate a relevancy score using the actual value of one or more numeric fields.-Function queries are supported by the <<dismax-query-parser.adoc#,DisMax>>, <<edismax-query-parser.adoc#,Extended DisMax>>, and <<standard-query-parser.adoc#,standard>> query parsers.+Function queries are supported by the xref:dismax-query-parser.adoc[], xref:edismax-query-parser.adoc[], and xref:standard-query-parser.adoc[].Function queries use _functions_.The functions can be a constant (numeric or string literal), a field, another function or a parameter substitution argument.@@ -31,7 +31,7 @@ Functions must be expressed as function calls (for example, `sum(a,b)` instead oThere are several ways of using function queries in a Solr query:-* Via an explicit query parser that expects function arguments, such <<other-parsers.adoc#function-query-parser,`func`>> or <<other-parsers.adoc#function-range-query-parser,`frange`>>.+* Via an explicit query parser that expects function arguments, such xref:other-parsers.adoc#function-query-parser[`func`] or xref:other-parsers.adoc#function-range-query-parser[`frange`].For example:+[source,text]@@ -63,7 +63,8 @@ the output would be:<float name="score">0.343</float>...-----* Use in a parameter that is explicitly for specifying functions, such as the eDisMax query parser's <<edismax-query-parser.adoc#extended-dismax-parameters,`boost` parameter>>, or the DisMax query parser's <<dismax-query-parser.adoc#bf-boost-functions-parameter,`bf` (boost function) parameter>>. (Note that the `bf` parameter actually takes a list of function queries separated by white space and each with an optional boost.+* Use in a parameter that is explicitly for specifying functions, such as the eDisMax query parser's xref:edismax-query-parser.adoc#extended-dismax-parameters[`boost` parameter], or the DisMax query parser's xref:dismax-query-parser.adoc#bf-boost-functions-parameter[`bf` (boost function) parameter].+(Note that the `bf` parameter actually takes a list of function queries separated by white space and each with an optional boost.Make sure you eliminate any internal white space in single function queries when using `bf`).For example:+@@ -94,7 +95,7 @@ Returns the absolute value of the specified value or function.* `abs(-5)`=== childfield(field) Function-Returns the value of the given field for one of the matched child docs when searching by <<block-join-query-parser.adoc#block-join-parent-query-parser,{!parent}>>.+Returns the value of the given field for one of the matched child docs when searching by xref:block-join-query-parser.adoc#block-join-parent-query-parser[`{!parent}`].It can be used only in `sort` parameter.*Syntax Examples*@@ -284,7 +285,7 @@ Use the `field(myfield,min)` <<field Function,syntax for selecting the minimum vReturns milliseconds of difference between its arguments.Dates are relative to the Unix or POSIX time epoch, midnight, January 1, 1970 UTC.-Arguments may be the name of a `DatePointField`, `TrieDateField`, or date math based on a <<date-formatting-math.adoc#,constant date or `NOW`>>.+Arguments may be the name of a `DatePointField`, `TrieDateField`, or date math based on a xref:indexing-guide:date-formatting-math.adoc[constant date or `NOW`].* `ms()`: Equivalent to `ms(NOW)`, number of milliseconds since the epoch.* `ms(a):` Returns the number of milliseconds since the epoch that the argument represents.@@ -373,7 +374,7 @@ Returns the product of multiple values or functions, which are specified in a co=== query FunctionReturns the score for the given subquery, or the default value for documents not matching the query.-Any type of subquery is supported through either parameter de-referencing `$otherparam` or direct specification of the query string in the <<local-params.adoc#,local params>> through the `v` key.+Any type of subquery is supported through either parameter de-referencing `$otherparam` or direct specification of the query string in the xref:local-params.adoc[] through the `v` key.*Syntax Examples*diff --git a/solr/solr-ref-guide/src/graph-traversal.adoc b/solr/solr-ref-guide/modules/query-guide/pages/graph-traversal.adocsimilarity index 98%rename from solr/solr-ref-guide/src/graph-traversal.adocrename to solr/solr-ref-guide/modules/query-guide/pages/graph-traversal.adocindex f608bec9bc0..1b79156a130 100644--- a/solr/solr-ref-guide/src/graph-traversal.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/graph-traversal.adoc@@ -31,7 +31,7 @@ Some sample use cases are provided later in the document.====This document assumes a basic understanding of graph terminology and streaming expressions.You can begin exploring graph traversal concepts with this https://en.wikipedia.org/wiki/Graph_traversal[Wikipedia article].-More details about streaming expressions are available in this Guide, in the section <<streaming-expressions.adoc#,Streaming Expressions>>.+More details about streaming expressions are available in this Guide, in the section xref:streaming-expressions.adoc[].====== Basic Syntax@@ -68,7 +68,7 @@ nodes(emails,The `nodes` function above finds all the edges with "[email protected]" or "[email protected]" in the `from` field and gathers the `to` field.-Like all <<streaming-expressions.adoc#,Streaming Expressions>>, you can execute a `nodes` expression by sending it to the `/stream` handler.+Like all xref:streaming-expressions.adoc[], you can execute a `nodes` expression by sending it to the `/stream` handler.For example:[source,bash]@@ -260,7 +260,7 @@ nodes(emails,In the example above only emails that match the filter query will be included in the traversal.Any Solr query can be included here.-So you can do fun things like <<spatial-search.adoc#,geospatial queries>>, apply any of the available <<query-syntax-and-parsers.adoc#,query parsers>>, or even write custom query parsers to limit the traversal.+So you can do fun things like xref:spatial-search.adoc[geospatial queries], apply any of the available xref:query-syntax-and-parsers.adoc[query parsers], or even write custom query parsers to limit the traversal.== Root Streamsdiff --git a/solr/solr-ref-guide/src/graph.adoc b/solr/solr-ref-guide/modules/query-guide/pages/graph.adocsimilarity index 99%rename from solr/solr-ref-guide/src/graph.adocrename to solr/solr-ref-guide/modules/query-guide/pages/graph.adocindex b4e3e7bff73..5977e279673 100644--- a/solr/solr-ref-guide/src/graph.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/graph.adoc@@ -68,7 +68,7 @@ We won't include butter itself in the graph as it doesn't help with finding a coBelow is an example of this bipartite subgraph represented as a matrix:-image::images/math-expressions/graph1.png[]+image::math-expressions/graph1.png[]In this example there are three shopping baskets shown by the rows: basket1, basket2, basket3.@@ -180,7 +180,7 @@ For simplicity this document will sometimes refer to inbound degree simply as deBack to the shopping basket example:-image::images/math-expressions/graph1.png[]+image::math-expressions/graph1.png[]We can calculate the degree of the products in the graph by summing the columns:[source,text]@@ -263,7 +263,7 @@ Because of this the `count(+++*+++)` aggregation always calculates the inbound dThere is a direct relationship between the *inbound degree* with bipartite graph recommenders and the *dot product*.This relationship can be clearly seen in our working example once we include a column for butter:-image::images/math-expressions/graph2.png[]+image::math-expressions/graph2.png[]If we compute the dot product between the butter column and the other product columns you will find that the dot product equals the inbound degree in each case.This tells us that a nearest neighbor search, using a maximum inner product similarity, would select the column with the highest inbound degree.@@ -405,7 +405,7 @@ as follows: `2021-02-10T20:51:30Z` .To support daily and weekly time windows a day truncated timestamp should be indexed in a string field as follows:`2021-02-10T00:00:00Z`.-Solr's indexing tool for Solr logs, described <<logs.adoc#,here>>, already adds the ten second truncated timestamps.+Solr's indexing tool for Solr logs, described xref:logs.adoc[here], already adds the ten second truncated timestamps.So those using Solr to analyze Solr logs get temporal graph expressions for free.=== Root Eventsdiff --git a/solr/solr-ref-guide/src/highlighting.adoc b/solr/solr-ref-guide/modules/query-guide/pages/highlighting.adocsimilarity index 98%rename from solr/solr-ref-guide/src/highlighting.adocrename to solr/solr-ref-guide/modules/query-guide/pages/highlighting.adocindex 38976d0a8cb..911385dba95 100644--- a/solr/solr-ref-guide/src/highlighting.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/highlighting.adoc@@ -69,7 +69,7 @@ When using `*`, consider adding `hl.requireFieldMatch=true`.Note that the field(s) listed here ought to have compatible text-analysis (defined in the schema) with field(s) referenced in the query to be highlighted.It may be necessary to modify `hl.q` and `hl.qparser` and/or modify the text analysis.+-The following example uses the <<local-params.adoc#,local params>> syntax and <<edismax-query-parser.adoc#,the eDisMax parser>> to highlight fields in `hl.fl`:+The following example uses the xref:local-params.adoc[local params] syntax and xref:edismax-query-parser.adoc[] to highlight fields in `hl.fl`:+[source,text]&hl.fl=field1 field2&hl.q={!edismax qf=$hl.fl v=$q}&hl.qparser=lucene&hl.requireFieldMatch=true@@ -96,7 +96,7 @@ The default is the value of the `q` parameter (already parsed).|Optional |Default: _see description_|===+-The <<query-syntax-and-parsers.adoc#,query parser>> to use for the `hl.q` query.+The xref:query-syntax-and-parsers.adoc[query parser] to use for the `hl.q` query.It only applies when `hl.q` is set.+The default is the value of the `defType` parameter which in turn defaults to `lucene`.@@ -247,7 +247,7 @@ When there is a match to the query term in that field, it will be included for e== Choosing a Highlighter-Solr provides a `HighlightComponent` (a <<requesthandlers-searchcomponents.adoc#defining-search-components,`SearchComponent`>>) and it's in the default list of components for search handlers.+Solr provides a `HighlightComponent` (a xref:configuration-guide:requesthandlers-searchcomponents.adoc#defining-search-components[`SearchComponent`]) and it's in the default list of components for search handlers.It offers a somewhat unified API over multiple actual highlighting implementations / engines (or simply "highlighters") that do the business of highlighting.There are many parameters supported by more than one highlighter, and sometimes the implementation details and semantics will be a bit different, so don't expect identical results when switching highlighters.diff --git a/solr/solr-ref-guide/src/jdbc-dbvisualizer.adoc b/solr/solr-ref-guide/modules/query-guide/pages/jdbc-dbvisualizer.adocsimilarity index 68%rename from solr/solr-ref-guide/src/jdbc-dbvisualizer.adocrename to solr/solr-ref-guide/modules/query-guide/pages/jdbc-dbvisualizer.adocindex 7686c117673..8dbb2934f52 100644--- a/solr/solr-ref-guide/src/jdbc-dbvisualizer.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/jdbc-dbvisualizer.adoc@@ -30,12 +30,12 @@ Once the driver has been created, you can create a connection to Solr with the cFrom the Tools menu, choose Driver Manager to add a driver.-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_1.png[image,width=673,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_1.png[image,width=673,height=400]=== Create a New Driver-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_2.png[image,width=532,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_2.png[image,width=532,height=400]=== Name the Driver in Driver Manager@@ -44,7 +44,7 @@ Provide a name for the driver, and provide the URL format: `jdbc:solr://<zk_connDo not fill in values for the variables "```zk_connection_string```" and "```collection```", those will be provided later when the connection to Solr is configured.The Driver Class will also be automatically added when the driver `.jar` s are added.-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_3.png[image,width=532,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_3.png[image,width=532,height=400]=== Add Driver Files to Classpath@@ -56,19 +56,19 @@ In the Solr distribution these dependencies are not separated from Solr's dependPlease refer to the https://search.maven.org/artifact/org.apache.solr/solr-solrj/{solr-full-version}/jar[maven release] for the exact dependencies needed for your version.* The SolrJ `.jar` found at `$SOLR_TIP/server/solr-webapp/webapp/WEB-INF/lib/solr-solrj-<version>.jar`-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_4.png[image,width=535,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_4.png[image,width=535,height=400]-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_5.png[image,width=664,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_5.png[image,width=664,height=400]-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_6.png[image,width=653,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_6.png[image,width=653,height=400]-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_7.png[image,width=655,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_7.png[image,width=655,height=400]-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_9.png[image,width=651,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_9.png[image,width=651,height=400]=== Review and Close Driver Manager@@ -81,20 +81,20 @@ Next, create a connection to Solr using the driver just created.=== Use the Connection Wizard-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_11.png[image,width=763,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_11.png[image,width=763,height=400]-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_12.png[image,width=807,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_12.png[image,width=807,height=400]=== Name the Connection-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_13.png[image,width=402,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_13.png[image,width=402,height=400]=== Select the Solr driver-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_14.png[image,width=399,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_14.png[image,width=399,height=400]=== Specify the Solr URL@@ -102,24 +102,24 @@ image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_14.png[image,width=399,heiProvide the Solr URL, using the ZooKeeper host and port and the collection.For example, `jdbc:solr://localhost:9983?collection=test`-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_15.png[image,width=401,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_15.png[image,width=401,height=400]== Open and Connect to SolrOnce the connection has been created, double-click on it to open the connection details screen and connect to Solr.-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_16.png[image,width=625,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_16.png[image,width=625,height=400]-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_17.png[image,width=592,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_17.png[image,width=592,height=400]== Open SQL Commander to Enter QueriesWhen the connection is established, you can use the SQL Commander to issue queries and view data.-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_19.png[image,width=577,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_19.png[image,width=577,height=400]-image::images/jdbc-dbvisualizer/dbvisualizer_solrjdbc_20.png[image,width=556,height=400]+image::jdbc-dbvisualizer/dbvisualizer_solrjdbc_20.png[image,width=556,height=400]diff --git a/solr/solr-ref-guide/src/jdbc-python-jython.adoc b/solr/solr-ref-guide/modules/query-guide/pages/jdbc-python-jython.adocsimilarity index 100%rename from solr/solr-ref-guide/src/jdbc-python-jython.adocrename to solr/solr-ref-guide/modules/query-guide/pages/jdbc-python-jython.adocdiff --git a/solr/solr-ref-guide/src/jdbc-r.adoc b/solr/solr-ref-guide/modules/query-guide/pages/jdbc-r.adocsimilarity index 100%rename from solr/solr-ref-guide/src/jdbc-r.adocrename to solr/solr-ref-guide/modules/query-guide/pages/jdbc-r.adocdiff --git a/solr/solr-ref-guide/src/jdbc-squirrel.adoc b/solr/solr-ref-guide/modules/query-guide/pages/jdbc-squirrel.adocsimilarity index 71%rename from solr/solr-ref-guide/src/jdbc-squirrel.adocrename to solr/solr-ref-guide/modules/query-guide/pages/jdbc-squirrel.adocindex 777a0f39f40..2f7cdeb7dc3 100644--- a/solr/solr-ref-guide/src/jdbc-squirrel.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/jdbc-squirrel.adoc@@ -33,12 +33,12 @@ Once the driver has been created, you can create a connection to Solr with the c=== Open Drivers-image::images/jdbc-squirrel/squirrelsql_solrjdbc_1.png[image,width=900,height=400]+image::jdbc-squirrel/squirrelsql_solrjdbc_1.png[image,width=900,height=400]=== Add Driver-image::images/jdbc-squirrel/squirrelsql_solrjdbc_2.png[image,width=892,height=400]+image::jdbc-squirrel/squirrelsql_solrjdbc_2.png[image,width=892,height=400]=== Name the Driver@@ -46,28 +46,28 @@ image::images/jdbc-squirrel/squirrelsql_solrjdbc_2.png[image,width=892,height=40Provide a name for the driver, and provide the URL format: `jdbc:solr://<zk_connection_string>/?collection=<collection>`.Do not fill in values for the variables "```zk_connection_string```" and "```collection```", those will be defined later when the connection to Solr is configured.-image::images/jdbc-squirrel/squirrelsql_solrjdbc_3.png[image,width=467,height=400]+image::jdbc-squirrel/squirrelsql_solrjdbc_3.png[image,width=467,height=400]=== Add Solr JDBC jars to Classpath-image::images/jdbc-squirrel/squirrelsql_solrjdbc_4.png[image,width=467,height=400]+image::jdbc-squirrel/squirrelsql_solrjdbc_4.png[image,width=467,height=400]-image::images/jdbc-squirrel/squirrelsql_solrjdbc_9.png[image,width=469,height=400]+image::jdbc-squirrel/squirrelsql_solrjdbc_9.png[image,width=469,height=400]-image::images/jdbc-squirrel/squirrelsql_solrjdbc_5.png[image,width=469,height=400]+image::jdbc-squirrel/squirrelsql_solrjdbc_5.png[image,width=469,height=400]-image::images/jdbc-squirrel/squirrelsql_solrjdbc_7.png[image,width=467,height=400]+image::jdbc-squirrel/squirrelsql_solrjdbc_7.png[image,width=467,height=400]=== Add the Solr JDBC driver class nameAfter adding the .jars, you will need to additionally define the Class Name `org.apache.solr.client.solrj.io.sql.DriverImpl`.-image::images/jdbc-squirrel/squirrelsql_solrjdbc_11.png[image,width=470,height=400]+image::jdbc-squirrel/squirrelsql_solrjdbc_11.png[image,width=470,height=400]== Create an Alias@@ -76,26 +76,26 @@ To define a JDBC connection, you must define an alias.=== Open Aliases-image::images/jdbc-squirrel/squirrelsql_solrjdbc_10.png[image,width=840,height=400]+image::jdbc-squirrel/squirrelsql_solrjdbc_10.png[image,width=840,height=400]=== Add an Alias-image::images/jdbc-squirrel/squirrelsql_solrjdbc_12.png[image,width=959,height=400]+image::jdbc-squirrel/squirrelsql_solrjdbc_12.png[image,width=959,height=400]=== Configure the Alias-image::images/jdbc-squirrel/squirrelsql_solrjdbc_14.png[image,width=470,height=400]+image::jdbc-squirrel/squirrelsql_solrjdbc_14.png[image,width=470,height=400]=== Connect to the Alias-image::images/jdbc-squirrel/squirrelsql_solrjdbc_13.png[image,width=522,height=400]+image::jdbc-squirrel/squirrelsql_solrjdbc_13.png[image,width=522,height=400]== QueryingOnce you've successfully connected to Solr, you can use the SQL interface to enter queries and work with data.-image::images/jdbc-squirrel/squirrelsql_solrjdbc_15.png[image,width=655,height=400]+image::jdbc-squirrel/squirrelsql_solrjdbc_15.png[image,width=655,height=400]diff --git a/solr/solr-ref-guide/src/jdbc-zeppelin.adoc b/solr/solr-ref-guide/modules/query-guide/pages/jdbc-zeppelin.adocsimilarity index 85%rename from solr/solr-ref-guide/src/jdbc-zeppelin.adocrename to solr/solr-ref-guide/modules/query-guide/pages/jdbc-zeppelin.adocindex 3b2e732b10d..a025637a15f 100644--- a/solr/solr-ref-guide/src/jdbc-zeppelin.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/jdbc-zeppelin.adoc@@ -21,7 +21,7 @@ The Solr JDBC driver can support http://zeppelin.apache.org/[Apache Zeppelin].[NOTE]====A Solr-specific interpreter is available as an alternative to using the JDBC driver.-See the section <<math-start.adoc#zeppelin-solr-interpreter,Zeppelin-Solr Interpreter>> for details.+See the section xref:math-start.adoc#zeppelin-solr-interpreter[Zeppelin-Solr Interpreter] for details.If you choose to use Zeppelin's JDBC interpreter instead, you must use Zeppelin 0.6.0 or greater to get JDBC support.====@@ -34,13 +34,13 @@ The http://zeppelin.apache.org/docs/latest/interpreter/jdbc.html[Zeppelin JDBC i== Create the Apache Solr JDBC Interpreter.Click "Interpreter" in the top navigation-image::images/jdbc-zeppelin/zeppelin_solrjdbc_1.png[image,height=400]+image::jdbc-zeppelin/zeppelin_solrjdbc_1.png[image,height=400].Click "Create"-image::images/jdbc-zeppelin/zeppelin_solrjdbc_2.png[image,height=400]+image::jdbc-zeppelin/zeppelin_solrjdbc_2.png[image,height=400].Enter information about your Solr installation-image::images/jdbc-zeppelin/zeppelin_solrjdbc_3.png[image,height=400]+image::jdbc-zeppelin/zeppelin_solrjdbc_3.png[image,height=400][NOTE]====@@ -51,10 +51,10 @@ The default driver can either be replaced by the Solr driver as outlined above o== Create a Notebook.Click Notebook -> Create new note-image::images/jdbc-zeppelin/zeppelin_solrjdbc_4.png[image,width=517,height=400]+image::jdbc-zeppelin/zeppelin_solrjdbc_4.png[image,width=517,height=400].Provide a name and click "Create Note"-image::images/jdbc-zeppelin/zeppelin_solrjdbc_5.png[image,width=839,height=400]+image::jdbc-zeppelin/zeppelin_solrjdbc_5.png[image,width=839,height=400]== JDBC Interpreter Copy Sheet@@ -79,7 +79,7 @@ Instructions on how to bind the JDBC interpreter to a notebook are available htt====.Results of Solr query-image::images/jdbc-zeppelin/zeppelin_solrjdbc_6.png[image,width=481,height=400]+image::jdbc-zeppelin/zeppelin_solrjdbc_6.png[image,width=481,height=400]The below code block assumes that the Apache Solr driver is setup as the default JDBC interpreter driver.If that is not the case, instructions for using a different prefix is available https://zeppelin.apache.org/docs/latest/interpreter/jdbc.html#how-to-use[here].diff --git a/solr/solr-ref-guide/src/join-query-parser.adoc b/solr/solr-ref-guide/modules/query-guide/pages/join-query-parser.adocsimilarity index 99%rename from solr/solr-ref-guide/src/join-query-parser.adocrename to solr/solr-ref-guide/modules/query-guide/pages/join-query-parser.adocindex 11e30aacfd0..683d8b95a7b 100644--- a/solr/solr-ref-guide/src/join-query-parser.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/join-query-parser.adoc@@ -196,7 +196,7 @@ As the join keys are streamed to the node, a bitset of the matching documents inThis avoids keeping the full set of join keys in memory at any given time.This bitset is then inserted into the filter cache upon successful execution as with the normal behavior of the Solr filter cache.-If the local index is sharded according to the join key field, the cross collection join can leverage a secondary query parser called the <<other-parsers.adoc#hash-range-query-parser,Hash Range Query Parser>>.+If the local index is sharded according to the join key field, the cross collection join can leverage a secondary query parser called the xref:other-parsers.adoc#hash-range-query-parser[Hash Range Query Parser].The hash range query parser is responsible for returning only the documents that hash to a given range of values.This allows the `CrossCollectionQuery` to query the remote Solr collection and return only the join keys that would match a specific shard in the local Solr collection.This has the benefit of making sure that network traffic doesn't increase as the number of shards increases and allows for much greater scalability.diff --git a/solr/solr-ref-guide/src/json-facet-api.adoc b/solr/solr-ref-guide/modules/query-guide/pages/json-facet-api.adocsimilarity index 92%rename from solr/solr-ref-guide/src/json-facet-api.adocrename to solr/solr-ref-guide/modules/query-guide/pages/json-facet-api.adocindex bf5b63a6b84..7ab160fc871 100644--- a/solr/solr-ref-guide/src/json-facet-api.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/json-facet-api.adoc@@ -1,7 +1,5 @@= JSON Facet API: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/// 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@@ -69,7 +67,7 @@ curl http://localhost:8983/solr/techproducts/query -d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-simple-terms-facet]+include::example$JsonRequestApiTest.java[tag=solrj-json-simple-terms-facet]----====--@@ -127,7 +125,7 @@ json.facet={[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-metrics-facet-1]+include::example$JsonRequestApiTest.java[tag=solrj-json-metrics-facet-1]----====--@@ -184,7 +182,7 @@ curl http://localhost:8983/solr/techproducts/query -d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-terms-facet-2]+include::example$JsonRequestApiTest.java[tag=solrj-json-terms-facet-2]----====--@@ -197,7 +195,7 @@ include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-terms-facet-|`limit` |Limits the number of buckets returned. Defaults to 10.|`sort` |Specifies how to sort the buckets produced.-`count` specifies document count, `index` sorts by the index (natural) order of the bucket value. One can also sort by any <<json-facet-api.adoc#stat-facet-functions,facet function / statistic>> that occurs in the bucket. The default is `count desc`. This parameter may also be specified in JSON like `sort:{count:desc}`. The sort order may either be “asc” or “desc”+`count` specifies document count, `index` sorts by the index (natural) order of the bucket value. One can also sort by any <<stat-facet-functions,facet function / statistic>> that occurs in the bucket. The default is `count desc`. This parameter may also be specified in JSON like `sort:{count:desc}`. The sort order may either be “asc” or “desc”|`overrequest` a|Number of buckets beyond the `limit` to internally request from shards during a distributed search.@@ -227,7 +225,7 @@ This parameter indicates the facet algorithm to use:* `stream` Presently equivalent to `enum`. Used for indexed, non-point fields with sort `index asc` and `allBuckets`, `numBuckets`, and `missing` disabled.* `smart` Pick the best method for the field type (this is the default)-|`prelim_sort` |An optional parameter for specifying an approximation of the final `sort` to use during initial collection of top buckets when the <<json-facet-api.adoc#sorting-facets-by-nested-functions,`sort` parameter is very costly>>.+|`prelim_sort` |An optional parameter for specifying an approximation of the final `sort` to use during initial collection of top buckets when the <<sorting-facets-by-nested-functions,`sort` parameter is very costly>>.|====== Query Facet@@ -260,7 +258,7 @@ curl http://localhost:8983/solr/techproducts/query -d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-query-facet-simple]+include::example$JsonRequestApiTest.java[tag=solrj-json-query-facet-simple]----====--@@ -296,7 +294,7 @@ curl http://localhost:8983/solr/techproducts/query -d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-query-facet-expanded]+include::example$JsonRequestApiTest.java[tag=solrj-json-query-facet-expanded]----====--@@ -344,7 +342,7 @@ curl http://localhost:8983/solr/techproducts/query -d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-range-facet-simple]+include::example$JsonRequestApiTest.java[tag=solrj-json-range-facet-simple]----====--@@ -506,7 +504,7 @@ Currently, custom `key` is not supported.The `heatmap` facet generates a 2D grid of facet counts for documents having spatial data in each grid cell.-This feature is primarily documented in the <<spatial-search.adoc#heatmap-faceting,spatial>> section of the reference guide.+This feature is primarily documented in the xref:spatial-search.adoc#heatmap-faceting[spatial] section of the reference guide.The key parameters are `type` to specify `heatmap` and `field` to indicate a spatial RPT field.The rest of the parameter names use the same names and semantics mirroringfacet.heatmap query-parameter style faceting, albeit without the "facet.heatmap." prefix.@@ -542,7 +540,7 @@ curl http://localhost:8983/solr/spatialdata/query -d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiHeatmapFacetingTest.java[tag=solrj-json-heatmap-facet-1]+include::example$JsonRequestApiHeatmapFacetingTest.java[tag=solrj-json-heatmap-facet-1]----====--@@ -581,17 +579,17 @@ Instead, they calculate something over all the documents in the domain.|missing |`missing(author)` |number of documents which do not have value for given field or function|countvals |`countvals(author)` |number of values for a given field or function|unique |`unique(author)` |number of unique values of the given field. Beyond 100 values it yields not exact estimate-|uniqueBlock |`uniqueBlock(\_root_)` or `uniqueBlock($fldref)` where `fldref=\_root_` |same as above with smaller footprint strictly for <<json-faceting-domain-changes.adoc#block-join-domain-changes,counting the number of Block Join blocks>>. The given field must be unique across blocks, and only singlevalued string fields are supported, docValues are recommended.+|uniqueBlock |`uniqueBlock(\_root_)` or `uniqueBlock($fldref)` where `fldref=\_root_` |same as above with smaller footprint strictly for xref:json-faceting-domain-changes.adoc#block-join-domain-changes[counting the number of Block Join blocks]. The given field must be unique across blocks, and only singlevalued string fields are supported, docValues are recommended.| |`uniqueBlock({!v=type:parent})` or `uniqueBlock({!v=$qryref})` where `qryref=type:parent` |same as above, but using bitset of the given query to aggregate hits.|hll |`hll(author)` |distributed cardinality estimate via hyper-log-log algorithm|percentile |`percentile(salary,50,75,99,99.9)` |Percentile estimates via t-digest algorithm. When sorting by this metric, the first percentile listed is used as the sort value.|sumsq |`sumsq(rent)` |sum of squares of field or function|variance |`variance(rent)` |variance of numeric field or function|stddev |`stddev(rent)` |standard deviation of field or function-|relatedness |`relatedness('popularity:[100 TO *]','inStock:true')`|A function for computing a relatedness score of the documents in the domain to a Foreground set, relative to a Background set (both defined as queries). This is primarily for use when building <<json-facet-api.adoc#relatedness-and-semantic-knowledge-graphs,Semantic Knowledge Graphs>>.+|relatedness |`relatedness('popularity:[100 TO *]','inStock:true')`|A function for computing a relatedness score of the documents in the domain to a Foreground set, relative to a Background set (both defined as queries). This is primarily for use when building <<relatedness-and-semantic-knowledge-graphs,Semantic Knowledge Graphs>>.|===-Numeric aggregation functions such as `avg` can be on any numeric field, or on a <<function-queries.adoc#,nested function>> of multiple numeric fields such as `avg(div(popularity,price))`.+Numeric aggregation functions such as `avg` can be on any numeric field, or on a xref:function-queries.adoc[nested function] of multiple numeric fields such as `avg(div(popularity,price))`.The most common way of requesting an aggregation function is as a simple String containing the expression you wish to compute:@@ -622,13 +620,13 @@ curl http://localhost:8983/solr/techproducts/query -d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-metrics-facet-simple]+include::example$JsonRequestApiTest.java[tag=solrj-json-metrics-facet-simple]----====---An expanded form allows for <<local-params.adoc#,local params>> to be specified.-These may be used explicitly by some specialized aggregations such as `<<json-facet-api.adoc#relatedness-options,relatedness()>>`, but can also be used as parameter references to make aggregation expressions more readable, with out needing to use (global) request parameters:+An expanded form allows for xref:local-params.adoc[] to be specified.+These may be used explicitly by some specialized aggregations such as <<relatedness-options,`relatedness()`>>, but can also be used as parameter references to make aggregation expressions more readable, with out needing to use (global) request parameters:[.dynamic-tabs]--@@ -662,7 +660,7 @@ curl http://localhost:8983/solr/techproducts/query -d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-metrics-facet-expanded]+include::example$JsonRequestApiTest.java[tag=solrj-json-metrics-facet-expanded]----====--@@ -707,7 +705,7 @@ curl http://localhost:8983/solr/techproducts/query -d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-simple-terms-facet]+include::example$JsonRequestApiTest.java[tag=solrj-json-simple-terms-facet]----====--@@ -750,7 +748,7 @@ curl http://localhost:8983/solr/techproducts/query -d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-nested-cat-facet]+include::example$JsonRequestApiTest.java[tag=solrj-json-nested-cat-facet]----====--@@ -816,7 +814,7 @@ curl http://localhost:8983/solr/techproducts/query -d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-nested-cat-facet-sorted]+include::example$JsonRequestApiTest.java[tag=solrj-json-nested-cat-facet-sorted]----====--@@ -854,7 +852,7 @@ As discussed above, facets compute buckets or statistics based on their "domain"In addition to this default behavior, domains can be also be widened, narrowed, or changed entirely.The JSON Faceting API supports modifying domains through its `domain` property.-This is discussed in more detail <<json-faceting-domain-changes.adoc#,here>>+This is discussed in more detail in xref:json-faceting-domain-changes.adoc[].== Special Stat Facet Functions@@ -864,7 +862,7 @@ These are described in more detail in the sections below.=== uniqueBlock() and Block Join Counts-When a collection contains <<indexing-nested-documents.adoc#, Nested Documents>>, the `blockChildren` and `blockParent` <<json-faceting-domain-changes.adoc#block-join-domain-changes, domain changes>> can be useful when searching for parent documents and you want to compute stats against all of the affected children documents (or vice versa).+When a collection contains xref:indexing-guide:indexing-nested-documents.adoc[nested documents], the `blockChildren` and `blockParent` xref:json-faceting-domain-changes.adoc#block-join-domain-changes[domain changes] can be useful when searching for parent documents and you want to compute stats against all of the affected children documents (or vice versa).But if you only need to know the _count_ of all the blocks that exist in the current domain, a more efficient option is the `uniqueBlock()` aggregate function.Suppose we have products with multiple SKUs, and we want to count products for each color.@@ -1025,7 +1023,7 @@ curl -sS -X POST http://localhost:8983/solr/gettingstarted/query -d 'rows=0&q=*:<1> Use the entire collection as our "Background Set"<2> Use a query for "age >= 35" to define our (initial) "Foreground Set"<3> For both the top level `hobbies` facet & the sub-facet on `state` we will be sorting on the `relatedness(...)` values-<4> In both calls to the `relatedness(...)` function, we use <<local-params.adoc#parameter-dereferencing,parameter variables>> to refer to the previously defined `fore` and `back` queries.+<4> In both calls to the `relatedness(...)` function, we use xref:local-params.adoc#parameter-dereferencing[parameter variables] to refer to the previously defined `fore` and `back` queries..The Facet Response[source,json,subs="verbatim,callouts"]diff --git a/solr/solr-ref-guide/src/json-faceting-domain-changes.adoc b/solr/solr-ref-guide/modules/query-guide/pages/json-faceting-domain-changes.adocsimilarity index 83%rename from solr/solr-ref-guide/src/json-faceting-domain-changes.adocrename to solr/solr-ref-guide/modules/query-guide/pages/json-faceting-domain-changes.adocindex d50bda8c648..6390db0914d 100644--- a/solr/solr-ref-guide/src/json-faceting-domain-changes.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/json-faceting-domain-changes.adoc@@ -1,6 +1,4 @@= JSON Faceting Domain Changes-:solr-root-path: ../../-:example-source-dir: {solr-root-path}solrj/src/test/org/apache/solr/client/ref_guide_examples/// 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@@ -67,7 +65,7 @@ curl http://localhost:8983/solr/techproducts/query -d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-facet-filtered-domain]+include::example$JsonRequestApiTest.java[tag=solrj-json-facet-filtered-domain]----====--@@ -77,7 +75,7 @@ Each query can be:* a string containing a query in Solr query syntax.* a reference to a request parameter containing Solr query syntax, of the form: `{param: <request_param_name>}`.-It's possible to refer to one or multiple queries in DSL syntax defined under <<json-query-dsl.adoc#additional-queries,queries>> key in JSON Request API.+It's possible to refer to one or multiple queries in DSL syntax defined under xref:json-query-dsl.adoc#additional-queries[queries] key in JSON Request API.The referred parameter might have 0 (absent) or many values.** When no values are specified, no filter is applied and no error is thrown.** When many values are specified, each value is parsed and used as filters in conjunction.@@ -158,7 +156,7 @@ curl http://localhost:8983/solr/techproducts/query -d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-facet-excludetags-domain]+include::example$JsonRequestApiTest.java[tag=solrj-json-facet-excludetags-domain]----====--@@ -167,13 +165,13 @@ The value of `excludeTags` can be a single string tag, an array of string tags,When an `excludeTags` option is combined with other `domain` changing options, it expands the domain _before_ any other domain changes take place.-See also the section on <<faceting.adoc#tagging-and-excluding-filters,multi-select faceting>>.+See also the section on xref:faceting.adoc#tagging-and-excluding-filters[multi-select faceting].== Arbitrary Domain QueryA `query` domain can be specified when you wish to compute a facet against an arbitrary set of documents, regardless of the original domain.The most common use case would be to compute a top level facet against a specific subset of the collection, regardless of the main query.-But it can also be useful on nested facets when building <<json-facet-api.adoc#relatedness-and-semantic-knowledge-graphs,Semantic Knowledge Graphs>>.+But it can also be useful on nested facets when building xref:json-facet-api.adoc#relatedness-and-semantic-knowledge-graphs[Semantic Knowledge Graphs].Example:@@ -205,7 +203,7 @@ curl http://localhost:8983/solr/techproducts/query -d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-facet-query-domain]+include::example$JsonRequestApiTest.java[tag=solrj-json-facet-query-domain]----====--@@ -223,12 +221,12 @@ NOTE: While a `query` domain can be combined with an additional domain `filter`,== Block Join Domain Changes-When a collection contains <<indexing-nested-documents.adoc#, Nested Documents>>, the `blockChildren` or `blockParent` domain options can be used to transform an existing domain containing one type of document, into a domain containing the documents with the specified relationship (child or parent of) to the documents from the original domain.+When a collection contains xref:indexing-guide:indexing-nested-documents.adoc[nested documents], the `blockChildren` or `blockParent` domain options can be used to transform an existing domain containing one type of document, into a domain containing the documents with the specified relationship (child or parent of) to the documents from the original domain.-Both of these options work similarly to the corresponding <<block-join-query-parser.adoc#,Block Join Query Parsers>> by taking in a single String query that exclusively matches all parent documents in the collection.+Both of these options work similarly to the corresponding xref:block-join-query-parser.adoc[] by taking in a single String query that exclusively matches all parent documents in the collection.If `blockParent` is used, then the resulting domain will contain all parent documents of the children from the original domain.If `blockChildren` is used, then the resulting domain will contain all child documents of the parents from the original domain.-Quite often facets over child documents needs to be counted in parent documents, this can be done by `uniqueBlock(\_root_)` as described in <<json-facet-api#uniqueblock-and-block-join-counts, Block Join Facet Counts>>.+Quite often facets over child documents needs to be counted in parent documents, this can be done by `uniqueBlock(\_root_)` as described in xref:json-facet-api.adoc#uniqueblock-and-block-join-counts[Block Join Facet Counts].[source,json,subs="verbatim,callouts"]]----@@ -254,7 +252,7 @@ The resulting `brands` sub-facet will count how many Product documents (that havA `join` domain change option can be used to specify arbitrary `from` and `to` fields to use in transforming from the existing domain to a related set of documents.-This works similarly to the <<join-query-parser.adoc#,Join Query Parser>>, and has the same limitations when dealing with multi-shard collections.+This works similarly to the xref:join-query-parser.adoc[], and has the same limitations when dealing with multi-shard collections.Example:[source,json]@@ -283,13 +281,13 @@ Example:`join` domain changes support an optional `method` parameter, which allows users to specify which join implementation they would like to use in this domain transform.Solr offers several join implementations, each with different performance characteristics.-For more information on these implementations and their tradeoffs, see the `method` parameter documentation <<join-query-parser.adoc#parameters,here>>. Join domain changes support all `method` values except `crossCollection`.+For more information on these implementations and their tradeoffs, see the xref:join-query-parser.adoc#parameters[`method` parameter documentation]. Join domain changes support all `method` values except `crossCollection`.== Graph Traversal Domain ChangesA `graph` domain change option works similarly to the `join` domain option, but can do traversal multiple hops `from` the existing domain `to` other documents.-This works very similar to the <<other-parsers.adoc#graph-query-parser,Graph Query Parser>>, supporting all of its optional parameters, and has the same limitations when dealing with multi-shard collections.+This works very similar to the xref:other-parsers.adoc#graph-query-parser[Graph Query Parser], supporting all of its optional parameters, and has the same limitations when dealing with multi-shard collections.Example:[source,json]diff --git a/solr/solr-ref-guide/src/json-query-dsl.adoc b/solr/solr-ref-guide/modules/query-guide/pages/json-query-dsl.adocsimilarity index 86%rename from solr/solr-ref-guide/src/json-query-dsl.adocrename to solr/solr-ref-guide/modules/query-guide/pages/json-query-dsl.adocindex 2876105a626..9ae5267227f 100644--- a/solr/solr-ref-guide/src/json-query-dsl.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/json-query-dsl.adoc@@ -1,6 +1,4 @@= JSON Query DSL-:solr-root-path: ../../-:example-source-dir: {solr-root-path}solrj/src/test/org/apache/solr/client/ref_guide_examples/// 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@@ -23,9 +21,9 @@ Queries and filters provided in JSON requests can be specified using a rich, pow== Query DSL StructureThe JSON Request API accepts query values in three different formats:-* A valid <<standard-query-parser.adoc#,query string>> that uses the default `deftype` (`lucene`, in most cases), e.g., `title:solr`.+* A valid xref:standard-query-parser.adoc[query string] that uses the default `deftype` (`lucene`, in most cases), e.g., `title:solr`.-* A valid <<local-params.adoc#,local params query string>> that specifies its `deftype` explicitly, e.g., `{!dismax qf=title}solr`.+* A valid xref:local-params.adoc[local params query string] that specifies its `deftype` explicitly, e.g., `{!dismax qf=title}solr`.* A valid JSON object with the name of the query parser and any relevant parameters, e.g., `{ "lucene": {"df":"title", "query":"solr"}}`.** The top level "query" JSON block generally only has a single property representing the name of the query parser to use.@@ -57,7 +55,7 @@ curl -X GET "http://localhost:8983/solr/techproducts/query?q=name:iPod"[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-ipod-query-basic]+include::example$JsonRequestApiTest.java[tag=solrj-ipod-query-basic]----====--@@ -82,7 +80,7 @@ curl -X POST http://localhost:8983/solr/techproducts/query -d '[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-ipod-query-dsl-1]+include::example$JsonRequestApiTest.java[tag=solrj-ipod-query-dsl-1]----====--@@ -107,7 +105,7 @@ curl -X POST http://localhost:8983/solr/techproducts/query -d '[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-ipod-query-dsl-2]+include::example$JsonRequestApiTest.java[tag=solrj-ipod-query-dsl-2]----====--@@ -137,7 +135,7 @@ curl -X POST http://localhost:8983/solr/techproducts/query -d '[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-ipod-query-dsl-3]+include::example$JsonRequestApiTest.java[tag=solrj-ipod-query-dsl-3]----====--@@ -167,7 +165,7 @@ curl -X GET "http://localhost:8983/solr/techproducts/query?q={!boost b=log(popul[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-ipod-query-boosted-basic]+include::example$JsonRequestApiTest.java[tag=solrj-ipod-query-boosted-basic]----====--@@ -198,7 +196,7 @@ curl -X POST http://localhost:8983/solr/techproducts/query -d '[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-ipod-query-boosted-dsl-1]+include::example$JsonRequestApiTest.java[tag=solrj-ipod-query-boosted-dsl-1]----====--@@ -233,13 +231,13 @@ curl -X POST http://localhost:8983/solr/techproducts/query -d '[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-ipod-query-boosted-dsl-2]+include::example$JsonRequestApiTest.java[tag=solrj-ipod-query-boosted-dsl-2]----====--=== Nested Boolean Query Example-Query nesting is commonly seen when combining multiple query clauses together using pseudo-boolean logic with the <<other-parsers.adoc#boolean-query-parser,BoolQParser>>.+Query nesting is commonly seen when combining multiple query clauses together using pseudo-boolean logic with the xref:other-parsers.adoc#boolean-query-parser[BoolQParser].The example below shows how the `BoolQParser` can be used to create powerful nested queries.In this example, a user searches for results with `iPod` in the field `name` which are _not_ in the bottom half of the `popularity` rankings.@@ -272,7 +270,7 @@ curl -X POST http://localhost:8983/solr/techproducts/query -d '[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-ipod-query-bool]+include::example$JsonRequestApiTest.java[tag=solrj-ipod-query-bool]----====--@@ -305,12 +303,12 @@ curl -X POST http://localhost:8983/solr/techproducts/query -d '[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-ipod-query-bool-condensed]+include::example$JsonRequestApiTest.java[tag=solrj-ipod-query-bool-condensed]----====---Example of referencing <<Additional Queries,additional queries>>, <<Tagging in JSON Query DSL,tagging>> and <<other-parsers.adoc#boolean-query-parser,exclusions>>:+Example of referencing <<Additional Queries,additional queries>>, <<Tagging in JSON Query DSL,tagging>>, and xref:other-parsers.adoc#boolean-query-parser[exclusions]:[source,bash]----@@ -365,7 +363,7 @@ curl -X POST http://localhost:8983/solr/techproducts/query -d '[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-ipod-query-bool-filter]+include::example$JsonRequestApiTest.java[tag=solrj-ipod-query-bool-filter]----====--@@ -397,14 +395,14 @@ curl -X POST http://localhost:8983/solr/techproducts/query -d '----Overall this example doesn't make much sense, but just demonstrates the syntax.-This feature is useful in <<json-faceting-domain-changes.adoc#adding-domain-filters,filtering domain>> in JSON Facet API <<json-facet-api.adoc#changing-the-domain,domain changes>>.+This feature is useful in xref:json-faceting-domain-changes.adoc#adding-domain-filters[filtering domain] in JSON Facet API xref:json-facet-api.adoc#changing-the-domain[domain changes].Note that these declarations add request parameters underneath, so using same names with other parameters might cause unexpected behavior.== Tagging in JSON Query DSLQuery and filter clauses can also be individually "tagged".Tags serve as handles for query clauses, allowing them to be referenced from elsewhere in the request.-This is most commonly used by the filter-exclusion functionality offered by both <<faceting.adoc#tagging-and-excluding-filters,traditional>> and <<json-faceting-domain-changes.adoc#filter-exclusions,JSON>> faceting.+This is most commonly used by the filter-exclusion functionality offered by both xref:faceting.adoc#tagging-and-excluding-filters[traditional] and xref:json-faceting-domain-changes.adoc#filter-exclusions[JSON] faceting.Queries and filters are tagged by wrapping them in a surrounding JSON object.The name of the tag is specified as a JSON key, with the query string (or object) becoming the value associated with that key.@@ -440,7 +438,7 @@ curl -X POST http://localhost:8983/solr/techproducts/select -d '[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-tagged-query]+include::example$JsonRequestApiTest.java[tag=solrj-tagged-query]----====--@@ -456,8 +454,8 @@ Let's go on item by item:* _Filter exclusion_ is usually necessary when multiple filter values can be applied to each field.This is also also known as drill-sideways facets.-See also <<faceting.adoc#tagging-and-excluding-filters,the classic example>> of filter exclusion.-* _Nested documents_, or child documents, are described in <<indexing-nested-documents.adoc#,Indexing Nested Documents>>.+See also xref:faceting.adoc#tagging-and-excluding-filters[tagging and filter exclusion].+* _Nested documents_, or child documents, are described in xref:indexing-guide:indexing-nested-documents.adoc[].In the example below, they are referred as SKUs since this is a frequent use case for this feature.* _Counting facets over children documents_ means that even though the result of the search are usually parent documents, the children documents and their fields are used for faceting.* _Facet counts roll up_ means that child documents contribute facet hits because parent documents they are linked to are counted.@@ -507,4 +505,4 @@ The SKU field is defined as `sku_attr1`, and we've set `limit=-1` so we get allThe `blockChildren` value references the all-parents query.Then we define a filter to restrict to SKU docs but exclude one tag retaining only `sku_attr2:bar`.<6> Counts the subfacet in parent documents.-See also <<json-facet-api.adoc#uniqueblock-and-block-join-counts>>.+See also xref:json-facet-api.adoc#uniqueblock-and-block-join-counts[uniqueBlock() and Block Join Counts].diff --git a/solr/solr-ref-guide/src/json-request-api.adoc b/solr/solr-ref-guide/modules/query-guide/pages/json-request-api.adocsimilarity index 88%rename from solr/solr-ref-guide/src/json-request-api.adocrename to solr/solr-ref-guide/modules/query-guide/pages/json-request-api.adocindex 811bba98fde..fe9227d3025 100644--- a/solr/solr-ref-guide/src/json-request-api.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/json-request-api.adoc@@ -1,7 +1,4 @@= JSON Request API-:solr-root-path: ../../-:example-source-dir: {solr-root-path}solrj/src/test/org/apache/solr/client/ref_guide_examples/-:page-children: json-query-dsl// 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@@ -21,7 +18,7 @@Solr supports an alternate request API which accepts requests composed in part or entirely of JSON objects.This alternate API can be preferable in some situations, where its increased readability and flexibility make it easier to use than the entirely query-parameter driven alternative.-There is also some functionality which can only be accessed through this JSON request API, such as much of the analytics capabilities of <<json-facet-api.adoc#facet-analytics-module,JSON Faceting>>+There is also some functionality which can only be accessed through this JSON request API, such as much of the analytics capabilities of the xref:json-facet-api.adoc[].== Building JSON RequestsThe core of the JSON Request API is its ability to specify request parameters as JSON in the request body, as shown by the example below:@@ -44,7 +41,7 @@ curl http://localhost:8983/solr/techproducts/query -d '[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-query-simple]+include::example$JsonRequestApiTest.java[tag=solrj-json-query-simple]----====--@@ -84,7 +81,7 @@ curl 'http://localhost:8983/solr/techproducts/query?json.limit=5&json.filter="ca[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-query-param-overrides]+include::example$JsonRequestApiTest.java[tag=solrj-json-query-param-overrides]----====--@@ -111,7 +108,7 @@ curl http://localhost:8983/solr/techproducts/query -d '[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-query-param-overrides-equivalent]+include::example$JsonRequestApiTest.java[tag=solrj-json-query-param-overrides-equivalent]----====--@@ -135,7 +132,7 @@ curl http://localhost:8983/solr/techproducts/query -d 'q=*:*&rows=1&[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-facet-all-query-params]+include::example$JsonRequestApiTest.java[tag=solrj-json-facet-all-query-params]----====--@@ -169,12 +166,12 @@ curl http://localhost:8983/solr/techproducts/query -d '[.tab-label]*SolrJ*[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-facet-all-query-params-equivalent]+include::example$JsonRequestApiTest.java[tag=solrj-json-facet-all-query-params-equivalent]----====---See the <<json-facet-api.adoc#facet-analytics-module,JSON Facet API>> for more on faceting and analytics commands.+See the xref:json-facet-api.adoc[] for more on faceting and analytics commands.== Supported Properties and Syntax@@ -237,7 +234,7 @@ curl "http://localhost:8983/solr/techproducts/query?fl=name,price"-d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-query-params-block]+include::example$JsonRequestApiTest.java[tag=solrj-json-query-params-block]----====--@@ -249,7 +246,7 @@ Parameters placed in a `params` block act as if they were added verbatim to thecurl "http://localhost:8983/solr/techproducts/query?fl=name,price&q=memory&rows=1"-----Usage of `queries` key is described in <<json-query-dsl.adoc#additional-queries,Query DSL>>.+Usage of `queries` key is described in xref:json-query-dsl.adoc#additional-queries[Additional Queries].=== Parameter Substitution / Macro Expansion@@ -276,7 +273,7 @@ curl "http://localhost:8983/solr/techproducts/query?FIELD=text&TERM=memory" -d '[source,java,indent=0]-----include::{example-source-dir}JsonRequestApiTest.java[tag=solrj-json-query-macro-expansion]+include::example$JsonRequestApiTest.java[tag=solrj-json-query-macro-expansion]----====--diff --git a/solr/solr-ref-guide/src/learning-to-rank.adoc b/solr/solr-ref-guide/modules/query-guide/pages/learning-to-rank.adocsimilarity index 97%rename from solr/solr-ref-guide/src/learning-to-rank.adocrename to solr/solr-ref-guide/modules/query-guide/pages/learning-to-rank.adocindex 8d442fa9135..f842037c40e 100644--- a/solr/solr-ref-guide/src/learning-to-rank.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/learning-to-rank.adoc@@ -26,7 +26,7 @@ The only thing you need to do outside Solr is train your own ranking model.=== Re-RankingRe-Ranking allows you to run a simple query for matching documents and then re-rank the top N documents using the scores from a different, more complex query.-This page describes the use of *LTR* complex queries, information on other rank queries included in the Solr distribution can be found on the <<query-re-ranking.adoc#,Query Re-Ranking>> page.+This page describes the use of *LTR* complex queries, information on other rank queries included in the Solr distribution can be found in xref:query-re-ranking.adoc[].=== Learning To Rank Models@@ -91,7 +91,7 @@ The process of https://en.wikipedia.org/wiki/Feature_engineering[feature enginee==== Feature Extraction-The ltr module includes a <<document-transformers.adoc#,[features>> transformer] to support the calculation and return of feature values for https://en.wikipedia.org/wiki/Feature_extraction[feature extraction] purposes including and especially when you do not yet have an actual reranking model.+The ltr module includes a xref:document-transformers.adoc[`[features\]` transformer] to support the calculation and return of feature values for https://en.wikipedia.org/wiki/Feature_extraction[feature extraction] purposes including and especially when you do not yet have an actual reranking model.==== Feature Selection and Model Training@@ -647,7 +647,7 @@ Assuming that you consider to use a large model placed at `/path/to/models/myMod}-----First, add the directory to Solr's resource paths with a <<libs.adoc#lib-directives-in-solrconfig,`<lib/>` directive>>:+First, add the directory to Solr's resource paths with a xref:configuration-guide:libs.adoc#lib-directives-in-solrconfig[`<lib/>` directive]:[source,xml]----@@ -674,11 +674,11 @@ NOTE: No `"features"` are configured in `myWrapperModel` because the features ofCAUTION: `<lib dir="/path/to/models" regex=".*\.json" />` doesn't work as expected in this case, because `SolrResourceLoader` considers given resources as JAR if `<lib />` indicates files.-As an alternative to the above-described `DefaultWrapperModel`, it is possible to <<zookeeper-ensemble.adoc#increasing-the-file-size-limit,increase ZooKeeper's file size limit>>.+As an alternative to the above-described `DefaultWrapperModel`, it is possible to xref:deployment-guide:zookeeper-ensemble.adoc#increasing-the-file-size-limit[increase ZooKeeper's file size limit].=== Applying Changes-The feature store and the model store are both <<managed-resources.adoc#,Managed Resources>>.+The feature store and the model store are both xref:configuration-guide:managed-resources.adoc[].Changes made to managed resources are not applied to the active Solr components until the Solr collection (or Solr core in single server mode) is reloaded.=== LTR Examplesdiff --git a/solr/solr-ref-guide/src/loading.adoc b/solr/solr-ref-guide/modules/query-guide/pages/loading.adocsimilarity index 95%rename from solr/solr-ref-guide/src/loading.adocrename to solr/solr-ref-guide/modules/query-guide/pages/loading.adocindex 6f3454a8f73..571bff93098 100644--- a/solr/solr-ref-guide/src/loading.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/loading.adoc@@ -147,13 +147,13 @@ Once that data has been parsed into tuples with `parseCSV` or `parseTSV` it canThe example below shows the output of the `parseCSV` function visualized as a table.-image::images/math-expressions/csvtable.png[]+image::math-expressions/csvtable.png[]Columns from the table can then be visualized using one of Apache Zeppelin'svisualizations.The example below shows a scatter plot of the `petal_length` and `petal_width` grouped by `species`.-image::images/math-expressions/csv.png[]+image::math-expressions/csv.png[]== Selecting Fields and Field Types@@ -165,7 +165,7 @@ This approach allows for fine grain control over schema field types without haviBelow is an example of selecting fields and mapping themto specific field types.-image::images/math-expressions/csvselect.png[]+image::math-expressions/csvselect.png[]== Loading Data@@ -176,7 +176,7 @@ The `update` function adds documents to Solr in batches and returns a tuple forIn the example below the `update` expression is run using Zeppelin-Solr because the data set is small.For larger loads it's best to run the load from a curl command where the output of the `update` function can be spooled to disk.-image::images/math-expressions/update.png[]+image::math-expressions/update.png[]== Transforming Data@@ -199,11 +199,11 @@ If the `uuid` function is used the data cannot be reloaded without first deletinBelow is an example using the `concat` function to create a new id.-image::images/math-expressions/selectconcat.png[]+image::math-expressions/selectconcat.png[]Below is an example using the `uuid` function to create a new id.-image::images/math-expressions/selectuuid.png[]+image::math-expressions/selectuuid.png[]=== Record Numbers@@ -213,7 +213,7 @@ the <<Filtering Results>> section below.The example below shows the syntax of the `recNum` function:-image::images/math-expressions/recNum.png[]+image::math-expressions/recNum.png[]=== Parsing Dates@@ -297,7 +297,7 @@ The `upper`, `lower`, `split`, `valueAt`, `trim`, and `concat` functions can beThe example below shows the `upper` function used to upper case the *species*field.-image::images/math-expressions/selectupper.png[]+image::math-expressions/selectupper.png[]The example below shows the `split` function which splits a field ona delimiter.@@ -354,7 +354,7 @@ When this expression is sent to the `/stream` handler it responds with:The `valueAt` function can be used to select a specific index from a split array.-image::images/math-expressions/valueat.png[]+image::math-expressions/valueat.png[]=== Filtering Results@@ -373,21 +373,21 @@ Below are some strategies for using the `having` function to filter records.The `eq` (equals) function can be used with the `having` expression to filter the result setto a single record number:-image::images/math-expressions/havingId.png[]+image::math-expressions/havingId.png[]==== SkippingThe `gt` (greater than) function can be used on the `recNum` field to filter the result set torecords with a recNum greater then a specific value:-image::images/math-expressions/skipping.png[]+image::math-expressions/skipping.png[]==== PagingThe `and` function with nested `lt` and `gt` functions can be used to select records within a specificrecord number range:-image::images/math-expressions/paging.png[]+image::math-expressions/paging.png[]==== Striding@@ -395,14 +395,14 @@ The `eq` and nested `mod` function can be used to stride through the data at sperecord number intervalThis allows for a sample to be taken at different intervals in the data in a systematic way.-image::images/math-expressions/striding.png[]+image::math-expressions/striding.png[]==== Regex MatchingThe `matches` function can be used to test if a field in the record matches a specific regular expression.This provides a powerful *grep* like capability over the record set.-image::images/math-expressions/matches.png[]+image::math-expressions/matches.png[]=== Handling Nulls@@ -425,12 +425,12 @@ values.In the example below the `having` function returns zero documents because the `notNull` function is applied to*field_a* in each tuple.-image::images/math-expressions/havingNotNull.png[]+image::math-expressions/havingNotNull.png[]In the example below the `having` function returns all documents because the `isNull` function is applied to*field_a* in each tuple.-image::images/math-expressions/havingIsNull.png[]+image::math-expressions/havingIsNull.png[]==== Replacing Nulls@@ -441,7 +441,7 @@ In the example below the `if` function applies the `isNull` boolean expression tIn the first example it replaces null *petal_width* values with 0, and returns the *petal_width* if present.In the second example it replaces null *field1* values with the string literal "NA" and returns *field1* if present.-image::images/math-expressions/ifIsNull.png[]+image::math-expressions/ifIsNull.png[]=== Text Analysis@@ -525,4 +525,4 @@ This allows each term to be indexed in a separate document so the relationshipsgraph expressions or aggregations.-image::images/math-expressions/cartesian.png[]+image::math-expressions/cartesian.png[]diff --git a/solr/solr-ref-guide/src/local-params.adoc b/solr/solr-ref-guide/modules/query-guide/pages/local-params.adocsimilarity index 97%rename from solr/solr-ref-guide/src/local-params.adocrename to solr/solr-ref-guide/modules/query-guide/pages/local-params.adocindex 7bf706977fa..7f74b6a119a 100644--- a/solr/solr-ref-guide/src/local-params.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/local-params.adoc@@ -58,7 +58,7 @@ is equivalent to:`q={!type=dismax qf=myfield}solr rocks`-If no "type" is specified (either explicitly or implicitly) then the <<standard-query-parser.adoc#,lucene parser>> is used by default.+If no "type" is specified (either explicitly or implicitly) then the xref:standard-query-parser.adoc[] is used by default.Thus:`fq={!df=summary}solr rocks`diff --git a/solr/solr-ref-guide/src/logs.adoc b/solr/solr-ref-guide/modules/query-guide/pages/logs.adocsimilarity index 91%rename from solr/solr-ref-guide/src/logs.adocrename to solr/solr-ref-guide/modules/query-guide/pages/logs.adocindex 2e9c7ca512a..7b9412570bd 100644--- a/solr/solr-ref-guide/src/logs.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/logs.adoc@@ -18,9 +18,9 @@This section of the user guide provides an introduction to Solr log analytics.-NOTE: This is an appendix of the <<math-expressions.adoc#,Visual Guide to Streaming Expressions and Math Expressions>>.+NOTE: This is an appendix of the xref::math-expressions.adoc[Visual Guide to Streaming Expressions and Math Expressions].All the functions described below are covered in detail in the guide.-See the <<math-start.adoc#,Getting Started>> chapter to learn how to get started with visualizations and Apache Zeppelin.+See the xref:math-start.adoc[] chapter to learn how to get started with visualizations and Apache Zeppelin.== Loading@@ -60,7 +60,7 @@ The first step in exploration is to take a random sample from the `logs` collectIn the example below the `random` function is run with one parameter which is the name of the collection to sample.-image::images/math-expressions/logs-sample.png[]+image::math-expressions/logs-sample.png[]The sample contains 500 random records with their full field list.By looking at this sample we can quickly learn about the *fields* available in the `logs` collection.@@ -72,7 +72,7 @@ Its often useful to understand what time period the logs cover and how many logThe `stats` function can be run to display this information.-image::images/math-expressions/logs-dates.png[]+image::math-expressions/logs-dates.png[]=== Record Types@@ -81,7 +81,7 @@ One of the key fields in the index is the `type_s` field which is the type of loThe `facet` expression can be used to visualize the different types of log records and how many records of each type are in the index.-image::images/math-expressions/logs-type.png[]+image::math-expressions/logs-type.png[]=== Collections@@ -90,14 +90,14 @@ Another important field is the `collection_s` field which is the collection thatThe `facet` expression can be used to visualize the different collections and how many log records they generate.-image::images/math-expressions/logs-collection.png[]+image::math-expressions/logs-collection.png[]=== Record Type by CollectionA two dimensional `facet` can be run to visualize the record types by collection.-image::images/math-expressions/logs-type-collection.png[]+image::math-expressions/logs-type-collection.png[]=== Time Series@@ -106,7 +106,7 @@ The `timeseries` function can be used to visualize a time series for a specificIn the example below a time series is used to visualize the log record counts at 15 second intervals.-image::images/math-expressions/logs-time-series.png[]+image::math-expressions/logs-time-series.png[]Notice that there is a very low level of log activity up until hour 21 minute 27.Then a burst of log activity occurs from minute 27 to minute 52.@@ -116,7 +116,7 @@ This is then followed by a large spike of log activity.The example below breaks this down further by adding a query on the `type_s` field to only visualize *query* activity in the log.-image::images/math-expressions/logs-time-series2.png[]+image::math-expressions/logs-time-series2.png[]Notice the query activity accounts for more then half of the burst of log records between 21:27 and 21:52.But the query activity does not account for the large spike in log activity that follows.@@ -125,7 +125,7 @@ We can account for that spike by changing the search to include only *update*, *We can also narrow by collection so we know where these activities are taking place.-image::images/math-expressions/logs-time-series3.png[]+image::math-expressions/logs-time-series3.png[]Through the various exploratory queries and visualizations we now have a muchbetter understanding of what's contained in the logs.@@ -147,21 +147,21 @@ for specific types of query records.To find all the top level queries in the logs, add a query to limit results to log records with `distrib_s:true` as follows:-image::images/math-expressions/query-top-level.png[]+image::math-expressions/query-top-level.png[]=== Shard Level QueriesTo find all the shard level queries that are not IDs queries, adjust the query to limit results to logs with `distrib_s:false AND ids_s:false` as follows:-image::images/math-expressions/query-shard-level.png[]+image::math-expressions/query-shard-level.png[]=== ID QueriesTo find all the *ids* queries, adjust the query to limit results to logs with `distrib_s:false AND ids_s:true` as follows:-image::images/math-expressions/query-ids.png[]+image::math-expressions/query-ids.png[]== Query Performance@@ -184,7 +184,7 @@ In this example, `qtime_i` is plotted on the y-axis and the x-axis is simply a sNOTE: The `x` field is included in the field list.The `random` function automatically generates a sequence for the x-axis when `x` is included in the field list.-image::images/math-expressions/qtime-scatter.png[]+image::math-expressions/qtime-scatter.png[]From this scatter plot we can tell a number of important things about the query times:@@ -205,7 +205,7 @@ Then the `zplot` function is used plot the query times on the y-axis of the scatNOTE: The `rev` function is used to reverse the query times vector so the visualization displays from lowest to highest query times.-image::images/math-expressions/qtime-highest-scatter.png[]+image::math-expressions/qtime-highest-scatter.png[]From this plot we can see that the 500 highest query times start at 510ms and slowly move higher, until the last 10 spike upwards, culminating at the highest query time of 2529ms.@@ -233,7 +233,7 @@ The resulting frequency table is shown in the visualization below.The x-axis is the number of seconds.The y-axis is the number of query times that rounded to each second.-image::images/math-expressions/qtime-dist.png[]+image::math-expressions/qtime-dist.png[]Notice that roughly 93 percent of the query times rounded to 0, meaning they were under 500ms.About 6 percent round to 1 and the rest rounded to either 2 or 3 seconds.@@ -254,7 +254,7 @@ The array of percentiles set to variable `p` tells the `percentile` function whiThen the `zplot` function is used to plot the *percentiles* on the x-axis and the *query time* at each percentile on the y-axis.-image::images/math-expressions/query-qq.png[]+image::math-expressions/query-qq.png[]From the plot we can see that the 80th percentile has a query time of 464ms.This means that 80% percent of queries are below 464ms.@@ -265,7 +265,7 @@ A time series aggregation can also be run to visualization how QTime changes oveThe example below shows a time series, area chart that visualizes *average query time* at 15 second intervals for a 3 minute section of a log.-image::images/math-expressions/qtime-series.png[]+image::math-expressions/qtime-series.png[]== Performance Troubleshooting@@ -285,7 +285,7 @@ The `core_s` field is particularly useful as its the most granular element and tThe example below uses the `facet` function to calculate `avg(qtime_i)` by core.-image::images/math-expressions/slow-nodes.png[]+image::math-expressions/slow-nodes.png[]Notice in the results that the `core_s` field contains information about the*collection*, *shard*, and *replica*.@@ -302,7 +302,7 @@ The `q_s` field is a string field and the `q_t` field has been tokenized.The `search` function can be used to return the top N slowest queries in the logs by sorting the results by `qtime_i desc`.The example below demonstrates this:-image::images/math-expressions/slow-queries.png[]+image::math-expressions/slow-queries.png[]Once the queries have been retrieved they can be inspected and tried individually to determine if the query is consistently slow.If the query is shown to be slow a plan to improve the query performance can be devised.@@ -318,7 +318,7 @@ The time series below limits the log results to records that are type `query` anThe plot shows the day, hour and minute on the x-axis and `max(qtime_i)` in milliseconds on the y-axis.Notice there are some extreme spikes in max `qtime_i` that need to be understood.-image::images/math-expressions/query-spike.png[]+image::math-expressions/query-spike.png[]The next step is to generate a time series that counts commits across the same time intervals.@@ -328,7 +328,7 @@ The count for the commits is calculated and plotted on y-axis.Notice that there are spikes in commit activity that appear near the spikes in max `qtime_i`.-image::images/math-expressions/commit-series.png[]+image::math-expressions/commit-series.png[]The final step is to overlay the two time series in the same plot.@@ -343,7 +343,7 @@ The `zplot` function is then used to plot the time stamp vector on the x-axis anNOTE: The `minMaxScale` function is used to scale both vectorsbetween 0 and 1 so they can be visually compared on the same plot.-image::images/math-expressions/overlay-series.png[]+image::math-expressions/overlay-series.png[]Notice in this plot that the commit count seems to be closely related to spikesin max `qtime_i`.@@ -355,10 +355,10 @@ Error records will have a `type_s` field value of `error`.The example below searches for error records:-image::images/math-expressions/search-error.png[]+image::math-expressions/search-error.png[]If the error is followed by a stack trace the stack trace will be present in the searchable field `stack_t`.The example below shows a search on the `stack_t` field and the stack trace presented in the result.-image::images/math-expressions/stack.png[]+image::math-expressions/stack.png[]diff --git a/solr/solr-ref-guide/src/machine-learning.adoc b/solr/solr-ref-guide/modules/query-guide/pages/machine-learning.adocsimilarity index 96%rename from solr/solr-ref-guide/src/machine-learning.adocrename to solr/solr-ref-guide/modules/query-guide/pages/machine-learning.adocindex c7952a63830..5f602ef04bc 100644--- a/solr/solr-ref-guide/src/machine-learning.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/machine-learning.adoc@@ -114,11 +114,11 @@ Finally the `zplot` function is used to plot the distance matrix as a heat map.Notice that the heat map has been configured so that the intensity of color increases as the distance between vectors decreases.-image::images/math-expressions/distance.png[]+image::math-expressions/distance.png[]The heat map is interactive, so mousing over one of the cells pops up the values for the cell.-image::images/math-expressions/distanceview.png[]+image::math-expressions/distanceview.png[]Notice that HEAT/HOT WATER and UNSANITARY CONDITION complaints have a cosine distance of .1 (rounded to the nearest tenth).@@ -173,7 +173,7 @@ The `topFeatures` function is used to extract the top 5 column labels for each zThen `zplot` outputs the data in a format that can be visualized ina table with Zeppelin-Solr.-image::images/math-expressions/knn.png[]+image::math-expressions/knn.png[]The table above shows each zip code returned by the `knn` function along with the list of complaints and distances.These are the zip codes that are most similar to the 10280 zip code based on their top 5 complaint types.@@ -197,7 +197,7 @@ The `knnRegress` function is then applied with `20` as the nearest neighbor paraThe `predict` function is then called on the KNN function to predict values for the original `x` vector.Finally `zplot` is used to plot the original `x` and `y` vectors along with the predictions.-image::images/math-expressions/knnRegress.png[]+image::math-expressions/knnRegress.png[]Notice that the regression plot shows a non-linear relations ship between the `filesize_d` field and the `eresponse_d` field.Also note that KNN regression plots a non-linear curve through the scatter plot.@@ -231,7 +231,7 @@ The `ebeSubtract` function is used to perform the element-by-element subtractionFinally the `zplot` function formats the predictions and errors for the visualization of the *residual plot*.-image::images/math-expressions/redwine1.png[]+image::math-expressions/redwine1.png[]The residual plot plots the *predicted* values on the x-axis and the *error* for the prediction on the y-axis.The scatter plot shows how the errors are distributed across the full range of predictions.@@ -252,7 +252,7 @@ The example below shows the same KNN regression as above with a plot of the distIn the example the `zplot` function is used to plot the `empiricalDistribution` function of the residuals, with an 11 bin histogram.-image::images/math-expressions/redwine2.png[]+image::math-expressions/redwine2.png[]Notice that the errors follow a bell curve centered close to 0.From this plot we can see the probability of getting prediction errors between -1 and 1 is quite high.@@ -294,7 +294,7 @@ r=knnRegress(obs, quality, 5, scale="true"),== knnSearchThe `knnSearch` function returns the k-nearest neighbors for a document based on text similarity.-Under the covers the `knnSearch` function uses Solr's <<other-parsers.adoc#more-like-this-query-parser,More Like This>> query parser plugin.+Under the covers the `knnSearch` function uses Solr's xref:morelikethis.adoc#morelikethis-query-parser[More Like This query parser].This capability uses the search engine's query, term statistics, scoring, and ranking capability to perform a fast, nearest neighbor search for similar documents over large distributed indexes.The results of this search can be used directly or provide *candidates* for machine learning operations such as a secondary KNN vector search.@@ -304,7 +304,7 @@ The search returns the 50 documents most similar to a specific document ID (`83eThe `mindf` and `maxdf` specify the minimum and maximum document frequency of the terms used to perform the search.These parameters can make the query faster by eliminating high frequency terms and also improves accuracy by removing noise terms from the search.-image::images/math-expressions/knnSearch.png[]+image::math-expressions/knnSearch.png[]NOTE: In this example the `select` function is used to truncate the review in the output to 220 characters to make it easier to read in a table.@@ -346,7 +346,7 @@ The example uses `haversineMeters` which returns the distance in meters which isFinally, the `zplot` function is used to visualize the clusters on a map with Zeppelin-Solr.The map below has been zoomed to a specific area of Brooklyn with a high density of rat sightings.-image::images/math-expressions/dbscan1.png[]+image::math-expressions/dbscan1.png[]Notice in the visualization that only 1019 points were returned from the 5000 samples.This is the power of the DBSCAN algorithm to filter records that don't match the criteria of a cluster.@@ -355,7 +355,7 @@ The points that are plotted all belong to clearly defined clusters.The map visualization can be zoomed further to explore the locations of specific clusters.The example below shows a zoom into an area of dense clusters.-image::images/math-expressions/dbscan2.png[]+image::math-expressions/dbscan2.png[]== K-Means Clustering@@ -379,7 +379,7 @@ The matrix is transposed so each row contains a single latitude, longitude pointThe `kmeans` function is then used to cluster the latitude and longitude points into 21 clusters.Finally, the `zplot` function is used to visualize the clusters as a scatter plot.-image::images/math-expressions/2DCluster1.png[]+image::math-expressions/2DCluster1.png[]The scatter plot above shows each lat/lon point plotted on a Euclidean plain with longitude on the x-axis and latitude on the y-axis.The plot is dense enough so the outlines of the different boroughs are visible if you know the boroughs of New York City.@@ -398,12 +398,12 @@ The centroids matrix contains 2D lat/lon points.The `colAt` function can then be used to extract the latitude and longitude columns by index from the matrix so they can be plotted with `zplot`.A map visualization is used below to display the centroids.-image::images/math-expressions/centroidplot.png[]+image::math-expressions/centroidplot.png[]The map can then be zoomed to get a closer look at the centroids in the high density areas shown in the cluster scatter plot.-image::images/math-expressions/centroidzoom.png[]+image::math-expressions/centroidzoom.png[]=== Phrase Extraction@@ -412,7 +412,7 @@ K-means clustering produces centroids or *prototype* vectors which can be used tIn this example the key features of the centroids are extracted to represent the key phrases for clusters of TF-IDF term vectors.NOTE: The example below works with TF-IDF _term vectors_.-The section <<term-vectors.adoc#,Text Analysis and Term Vectors>> offers a full explanation of this features.+The section xref:term-vectors.adoc[] offers a full explanation of this features.In the example the `search` function returns documents where the `review_t` field matches the phrase "star wars".The `select` function is run over the result set and applies the `analyze` function which uses the Lucene/Solr analyzer attached to the schema field `text_bigrams` to re-analyze the `review_t` field.@@ -583,7 +583,7 @@ The distance matrix is then visualized with the `zplot` function as a heat map.In the example `cluster1` and `cluster5` have the shortest distance between the clusters.Further analysis of the features in both clusters can be performed to understand the relationship between `cluster1` and `cluster5`.-image::images/math-expressions/fuzzyk.png[]+image::math-expressions/fuzzyk.png[]NOTE: The heat map has been configured to increase in color intensity as the distance shortens.@@ -601,7 +601,7 @@ By default it will scale between `0` and `1` if min/max values are not provided.Below is a plot of a sine wave, with an amplitude of 1, before and after it has been scaled between -5 and 5.-image::images/math-expressions/minmaxscale.png[]+image::math-expressions/minmaxscale.png[]Below is a simple example of min/max scaling of a matrix between 0 and 1.Notice that once brought into the same scale the vectors are the same.@@ -652,7 +652,7 @@ The `standardize` function scales a vector so that it has a mean of 0 and a stanBelow is a plot of a sine wave, with an amplitude of 1, before and after it has been standardized.-image::images/math-expressions/standardize.png[]+image::math-expressions/standardize.png[]Below is a simple example of of a standardized matrix.Notice that once brought into the same scale the vectors are the same.@@ -706,7 +706,7 @@ Unit vectors are preferred when the vector math deals with vector direction rathBelow is a plot of a sine wave, with an amplitude of 1, before and after it has been unitized.-image::images/math-expressions/unitize.png[]+image::math-expressions/unitize.png[]Below is a simple example of a unitized matrix.Notice that once brought into the same scale the vectors are the same.diff --git a/solr/solr-ref-guide/modules/query-guide/pages/math-expressions.adoc b/solr/solr-ref-guide/modules/query-guide/pages/math-expressions.adocnew file mode 100644index 00000000000..d3030c5cae7--- /dev/null+++ b/solr/solr-ref-guide/modules/query-guide/pages/math-expressions.adoc@@ -0,0 +1,50 @@+= Streaming Expressions and Math Expressions+:page-toclevels: 0+// 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+// regarding copyright ownership. The ASF licenses this file+// to you under the Apache License, Version 2.0 (the+// "License"); you may not use this file except in compliance+// with the License. You may obtain a copy of the License at+//+// http://www.apache.org/licenses/LICENSE-2.0+//+// Unless required by applicable law or agreed to in writing,+// software distributed under the License is distributed on an+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+// KIND, either express or implied. See the License for the+// specific language governing permissions and limitations+// under the License.++== A Visual Guide++image::math-expressions/searchiris.png[]++== Table of Contents++[cols="1,1",frame=none,grid=none,stripes=none]+|===+| *xref:visualization.adoc[]*: Gallery of streaming expression and math expression visualizations.+| *xref:math-start.adoc[]*: Getting started with streaming expressions, math expressions, and visualization.+| *xref:loading.adoc[]*: Visualizing, transforming and loading CSV files.+| *xref:search-sample.adoc[]*: Searching, sampling, aggregation and visualization of result sets.+| *xref:transform.adoc[]*: Transforming and filtering result sets.+| *xref:scalar-math.adoc[]*: Math functions and visualization applied to numbers.+| *xref:vector-math.adoc[]*: Vector math, manipulation and visualization.+| *xref:variables.adoc[]*: Vectorizing result sets and assigning and visualizing variables.+| *xref:matrix-math.adoc[]*: Matrix math, manipulation and visualization.+| *xref:term-vectors.adoc[]*: Text analysis and TF-IDF term vectors.+| *xref:probability-distributions.adoc[]*: Continuous and discrete probability distribution functions.+| *xref:statistics.adoc[]*: Descriptive statistics, histograms, percentiles, correlation, inference tests and other stats functions.+| *xref:regression.adoc[]*: Simple and multivariate linear regression.+| *xref:curve-fitting.adoc[]*: Polynomial, harmonic and Gaussian curve fitting.+| *xref:time-series.adoc[]*: Time series aggregation, visualization, smoothing, differencing, anomaly detection and forecasting.+| *xref:numerical-analysis.adoc[]*: Interpolation, derivatives and integrals.+| *xref:dsp.adoc[]*: Convolution, cross-correlation, autocorrelation and fast Fourier transforms.+| *xref:simulations.adoc[]*: Monte Carlo simulations and random walks.+| *xref:machine-learning.adoc[]*: Distance, KNN, DBSCAN, K-means, fuzzy K-means and other ML functions.+| *xref:graph.adoc[]*: Bipartite graphs, in-degree centrality, graph recommenders, temporal graphs and event correlation.+| *xref:computational-geometry.adoc[]*: Convex Hulls and Enclosing Disks.+| *xref:logs.adoc[]*: Solr log analytics and visualization.+|===diff --git a/solr/solr-ref-guide/src/math-start.adoc b/solr/solr-ref-guide/modules/query-guide/pages/math-start.adocsimilarity index 96%rename from solr/solr-ref-guide/src/math-start.adocrename to solr/solr-ref-guide/modules/query-guide/pages/math-start.adocindex 35517764073..8a3b6551825 100644--- a/solr/solr-ref-guide/src/math-start.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/math-start.adoc@@ -40,15 +40,15 @@ This handler compiles the expression, runs the expression logic and returns a JS=== Admin UI Stream Panel-The easiest way to run streaming expressions and math expressions is through the <<stream-screen.adoc#,Stream Screen>> in the Solr Admin UI.+The easiest way to run streaming expressions and math expressions is through the xref:stream-screen.adoc[] in the Solr Admin UI.A sample `search` streaming expression is shown in the screenshot below:-image::images/math-expressions/search.png[]+image::math-expressions/search.png[]A sample `add` math expression is shown in the screenshot below:-image::images/math-expressions/add.png[]+image::math-expressions/add.png[]=== Curl Example@@ -102,7 +102,7 @@ https://github.com/lucidworks/zeppelin-solrOnce installed the Solr Interpreter can be configured to connect to your Solr instance.The screenshot below shows the panel for configuring Zeppelin-Solr.-image::images/math-expressions/zepconf.png[]+image::math-expressions/zepconf.png[]Configure the `solr.baseUrl` and `solr.collection` to point to the location where the streaming expressions and math expressions will be sent for execution.The `solr.collection` is just the execution collection and does not need to hold data, although it can hold data.diff --git a/solr/solr-ref-guide/src/matrix-math.adoc b/solr/solr-ref-guide/modules/query-guide/pages/matrix-math.adocsimilarity index 96%rename from solr/solr-ref-guide/src/matrix-math.adocrename to solr/solr-ref-guide/modules/query-guide/pages/matrix-math.adocindex dd60b54d214..ad9b0feceee 100644--- a/solr/solr-ref-guide/src/matrix-math.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/matrix-math.adoc@@ -119,13 +119,13 @@ responds with:== VisualizationThe `zplot` function can plot matrices as a heat map using the `heat` named parameter.-Heat maps are powerful visualization tools for displaying <<statistics.adoc#correlation-matrices,*correlation*>> and <<machine-learning.adoc#distance-and-distance-matrices,*distance*>> matrices described later in the guide.+Heat maps are powerful visualization tools for displaying xref:statistics.adoc#correlation-matrices[*correlation*] and xref:machine-learning.adoc#distance-and-distance-matrices[*distance*] matrices described later in the guide.The example below shows a 2x2 matrix visualized using the heat mapvisualization in Apache Zeppelin.NOTE: In the visualization below the rows are read from the *bottom* up, which is a common convention for heat maps.-image::images/math-expressions/matrix.png[]+image::math-expressions/matrix.png[]== Accessing Rows and Columnsdiff --git a/solr/solr-ref-guide/src/morelikethis.adoc b/solr/solr-ref-guide/modules/query-guide/pages/morelikethis.adocsimilarity index 95%rename from solr/solr-ref-guide/src/morelikethis.adocrename to solr/solr-ref-guide/modules/query-guide/pages/morelikethis.adocindex 1ec05c97f63..273ba202c52 100644--- a/solr/solr-ref-guide/src/morelikethis.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/morelikethis.adoc@@ -39,7 +39,7 @@ This operates in much the same way as the request handler but since it is a quer`MoreLikeThis` constructs a Lucene query based on terms in a document.It does this by pulling terms from the list of fields provided with the request.-For best results, the fields should have stored term vectors (`termVectors=true`), which can be <<fields.adoc#,configured in the schema>>.+For best results, the fields should have stored term vectors (`termVectors=true`), which can be xref:indexing-guide:fields.adoc[configured in the schema].If term vectors are not stored, MoreLikeThis can generate terms from stored fields.The field used for the `uniqueKey` must also be stored in order for MoreLikeThis to work properly.@@ -157,7 +157,7 @@ Possible values are `true` or `false`.|Optional |Default: none|===+-Query fields and their boosts using the same format used by the <<dismax-query-parser.adoc#,DisMax Query Parser>>.+Query fields and their boosts using the same format used by the xref:dismax-query-parser.adoc[].These fields must also be specified in `mlt.fl`.`mlt.interestingTerms`::@@ -177,7 +177,7 @@ Unless `mlt.boost=true`, all terms will have `boost=1.0`.+To use this parameter with the <<MoreLikeThis Search Component,search component>>, the query cannot be distributed.-In order to get interesting terms, the query must be sent to a single shard and limited to that shard only (with the <<solrcloud-distributed-requests.adoc#limiting-which-shards-are-queried,`shards`>> parameter).+In order to get interesting terms, the query must be sent to a single shard and limited to that shard only (with the xref:deployment-guide:solrcloud-distributed-requests.adoc#limiting-which-shards-are-queried[`shards` parameter]).Multi-shard support is, however, available with the MoreLikeThis request handler.=== MoreLikeThis Request Handler@@ -221,7 +221,7 @@ curl -X POST -H 'Content-type:application/json' -d {Both of the above examples set the `mlt.fl` parameter to "body" for the request handler.This means that all requests to the handler will use that value for the parameter unless specifically overridden in an individual request.-For more about request handler configuration in general, see the section <<requesthandlers-searchcomponents.adoc#default-components,Request Handlers and SearchComponents>>.+For more about request handler configuration in general, see the section xref:configuration-guide:requesthandlers-searchcomponents.adoc#default-components[Default Components].==== Request Handler Parameters@@ -319,7 +319,7 @@ If we had not requested `mlt.match.include=true`, the response would not have inAn external document (one not in the index) can be passed to the MoreLikeThis request handler to be used for recommended documents.-This is accomplished with the use of <<content-streams.adoc#,Content Streams>>.+This is accomplished with the use of xref:indexing-guide:content-streams.adoc[].The body of a document can be passed directly to the request handler with the `stream.body` parameter.Alternatively, if remote streams are enabled, a URL or file could be passed.@@ -339,7 +339,7 @@ It's important to note this could incur a cost to search performance so should o==== Search Component Configuration-The MoreLikeThis search component is a default search component that works with all search handlers (see also <<requesthandlers-searchcomponents.adoc#default-components,Default Components>>).+The MoreLikeThis search component is a default search component that works with all search handlers (see also xref:configuration-guide:requesthandlers-searchcomponents.adoc#default-components[Default Components]).Since it is configured already, it doesn't need any additional configuration unless you'd like to set parameters for a particular collection that override the MoreLikeThis defaults.To do this, you could configure it like this:@@ -356,8 +356,8 @@ The above example would always enable MoreLikeThis for all queries and will alwaThis is probably not something you really want!But the example serves to show how you might define whichever parameters you would like to be default for MoreLikeThis.-If you gave the search component a name other than "mlt" as in the above example, you would need to explicitly add it to a request handler as described in the section <<requesthandlers-searchcomponents.adoc#referencing-search-components,Referencing Search Components>>.-Because the above example uses the same name as the default, the parameters defined there override Solr's default.+If you gave the search component a name other than "mlt" as in the above example, you would need to explicitly add it to a request handler as described in the section xref:configuration-guide:requesthandlers-searchcomponents.adoc#referencing-search-components[Referencing Search Components].+Because the above example uses the same name as the default, the parameters defined override Solr's default.==== Search Component Parameters@@ -592,7 +592,7 @@ It can be either `true` or `false`.=== Query Parser Query and Response-The structure of a MoreLikeThis query parser request is like a query using <<local-params.adoc#,local params>>, as in:+The structure of a MoreLikeThis query parser request is like a query using xref:local-params.adoc[]>, as in:[source,bash]----diff --git a/solr/solr-ref-guide/src/numerical-analysis.adoc b/solr/solr-ref-guide/modules/query-guide/pages/numerical-analysis.adocsimilarity index 97%rename from solr/solr-ref-guide/src/numerical-analysis.adocrename to solr/solr-ref-guide/modules/query-guide/pages/numerical-analysis.adocindex 6c644b3c62f..bf8b412099b 100644--- a/solr/solr-ref-guide/src/numerical-analysis.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/numerical-analysis.adoc@@ -44,7 +44,7 @@ Then a spline is used to interpolate the smoothed control points.One way to better understand interpolation is to visualize what it means to sample along a curve.The example below zooms in on a specific region of a curve by sampling the curve between a specific x-axis range.-image::images/math-expressions/interpolate1.png[]+image::math-expressions/interpolate1.png[]The visualization above first creates two arrays with x and y-axis points.Notice that the x-axis ranges from 0 to 9.@@ -81,7 +81,7 @@ The `loess` function returns the fitted model of smoothed data points.The `zplot` function is then used to plot the `x`, `y` and `y1` variables.-image::images/math-expressions/loess.png[]+image::math-expressions/loess.png[]== Derivatives@@ -101,7 +101,7 @@ The `derivative` function is then applied to the linear interpolation.`zplot` is then used to plot the *`hours`* on the x-axis and `miles` on the y-axis, and the `derivative` as `mph`, at each x-axis point.-image::images/math-expressions/derivative.png[]+image::math-expressions/derivative.png[]Notice that the *miles_traveled* line has a slope of 10 until the 5th hour where it changes to a slope of 50.The *mph* line, which is the derivative, visualizes the *velocity* of the *miles_traveled* line.@@ -121,7 +121,7 @@ Notice that the second derivative `d2` is taken by applying the derivative functThe second derivative is plotted as *acceleration* on the chart.-image::images/math-expressions/derivatives.png[]+image::math-expressions/derivatives.png[]Notice that the acceleration line is 0 until the *mph* line increases from 10 to 50.At this point the *acceleration* line moves to 40.@@ -134,7 +134,7 @@ In the example a monthly time series is generated for the average closing priceThe `avg(close)` column is vectorized and interpolated using linear interpolation (`lerp`).The `zplot` function is then used to plot the derivative of the time series.-image::images/math-expressions/derivative2.png[]+image::math-expressions/derivative2.png[]Notice that the derivative plot clearly shows the rates of change in the stock price over time.@@ -202,7 +202,7 @@ The `avg(close)` column is vectorized and interpolated using a `spline`.The `zplot` function is then used to plot the cumulative integral of the time series.-image::images/math-expressions/integral.png[]+image::math-expressions/integral.png[]The plot above visualizes the volume under the curve as the *AMZN* stock price changes over time.Because this plot is cumulative, the volume under a stock price time series which stays the same over time, will have a positive *linear* slope.diff --git a/solr/solr-ref-guide/src/other-parsers.adoc b/solr/solr-ref-guide/modules/query-guide/pages/other-parsers.adocsimilarity index 95%rename from solr/solr-ref-guide/src/other-parsers.adocrename to solr/solr-ref-guide/modules/query-guide/pages/other-parsers.adocindex 9934d88a2ef..262e41b1992 100644--- a/solr/solr-ref-guide/src/other-parsers.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/other-parsers.adoc@@ -20,13 +20,13 @@ In addition to the main query parsers, there are several other query parsers thaThis section details the other parsers, and gives examples for how they might be used.-Many of these parsers are expressed the same way as <<local-params.adoc#,Local Params>>.+Many of these parsers are expressed the same way as xref:local-params.adoc[].== Block Join Query ParsersThe Block Join query parsers are used with nested documents to query for parents and/or children.-These parsers are covered in detail in the section <<block-join-query-parser.adoc#,Block Join Query Parser>>.+These parsers are covered in detail in the section xref:block-join-query-parser.adoc[].== Boolean Query Parser@@ -106,7 +106,7 @@ q={!bool must=$ref}&ref=foo&ref=bar----Referred queries might be excluded via tags.-Overall the idea is similar to <<faceting.adoc#tagging-and-excluding-filters, excluding fq in facets>>.+Overall the idea is similar to xref:faceting.adoc#tagging-and-excluding-filters[excluding fq in facets].[source,text]----@@ -124,7 +124,7 @@ q={!bool must=foo}`BoostQParser` extends the `QParserPlugin` and creates a boosted query from the input value.The main value is any query to be "wrapped" and "boosted" -- only documents which match that query will match the final query produced by this parser.-Parameter `b` is a <<function-queries.adoc#available-functions,function>> to be evaluated against each document that matches the original query, and the result of the function will be multiplied into into the final score for that document.+Parameter `b` is a xref:function-queries.adoc#available-functions[function] to be evaluated against each document that matches the original query, and the result of the function will be multiplied into into the final score for that document.=== Boost Query Parser Examples@@ -143,9 +143,9 @@ Creates a query `name:foo` which has it's scores multiplied by the _inverse_ ofq={!boost b=div(1,add(1,price))}name:foo-----The `<<function-queries.adoc#query-function,query(...)>>` function is particularly useful for situations where you want to multiply (or divide) the score for each document matching your main query by the score that document would have from another query.+The xref:function-queries.adoc#query-function[`query(...)`] function is particularly useful for situations where you want to multiply (or divide) the score for each document matching your main query by the score that document would have from another query.-This example uses <<local-params.adoc#parameter-dereferencing,local param variables>> to create a query for `name:foo` which is boosted by the scores from the independently specified query `category:electronics`:+This example uses xref:local-params.adoc#parameter-dereferencing[local param variables] to create a query for `name:foo` which is boosted by the scores from the independently specified query `category:electronics`:[source,text]----@@ -161,7 +161,7 @@ The `CollapsingQParser` is really a _post filter_ that provides more performantThis parser collapses the result set to a single document per group before it forwards the result set to the rest of the search components.So all downstream components (faceting, highlighting, etc.) will work with the collapsed result set.-Details about using the `CollapsingQParser` can be found in the section <<collapse-and-expand-results.adoc#,Collapse and Expand Results>>.+Details about using the `CollapsingQParser` can be found in the section xref:collapse-and-expand-results.adoc[].== Complex Phrase Query Parser@@ -216,7 +216,7 @@ It may be prudent to restrict wildcards to at least two or preferably three lettAllowing very short prefixes may result in to many low-quality documents being returned.Notice that it also supports leading wildcards "*a" as well with consequent performance implications.-Applying <<filters.adoc#reversed-wildcard-filter,ReversedWildcardFilterFactory>> in index-time analysis is usually a good idea.+Applying xref:indexing-guide:filters.adoc#reversed-wildcard-filter[ReversedWildcardFilterFactory] in index-time analysis is usually a good idea.==== MaxBooleanClauses with Complex Phrase Parser@@ -227,7 +227,7 @@ You may need to increase MaxBooleanClauses in `solrconfig.xml` as a result of th<maxBooleanClauses>4096</maxBooleanClauses>-----This property is described in more detail in the section <<caches-warming.adoc#query-sizing-and-warming,Query Sizing and Warming>>.+This property is described in more detail in the section xref:configuration-guide:caches-warming.adoc#query-sizing-and-warming[Query Sizing and Warming].==== Stopwords with Complex Phrase Parser@@ -292,7 +292,7 @@ The `param` local parameter uses "`$`" syntax to refer to a few queries, where `== Function Query ParserThe `FunctionQParser` extends the `QParserPlugin` and creates a function query from the input value.-This is only one way to use function queries in Solr; for another, more integrated, approach, see the section on <<function-queries.adoc#,Function Queries>>.+This is only one way to use function queries in Solr; for another, more integrated, approach, see the section on xref:function-queries.adoc[].Example:@@ -444,7 +444,7 @@ The `graph` parser only works in single-node Solr installations, or with SolrCloTo understand how the graph parser works, consider the following Directed Cyclic Graph, containing 8 nodes (A to H) and 9 edges (1 to 9):-image::images/other-parsers/graph_qparser_example.png[image,height=100]+image::other-parsers/graph_qparser_example.png[image,height=100]One way to model this graph as Solr documents, would be to create one document per node, with mutivalued fields identifying the incoming and outgoing edges for each node:@@ -572,7 +572,7 @@ The hash range query parser has a per-segment cache for each field that this queWhen specifying a min/max hash range and a field name with the hash range query parser, only documents that contain a field value that hashes into that range will be returned.If you want to query for a very large result set, you can query for various hash ranges to return a fraction of the documents with each range request.-In the <<join-query-parser.adoc#cross-collection-join,cross collection join>> case, the hash range query parser is used to ensure that each shard only gets the set of join keys that would end up on that shard.+In the xref:join-query-parser.adoc#cross-collection-join[cross collection join] case, the hash range query parser is used to ensure that each shard only gets the set of join keys that would end up on that shard.This query parser uses the MurmurHash3_x86_32.This is the same as the default hashing for the default composite ID router in Solr.@@ -634,7 +634,7 @@ Note the name of the cache should be the field name prefixed by "`hash_`".The Join Query Parser allows users to run queries that normalize relationships between documents, similar to SQL-style joins.-Details of this query parser are in the section <<join-query-parser.adoc#,Join Query Parser>>.+Details of this query parser are in the section xref:join-query-parser.adoc[].== Learning To Rank Query Parser@@ -647,7 +647,7 @@ Example:{!ltr model=myModel reRankDocs=100}-----Details about using the `LTRQParserPlugin` can be found in the <<learning-to-rank.adoc#,Learning To Rank>> section.+Details about using the `LTRQParserPlugin` can be found in the xref:learning-to-rank.adoc[] section.== Max Score Query Parser@@ -888,7 +888,7 @@ The implementation is derived from an unbiased method proposed in later work^[3]The `MLTQParser` enables retrieving documents that are similar to a given document.It uses Lucene's existing `MoreLikeThis` logic and also works in SolrCloud mode.-Information about how to use this query parser is with the documentation about MoreLikeThis, in the section <<morelikethis.adoc#morelikethis-query-parser,MoreLikeThis Query Parser>>.+Information about how to use this query parser is with the documentation about MoreLikeThis, in the section xref:morelikethis.adoc#morelikethis-query-parser[MoreLikeThis Query Parser].== Nested Query Parser@@ -921,7 +921,7 @@ There is currently one Query Parser in Solr to provide Neural Search: `knn`.KNN stands for k-nearest neighbors.-Details are documented further in the section <<dense-vector-search.adoc#,Dense Vector Search>>.+Details are documented further in the section xref:query-guide:dense-vector-search.adoc[].== Payload Query Parsers@@ -1103,7 +1103,7 @@ http://localhost:8983/solr/techproducts?q=memory _query_:{!rank f='pagerank', fuThe `ReRankQParserPlugin` is a special purpose parser for Re-Ranking the top results of a simple query using a more complex ranking query.-Details about using the `ReRankQParserPlugin` can be found in the <<query-re-ranking.adoc#,Query Re-Ranking>> section.+Details about using the `ReRankQParserPlugin` can be found in the xref:query-re-ranking.adoc[] section.== Simple Query Parser@@ -1186,7 +1186,7 @@ However, this can lead to odd results in some cases.There are two spatial QParsers in Solr: `geofilt` and `bbox`.But there are other ways to query spatially: using the `frange` parser with a distance function, using the standard (lucene) query parser with the range syntax to pick the corners of a rectangle, or with RPT and BBoxField you can use the standard query parser but use a special syntax within quotes that allows you to pick the spatial predicate.-All these options are documented further in the section <<spatial-search.adoc#,Spatial Search>>.+All these options are documented further in the section xref:spatial-search.adoc[].== Surround Query Parser@@ -1292,7 +1292,7 @@ If no analysis or transformation is desired for any type of field, see the <<Raw`TermsQParser` functions similarly to the <<Term Query Parser,Term Query Parser>> but takes in multiple values separated by commas and returns documents matching any of the specified values.-This can be useful for generating filter queries from the external human readable terms returned by the faceting or terms components, and may be more efficient in some cases than using the <<standard-query-parser.adoc#,Standard Query Parser>> to generate a boolean query since the default implementation `method` avoids scoring.+This can be useful for generating filter queries from the external human readable terms returned by the faceting or terms components, and may be more efficient in some cases than using the xref:standard-query-parser.adoc[] to generate a boolean query since the default implementation `method` avoids scoring.This query parser takes the following parameters:diff --git a/solr/solr-ref-guide/src/pagination-of-results.adoc b/solr/solr-ref-guide/modules/query-guide/pages/pagination-of-results.adocsimilarity index 94%rename from solr/solr-ref-guide/src/pagination-of-results.adocrename to solr/solr-ref-guide/modules/query-guide/pages/pagination-of-results.adocindex 5d35ddc3e26..da9f34af047 100644--- a/solr/solr-ref-guide/src/pagination-of-results.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/pagination-of-results.adoc@@ -22,7 +22,7 @@ In many applications the UI for these sorted results are displayed to the user i== Basic Pagination-In Solr, this basic paginated searching is supported using the `start` and `rows` parameters, and performance of this common behaviour can be tuned by utilizing the <<caches-warming.adoc#query-result-cache,`queryResultCache`>> and adjusting the <<caches-warming.adoc#queryresultwindowsize-element,`queryResultWindowSize`>> configuration options based on your expected page sizes.+In Solr, this basic paginated searching is supported using the `start` and `rows` parameters, and performance of this common behaviour can be tuned by utilizing the xref:configuration-guide:caches-warming.adoc#query-result-cache[`queryResultCache`] and adjusting the xref:configuration-guide:caches-warming.adoc#queryresultwindowsize-element[`queryResultWindowSize`] configuration options based on your expected page sizes.=== Basic Pagination Examples@@ -105,7 +105,7 @@ There are a few important constraints to be aware of when using `cursorMark` par. `cursorMark` and `start` are mutually exclusive parameters.* Your requests must either not include a `start` parameter, or it must be specified with a value of "```0```".-. When using the <<common-query-parameters.adoc#timeallowed-parameter,`timeAllowed`>> request parameter, partial results may be returned.+. When using the xref:common-query-parameters.adoc#timeallowed-parameter[`timeAllowed`] request parameter, partial results may be returned.If time expires before the search is complete, as indicated when the `responseHeader` includes `"partialResults": true`, some matching documents may have been skipped.Additionally, if `cursorMark` matches `nextCursorMark`, you cannot be sure that there are no more results.+@@ -114,10 +114,10 @@ When the `responseHeader` no longer includes `"partialResults": true`, and `curs. `sort` clauses must include the uniqueKey field (either `asc` or `desc`).+If `id` is your uniqueKey field, then sort parameters like `id asc` and `name asc, id desc` would both work fine, but `name asc` by itself would not-. Sorts including <<date-formatting-math.adoc#,Date Math>> based functions that involve calculations relative to `NOW` will cause confusing results, since every document will get a new sort value on every subsequent request.+. Sorts including xref:indexing-guide:date-formatting-math.adoc[Date Math-based] functions that involve calculations relative to `NOW` will cause confusing results, since every document will get a new sort value on every subsequent request.This can easily result in cursors that never end, and constantly return the same documents over and over – even if the documents are never updated.+-In this situation, choose & re-use a fixed value for the <<date-formatting-math.adoc#now,`NOW` request parameter>> in all of your cursor requests.+In this situation, choose & re-use a fixed value for the xref:indexing-guide:date-formatting-math.adoc#now[`NOW` request parameter] in all of your cursor requests.Cursor mark values are computed based on the sort values of each document in the result, which means multiple documents with identical sort values will produce identical Cursor mark values if one of them is the last document on a page of results.In that situation, the subsequent request using that `cursorMark` would not know which of the documents with the identical mark values should be skipped.@@ -288,4 +288,4 @@ while (true) {}-----TIP: For certain specialized cases, the <<exporting-result-sets.adoc#,/export handler>> may be an option.+TIP: For certain specialized cases, the xref:exporting-result-sets.adoc[/export handler] may be an option.diff --git a/solr/solr-ref-guide/src/probability-distributions.adoc b/solr/solr-ref-guide/modules/query-guide/pages/probability-distributions.adocsimilarity index 92%rename from solr/solr-ref-guide/src/probability-distributions.adocrename to solr/solr-ref-guide/modules/query-guide/pages/probability-distributions.adocindex b82bbd57c69..b47e37ead03 100644--- a/solr/solr-ref-guide/src/probability-distributions.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/probability-distributions.adoc@@ -36,56 +36,56 @@ The `empiricalDistribution` function creates a continuous probability distributiEmpirical distributions can be used to conveniently visualize the probability density function of a random sample from a SolrCloud collection.The example below shows the `zplot` function visualizing the probability density of a random sample with a 32 bin histogram.-image::images/math-expressions/empirical.png[]+image::math-expressions/empirical.png[]==== normalDistributionThe visualization below shows a normal distribution with a `mean` of 0 and `standard deviation` of 1.-image::images/math-expressions/dist.png[]+image::math-expressions/dist.png[]==== logNormalDistributionThe visualization below shows a log normal distribution with a `shape` of .25 and `scale` of 0.-image::images/math-expressions/lognormal.png[]+image::math-expressions/lognormal.png[]==== gammaDistributionThe visualization below shows a gamma distribution with a `shape` of 7.5 and `scale` of 1.-image::images/math-expressions/gamma.png[]+image::math-expressions/gamma.png[]==== betaDistributionThe visualization below shows a beta distribution with a `shape1` of 2 and `shape2` of 2.-image::images/math-expressions/beta.png[]+image::math-expressions/beta.png[]==== uniformDistributionThe visualization below shows a uniform distribution between 0 and 10.-image::images/math-expressions/uniformr.png[]+image::math-expressions/uniformr.png[]==== weibullDistributionThe visualization below shows a Weibull distribution with a `shape` of 5 and `scale` of 1.-image::images/math-expressions/weibull.png[]+image::math-expressions/weibull.png[]==== triangularDistributionThe visualization below shows a triangular distribution with a low of 5 a mode of 10 and a high value of 20.-image::images/math-expressions/triangular.png[]+image::math-expressions/triangular.png[]==== constantDistributionThe visualization below shows a constant distribution of 10.5.-image::images/math-expressions/constant.png[]+image::math-expressions/constant.png[]=== Discrete Distributions@@ -99,45 +99,45 @@ from an enumerated list of values and probabilities or from a data set of discreThe visualization below shows an enumerated distribution created from a list of discrete values and probabilities.-image::images/math-expressions/enum1.png[]+image::math-expressions/enum1.png[]The visualization below shows an enumerated distribution generated from a search result that has been transformed into a vector of discrete values.-image::images/math-expressions/enum2.png[]+image::math-expressions/enum2.png[]==== poissonDistributionThe visualization below shows a Poisson distribution with a `mean` of 15.-image::images/math-expressions/poisson.png[]+image::math-expressions/poisson.png[]==== binomialDistributionThe visualization below shows a binomial distribution with a 100 trials and .15 probability of success.-image::images/math-expressions/binomial.png[]+image::math-expressions/binomial.png[]==== uniformIntegerDistributionThe visualization below shows a uniform integer distribution between 0 and 10.-image::images/math-expressions/uniform.png[]+image::math-expressions/uniform.png[]==== geometricDistributionThe visualization below shows a geometric distribution probability of success of .25.-image::images/math-expressions/geometric.png[]+image::math-expressions/geometric.png[]==== zipFDistributionThe visualization below shows a ZipF distribution with a size of 50 and exponent of 1.-image::images/math-expressions/zipf.png[]+image::math-expressions/zipf.png[]@@ -281,15 +281,15 @@ Vectors of samples can be visualized as scatter plots to gain an intuitive underThe first example shows the scatter plot of a normal distribution with a mean of 0 and a standard deviation of 5.-image::images/math-expressions/sample-scatter.png[]+image::math-expressions/sample-scatter.png[]The next example shows a scatter plot of the same distribution with an ascending sort applied to the sample vector.-image::images/math-expressions/sample-scatter1.png[]+image::math-expressions/sample-scatter1.png[]The next example shows two different distributions overlaid in the same scatter plot.-image::images/math-expressions/sample-overlay.png[]+image::math-expressions/sample-overlay.png[]=== Multivariate Normal Distributiondiff --git a/solr/solr-ref-guide/src/query-elevation-component.adoc b/solr/solr-ref-guide/modules/query-guide/pages/query-elevation-component.adocsimilarity index 96%rename from solr/solr-ref-guide/src/query-elevation-component.adocrename to solr/solr-ref-guide/modules/query-guide/pages/query-elevation-component.adocindex fd657f73ca9..25085e095da 100644--- a/solr/solr-ref-guide/src/query-elevation-component.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/query-elevation-component.adoc@@ -20,7 +20,7 @@ The Query Elevation Component lets you configure the top results for a given queThis is sometimes called "sponsored search", "editorial boosting", or "best bets." This component matches the user query text to a configured map of top results.The text can be any string or non-string IDs, as long as it's indexed.-Although this component will work with any QueryParser, it makes the most sense to use with <<dismax-query-parser.adoc#,DisMax>> or <<edismax-query-parser.adoc#,eDisMax>>.+Although this component will work with any QueryParser, it makes the most sense to use with the xref:dismax-query-parser.adoc[] or the xref:edismax-query-parser.adoc[].The Query Elevation Component also supports distributed searching.@@ -98,7 +98,7 @@ s|Required |Default: none|===+Path to the file that defines the elevation rules.-This file must exist in the <<config-sets.adoc#,configset>>.+This file must exist in the xref:configuration-guide:config-sets.adoc[configset].Unlike most configuration, this component will re-read its configuration if the file changed following a commit.However, that doesn't work in SolrCloud, and there has to be an actual index change for a commit to have an effect for it to be used as a way to pick up changes.In all cases, you can reload affected cores/collections to use any new configuration in a configset.@@ -205,7 +205,7 @@ You can force set `useConfiguredElevatedOrder` during runtime by supplying it as=== Document Transformers and the markExcludes Parameter-The `[elevated]` <<document-transformers.adoc#,Document Transformer>> can be used to annotate each document with information about whether or not it was elevated:+The `[elevated]` xref:document-transformers.adoc[Document Transformer] can be used to annotate each document with information about whether or not it was elevated:[source,text]http://localhost:8983/solr/techproducts/elevate?q=ipod&df=text&fl=id,[elevated]diff --git a/solr/solr-ref-guide/src/query-re-ranking.adoc b/solr/solr-ref-guide/modules/query-guide/pages/query-re-ranking.adocsimilarity index 86%rename from solr/solr-ref-guide/src/query-re-ranking.adocrename to solr/solr-ref-guide/modules/query-guide/pages/query-re-ranking.adocindex 7c03c969b9b..82d971fa30a 100644--- a/solr/solr-ref-guide/src/query-re-ranking.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/query-re-ranking.adoc@@ -48,7 +48,7 @@ The `rerank` parser wraps a query specified by an local parameter, along with ads|Required |Default: none|===+-The query string for your complex ranking query - in most cases <<local-params.adoc#,a variable>> will be used to refer to another request parameter.+The query string for your complex ranking query - in most cases xref:local-params.adoc[a variable] will be used to refer to another request parameter.`reRankDocs`::+@@ -81,11 +81,11 @@ If a document matches the original query, but does not match the re-ranking quer=== LTR Query Parser-The `ltr` stands for Learning To Rank, please see <<learning-to-rank.adoc#,Learning To Rank>> for more detailed information.+The `ltr` stands for Learning To Rank, please see xref:learning-to-rank.adoc[] for more detailed information.== Combining Ranking Queries with Other Solr FeaturesThe `rq` parameter and the re-ranking feature in general works well with other Solr features.-For example, it can be used in conjunction with the <<collapse-and-expand-results.adoc#,collapse parser>> to re-rank the group heads after they've been collapsed.-It also preserves the order of documents elevated by the <<query-elevation-component.adoc#,elevation component>>.-And it even has its own custom explain so you can see how the re-ranking scores were derived when looking at <<common-query-parameters.adoc#debug-parameter,debug information>>.+For example, it can be used in conjunction with xref:collapse-and-expand-results.adoc[] to re-rank the group heads after they've been collapsed.+It also preserves the order of documents elevated by the xref:query-elevation-component.adoc[].+And it even has its own custom explain so you can see how the re-ranking scores were derived when looking at xref:common-query-parameters.adoc#debug-parameter[debug information].diff --git a/solr/solr-ref-guide/src/query-screen.adoc b/solr/solr-ref-guide/modules/query-guide/pages/query-screen.adocsimilarity index 78%rename from solr/solr-ref-guide/src/query-screen.adocrename to solr/solr-ref-guide/modules/query-guide/pages/query-screen.adocindex ee27bc54399..f07b8fb75ba 100644--- a/solr/solr-ref-guide/src/query-screen.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/query-screen.adoc@@ -21,7 +21,7 @@ You can use the *Query* screen to submit a search query to a Solr collection andIn the example in the screenshot, a query has been submitted, and the screen shows the query results sent to the browser as JSON..JSON Results of a Query-image::images/query-screen/query-top.png[image,height=400]+image::query-screen/query-top.png[image,height=400]In this example, a query for `genre:Fantasy` was sent to a "films" collection.Defaults were used for all other options in the form, which are explained briefly in the table below, and covered in detail in later parts of this Guide.@@ -48,23 +48,23 @@ If a query handler is not specified, Solr processes the response with the standaq::The query event.-See <<query-guide.adoc#,Query Guide>> for an explanation of this parameter.+See xref:standard-query-parser.adoc[] for an explanation of this parameter.fq::The filter queries.-See <<common-query-parameters.adoc#,Common Query Parameters>> for more information on this parameter.+See xref:common-query-parameters.adoc[] for more information on this parameter.sort::Sorts the response to a query in either ascending or descending order based on the response's score or another specified characteristic.start, rows::`start` is the offset into the query result starting at which documents should be returned.-The default value is 0, meaning that the query should return results starting with the first document that matches.-This field accepts the same syntax as the start query parameter, which is described in <<query-guide.adoc#,Query Guide>>. `rows` is the number of rows to return.+The default value is `0`, meaning that the query should return results starting with the first document that matches.+This field accepts the same syntax as the `start` query parameter, which is described in xref:common-query-parameters.adoc[]. `rows` is the number of rows to return.fl::Defines the fields to return for each document.-You can explicitly list the stored fields, <<function-queries.adoc#,functions>>, and <<document-transformers.adoc#,doc transformers>> you want to have returned by separating them with either a comma or a space.+You can explicitly list the stored fields, xref:function-queries.adoc[functions], and xref:document-transformers.adoc[doc transformers] you want to have returned by separating them with either a comma or a space.wt::Specifies the Response Writer to be used to format the query response.@@ -79,23 +79,23 @@ This debugging information is intended to be intelligible to the administrator odismax::Click this button to enable the DisMax query parser.-See <<dismax-query-parser.adoc#,The DisMax Query Parser>> for further information.+See xref:dismax-query-parser.adoc[] for further information.edismax::Click this button to enable the Extended query parser.-See <<edismax-query-parser.adoc#,The Extended DisMax Query Parser>> for further information.+See xref:edismax-query-parser.adoc[] for further information.hl:: Click this button to enable highlighting in the query response.-See <<highlighting.adoc#,Highlighting>> for more information.+See xref:highlighting.adoc[]> for more information.facet::Enables faceting, the arrangement of search results into categories based on indexed terms.-See <<faceting.adoc#,Faceting>> for more information.+See xref:faceting.adoc[] for more information.spatial::Click to enable using location data for use in spatial or geospatial searches.-See <<spatial-search.adoc#,Spatial Search>> for more information.+See xref:spatial-search.adoc[] for more information.spellcheck::Click this button to enable the Spellchecker, which provides inline query suggestions based on other, similar, terms.-See <<spell-checking.adoc#,Spell Checking>> for more information.+See xref:spell-checking.adoc[] for more information.diff --git a/solr/solr-ref-guide/src/query-syntax-and-parsers.adoc b/solr/solr-ref-guide/modules/query-guide/pages/query-syntax-and-parsers.adocsimilarity index 57%rename from solr/solr-ref-guide/src/query-syntax-and-parsers.adocrename to solr/solr-ref-guide/modules/query-guide/pages/query-syntax-and-parsers.adocindex 9737524b296..2422a4de7b2 100644--- a/solr/solr-ref-guide/src/query-syntax-and-parsers.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/query-syntax-and-parsers.adoc@@ -39,7 +39,7 @@ Solr supports several query parsers, offering search application designers greatThis section explains how to specify a query parser and describes the syntax and features supported by several parsers available in Solr.-There are some query parameters common to all Solr parsers; these are discussed in the section <<common-query-parameters.adoc#common-query-parameters,Common Query Parameters>>.+There are some query parameters common to all Solr parsers; these are discussed in the section xref:common-query-parameters.adoc[].Query parsers are also called `QParserPlugins`.They are all subclasses of {solr-javadocs}/core/org/apache/solr/search/QParserPlugin.html[QParserPlugin].@@ -50,22 +50,23 @@ If you have custom parsing needs, you may want to extend that class to create yo// tag::parser-sections[][cols="1,1",frame=none,grid=none,stripes=none]|===-| <<common-query-parameters.adoc#,Common Query Parameters>>: Query parameters that can be used with all query parsers.-| <<standard-query-parser.adoc#,Standard Query Parser>>: The standard Lucene query parser.-| <<dismax-query-parser.adoc#,DisMax Query Parser>>: The DisMax query parser.-| <<edismax-query-parser.adoc#,Extended DisMax Query Parser>>: The Extended DisMax (eDisMax) Query Parser.-| <<function-queries.adoc#,Function Queries>>: Parameters for generating relevancy scores using values from one or more numeric fields.-| <<local-params.adoc#,Local Params>>: How to add local arguments to queries.-| <<json-request-api.adoc#,JSON Request API>>: Solr's JSON Request API.-| <<searching-nested-documents.adoc#,Searching Nested Documents>>: Constructing nested and hierarchical queries.-| <<block-join-query-parser.adoc#,Block Join Query Parser>>: Query parser dedicated to searching nested documents.-| <<join-query-parser.adoc#,Join Query Parser>>: Query parser to facilitate joins.-| <<dense-vector-search.adoc#,Dense Vector Search>>: Solr's dense retrieval capabilities.-| <<spatial-search.adoc#,Spatial Search>>: Solr's spatial search capabilities.-| <<other-parsers.adoc#,Other Parsers>>: More parsers designed for use in specific situations.-| <<sql-query.adoc#,SQL Query>>: SQL language support for Solr.-| <<query-screen.adoc#,Query Screen>>: Form-based query builder.-| <<sql-screen.adoc#,SQL Screen>>: SQL query runner with tabular results.+| xref:common-query-parameters.adoc[]: Query parameters that can be used with all query parsers.+| xref:standard-query-parser.adoc[]: The standard Lucene query parser.+| xref:dismax-query-parser.adoc[]: The DisMax query parser.+| xref:edismax-query-parser.adoc[]: The Extended DisMax (eDisMax) Query Parser.+| xref:function-queries.adoc[]: Parameters for generating relevancy scores using values from one or more numeric fields.+| xref:local-params.adoc[]: How to add local arguments to queries.+| xref:json-request-api.adoc[]: Solr's JSON Request API.+| xref:searching-nested-documents.adoc[]: Constructing nested and hierarchical queries.+| xref:block-join-query-parser.adoc[]: Query parser dedicated to searching nested documents.+| xref:join-query-parser.adoc[]: Query parser to facilitate joins.+| xref:spatial-search.adoc[]: Solr's spatial search capabilities.+| xref:dense-vector-search.adoc[]: Solr's dense retrieval capabilities.+| xref:other-parsers.adoc[]: More parsers designed for use in specific situations.+| xref:sql-query.adoc[]: SQL language support for Solr.+| xref:query-screen.adoc[]: Form-based query builder.+| xref:sql-screen.adoc[]: SQL query runner with tabular results.+||===// end::parser-sections[]****diff --git a/solr/solr-ref-guide/src/regression.adoc b/solr/solr-ref-guide/modules/query-guide/pages/regression.adocsimilarity index 98%rename from solr/solr-ref-guide/src/regression.adocrename to solr/solr-ref-guide/modules/query-guide/pages/regression.adocindex 928c60d107f..36cd11f2658 100644--- a/solr/solr-ref-guide/src/regression.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/regression.adoc@@ -71,7 +71,7 @@ This means that changes in `filesize_d` explain 75% of the variability of the `rThe diagnostics can be visualized in a table using Zeppelin-Solr.-image::images/math-expressions/diagnostics.png[]+image::math-expressions/diagnostics.png[]=== Prediction@@ -160,7 +160,7 @@ When this expression is sent to the `/stream` handler it responds with:Using `zplot` and the Zeppelin-Solr interpreter we can visualize both the observations and the predictions in the same scatter plot.In the example below `zplot` is plotting the `filesize_d` observations on the x-axis, the `response_d` observations on the y-axis and the predictions on the y1-axis.-image::images/math-expressions/linear.png[]+image::math-expressions/linear.png[]=== Residuals@@ -219,7 +219,7 @@ When this expression is sent to the `/stream` handler it responds with:Using `zplot` and Zeppelin-Solr we can visualize the residuals with a residuals plot.The example residual plot below plots the predicted value on the x-axis and the error of the prediction on the y-axis.-image::images/math-expressions/residual-plot.png[]+image::math-expressions/residual-plot.png[]The residual plot can be used to interpret reliability of the model.Three things to look for are:@@ -450,6 +450,6 @@ When this expression is sent to the `/stream` handler it responds with:The residual plot for multi-variate linear regression is the same as for simple linear regression.The predictions are plotted on the x-axis and the error is plotted on the y-axis.-image::images/math-expressions/residual-plot2.png[]+image::math-expressions/residual-plot2.png[]The residual plot for multi-variate linear regression can be interpreted in the exact same way as simple linear regression.diff --git a/solr/solr-ref-guide/src/response-writers.adoc b/solr/solr-ref-guide/modules/query-guide/pages/response-writers.adocsimilarity index 95%rename from solr/solr-ref-guide/src/response-writers.adocrename to solr/solr-ref-guide/modules/query-guide/pages/response-writers.adocindex b0fd99655b3..35e22993f0e 100644--- a/solr/solr-ref-guide/src/response-writers.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/response-writers.adoc@@ -193,8 +193,8 @@ The default behavior is not to indent.The XSLT Response Writer applies an XML stylesheet to output.It can be used for tasks such as formatting results for an RSS feed.-This response writer is part of the <<script-update-processor.adoc#,scripting module>>.-Since it is a module, it requires configuration before it can be used.+This response writer is part of the xref:configuration-guide:script-update-processor.adoc[scripting module].+Since it is a module, it requires xref:configuration-guide:script-update-processor.adoc#configuration[configuration] before it can be used.The XSLT Response Writer accepts one parameter:@@ -212,7 +212,7 @@ The Content-Type of the response is set according to the `<xsl:output>` statemen=== XSLT Configuration-The example below, from the `sample_techproducts_configs` <<config-sets.adoc#,configset>> in the Solr distribution, shows how the XSLT Response Writer is configured.+The example below, from the `sample_techproducts_configs` xref:configuration-guide:config-sets.adoc[configset] in the Solr distribution, shows how the XSLT Response Writer is configured.[source,xml]----@@ -277,7 +277,7 @@ Lastly, the `luke.xsl` transformation demonstrates that you can apply very sophiThis is a custom binary format used by Solr for inter-node communication as well as client-server communication.SolrJ uses this as the default for indexing as well as querying.-See <<client-apis.adoc#,Client APIs>> for more details.+See xref:deployment-guide:client-apis.adoc[] for more details.== GeoJSON Response Writer@@ -351,7 +351,7 @@ rsp['response']['docs'].each { |doc| puts 'name field = ' + doc['name'\] }The CSV response writer returns a list of documents in comma-separated values (CSV) format.Other information that would normally be included in a response, such as facet information, is excluded.-The CSV response writer supports multi-valued fields, as well as <<document-transformers.adoc#,pseudo-fields>>, and the output of this CSV format is compatible with Solr's <<indexing-with-update-handlers.adoc#csv-formatted-index-updates,CSV update format>>.+The CSV response writer supports multi-valued fields, as well as xref:document-transformers.adoc[pseudo-fields], and the output of this CSV format is compatible with Solr's xref:indexing-guide:indexing-with-update-handlers.adoc#csv-formatted-index-updates[CSV update format].=== CSV Parametersdiff --git a/solr/solr-ref-guide/src/result-clustering.adoc b/solr/solr-ref-guide/modules/query-guide/pages/result-clustering.adocsimilarity index 98%rename from solr/solr-ref-guide/src/result-clustering.adocrename to solr/solr-ref-guide/modules/query-guide/pages/result-clustering.adocindex 102ba18baa5..75b6551cb81 100644--- a/solr/solr-ref-guide/src/result-clustering.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/result-clustering.adoc@@ -30,11 +30,11 @@ Clusters discovered for a given query can be perceived as _dynamic facets_.This is beneficial when regular faceting is difficult (field values are not known in advance) or when the queries are exploratory in nature.Take a look at the https://search.carrot2.org/#/search/web/apache%20solr/treemap[Carrot^2^] project's demo page to see an example of search results clustering in action (the groups in the visualization have been discovered automatically in search results to the right, there is no external information involved).-image::images/result-clustering/carrot2.png[image,width=900]+image::result-clustering/carrot2.png[image,width=900]The query issued to the system was _Apache Solr_.It seems clear that faceting could not yield a similar set of groups, although the goals of both techniques are similar -- to let the user explore the set of search results and either rephrase the query or narrow the focus to a subset of current documents.-Clustering is also similar to <<result-grouping.adoc#,Result Grouping>> in that it can help to look deeper into search results, beyond the top few hits.+Clustering is also similar to xref:result-grouping.adoc[] in that it can help to look deeper into search results, beyond the top few hits.== Configuration Quick Starter@@ -500,13 +500,13 @@ For example, let's assume the following engine configuration:First, locate the configuration parameters for the Lingo algorithmat https://carrot2.github.io/release/latest/[Carrot^2^ documentation site]:-image::images/result-clustering/carrot2-docs-attrs1.png[image,scaledwidth=75%]+image::result-clustering/carrot2-docs-attrs1.png[image,scaledwidth=75%]Then locate the particular setting you'd like to change and note theREST API path to that setting (in this case the parameter is`minClusterSize` and its path is `preprocessing.documentAssigner.minClusterSize`):-image::images/result-clustering/carrot2-docs-attrs2.png[image,scaledwidth=75%]+image::result-clustering/carrot2-docs-attrs2.png[image,scaledwidth=75%]Now add the full path-value pair to the engine's configuration:diff --git a/solr/solr-ref-guide/src/result-grouping.adoc b/solr/solr-ref-guide/modules/query-guide/pages/result-grouping.adocsimilarity index 96%rename from solr/solr-ref-guide/src/result-grouping.adocrename to solr/solr-ref-guide/modules/query-guide/pages/result-grouping.adocindex f62a11023bf..17069accfd8 100644--- a/solr/solr-ref-guide/src/result-grouping.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/result-grouping.adoc@@ -24,12 +24,12 @@ In this case, the query term "DVD" appeared in all three categories, so Solr gro.Prefer Collapse & Expand instead[NOTE]====-Solr's <<collapse-and-expand-results.adoc#,Collapse and Expand>> feature is newer and mostly overlaps with Result Grouping.+Solr's xref:collapse-and-expand-results.adoc[] feature is newer and mostly overlaps with Result Grouping.There are features unique to both, and they have different performance characteristics.That said, in most cases Collapse and Expand is preferable to Result Grouping.====-Result Grouping is separate from <<faceting.adoc#,Faceting>>.+Result Grouping is separate from xref:faceting.adoc[].Though it is conceptually similar, faceting returns all relevant results and allows the user to refine the results based on the facet category.For example, if you search for "shoes" on a footwear retailer's e-commerce site, Solr would return all results for that query term, along with selectable facets such as "size," "color," "brand," and so on.@@ -383,8 +383,8 @@ This is because one result for "memory" did not have a price assigned to it.== Distributed Result Grouping Caveats-Grouping is supported for <<cluster-types.adoc#solrcloud-mode,distributed searches>>, with some caveats:+Grouping is supported for xref:deployment-guide:cluster-types.adoc#solrcloud-mode[distributed searches], with some caveats:* Currently `group.func` is not supported in any distributed searches* `group.ngroups` and `group.facet` require that all documents in each group must be co-located on the same shard in order for accurate counts to be returned.-<<solrcloud-shards-indexing.adoc#,Document routing via composite keys>> can be a useful solution in many situations.+xref:deployment-guide:solrcloud-shards-indexing.adoc[Document routing via composite keys] can be a useful solution in many situations.diff --git a/solr/solr-ref-guide/src/scalar-math.adoc b/solr/solr-ref-guide/modules/query-guide/pages/scalar-math.adocsimilarity index 95%rename from solr/solr-ref-guide/src/scalar-math.adocrename to solr/solr-ref-guide/modules/query-guide/pages/scalar-math.adocindex b219b14be96..7ba024e25c1 100644--- a/solr/solr-ref-guide/src/scalar-math.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/scalar-math.adoc@@ -76,11 +76,11 @@ This expression returns the following response:In the Zeppelin-Solr interpreter you can simply type in scalar math functions and the result will be shown in a table format.-image::images/math-expressions/scalar.png[]+image::math-expressions/scalar.png[]The *Number* visualization can be used to visualize the number with text and icons.-image::images/math-expressions/num.png[]+image::math-expressions/num.png[]== Streaming Scalar Math@@ -134,11 +134,11 @@ When this expression is sent to the `/stream` handler it responds with:The expression above can be visualized as a table using Zeppelin-Solr.-image::images/math-expressions/stream.png[]+image::math-expressions/stream.png[]By switching to one of the line chart visualizations the two variables can be plotted on the x and y-axis.-image::images/math-expressions/line.png[]+image::math-expressions/line.png[]== More Scalar Math Functionsdiff --git a/solr/solr-ref-guide/src/search-sample.adoc b/solr/solr-ref-guide/modules/query-guide/pages/search-sample.adocsimilarity index 90%rename from solr/solr-ref-guide/src/search-sample.adocrename to solr/solr-ref-guide/modules/query-guide/pages/search-sample.adocindex 74e5092be5b..9dbdade8fda 100644--- a/solr/solr-ref-guide/src/search-sample.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/search-sample.adoc@@ -32,7 +32,7 @@ In the example the `search` function is passed only the name of the collection bThis returns a result set of 10 records with all fields.This simple function is useful for exploring the fields in the data and understanding how to start refining the search criteria.-image::images/math-expressions/search1.png[]+image::math-expressions/search1.png[]=== Searching and Sorting@@ -42,11 +42,11 @@ In the example below a search query, field list, rows and sort have been added tNow the search is limited to records within a specific time range and returns a maximum result set of 750 records sorted by `tdate_dt` ascending.We have also limited the result set to three specific fields.-image::images/math-expressions/search-sort.png[]+image::math-expressions/search-sort.png[]Once the data is loaded into the table we can switch to a scatter plot and plot the `filesize_d` column on the *x-axis* and the `response_d` column on the *y-axis*.-image::images/math-expressions/search-sort-plot.png[]+image::math-expressions/search-sort-plot.png[]This allows us to quickly visualize the relationship between two variables selected from a very specific slice of the index.@@ -55,7 +55,7 @@ This allows us to quickly visualize the relationship between two variables selecThe `search` function will score and rank documents when a query is performed on a text field.The example below shows an example of the scoring and ranking of results.-image::images/math-expressions/scoring.png[]+image::math-expressions/scoring.png[]== Sampling@@ -66,7 +66,7 @@ The visualization examples below use small random samples, but Solr's random samThese larger samples can be used to build reliable statistical models that describe large data sets (billions of documents) with sub-second performance.The examples below demonstrate univariate and bivariate scatter plots of random samples.-Statistical modeling with random samples is covered in the <<statistics.adoc#,Statistics>>, <<probability-distributions.adoc#,Probability>>, <<regression.adoc#,Linear Regression>>, <<curve-fitting.adoc#,Curve Fitting>>, and <<machine-learning.adoc#,Machine Learning>> sections.+Statistical modeling with random samples is covered in the xref:statistics.adoc[], xref:probability-distributions.adoc[], xref:regression.adoc[], xref:curve-fitting.adoc[], and xref:machine-learning.adoc[] sections.=== Univariate Scatter Plots@@ -89,7 +89,7 @@ Based on this the *mean* and *mode* would appear to be around 40,000.This sample can be re-run multiple times to see if the samples produce similar plots.-image::images/math-expressions/univariate.png[]+image::math-expressions/univariate.png[]=== Bivariate Scatter Plots@@ -107,7 +107,7 @@ By studying the scatter plot we can learn the following:* The variance of the data at each `filesize_d` point seems fairly consistent.This means a predictive model would have consistent error across the range of predictions.-image::images/math-expressions/bivariate.png[]+image::math-expressions/bivariate.png[]== Aggregation@@ -124,37 +124,37 @@ Any number and combination of statistics can be calculated in a single functionThe `stats` function can be visualized in Zeppelin-Solr as a table.In the example below two statistics are calculated over a result set and are displayed in a table:-image::images/math-expressions/stats-table.png[]+image::math-expressions/stats-table.png[]The `stats` function can also be visualized using the *number* visualization which is used to highlight important numbers.The example below shows the `count(*)` aggregation displayed in the number visualization:-image::images/math-expressions/stats.png[]+image::math-expressions/stats.png[]=== facetThe `facet` function performs single and multi-dimension aggregations that behave in a similar manner to SQL group by aggregations.-Under the covers the `facet` function pushes down the aggregations to Solr's <<json-facet-api.adoc#,JSON Facet API>> for fast distributed execution.+Under the covers the `facet` function pushes down the aggregations to Solr's xref:json-facet-api.adoc[] for fast distributed execution.The example below performs a single dimension aggregation from the nyc311 (NYC complaints) dataset.The aggregation returns the top five *complaint types* by *count* for records with a status of *Pending*.The results are displayed with Zeppelin-Solr in a table.-image::images/math-expressions/facettab1.png[]+image::math-expressions/facettab1.png[]The example below shows the table visualized using a pie chart.-image::images/math-expressions/facetviz1.png[]+image::math-expressions/facetviz1.png[]The next example demonstrates a multi-dimension aggregation.Notice that the `buckets` parameter now contains two dimensions: `borough_s` and `complaint_type_s`.This returns the top 20 combinations of borough and complaint type by count.-image::images/math-expressions/facettab2.png[]+image::math-expressions/facettab2.png[]The example below shows the multi-dimension aggregation visualized as a grouped bar chart.-image::images/math-expressions/facetviz2.png[]+image::math-expressions/facetviz2.png[]The `facet` function supports any combination of the following aggregate functions: count(*), sum, avg, min, max.@@ -170,7 +170,7 @@ The example below visualizes the output of the `facet2D` function.In the example `facet2D` returns the top 5 boroughs and the top 5 complaint types for each borough.The output is then visualized as a heatmap.-image::images/math-expressions/facet2D.png[]+image::math-expressions/facet2D.png[]The `facet2D` function supports one of the following aggregate functions: `count(*)`, `sum`, `avg`, `min`, `max`.@@ -183,7 +183,7 @@ In this example the average monthly closing price is calculated for the stock tiThe output of the `timeseries` function is then visualized with a line chart.-image::images/math-expressions/timeseries1.png[]+image::math-expressions/timeseries1.png[]The `timeseries` function supports any combination of the following aggregate functions: `count(*)`, `sum`, `avg`, `min`, `max`.@@ -203,14 +203,14 @@ The example below illustrates the difference between the `facet` function and thIn the first example the `facet` function aggregates the top 5 complaint types in Brooklyn.This returns the five most common complaint types in Brooklyn, but it's not clear that these terms appear more frequently in Brooklyn then then the other boroughs.-image::images/math-expressions/significantTermsCompare.png[]+image::math-expressions/significantTermsCompare.png[]In the next example the `significantTerms` function returns the top 5 significant terms in the `complaint_type_s` field for the borough of Brooklyn.The highest scoring term, Elder Abuse, has a foreground count of 285 and background count of 298.This means that there were 298 Elder Abuse complaints in the entire data set, and 285 of them were in Brooklyn.This shows that Elder Abuse complaints have a much higher occurrence rate in Brooklyn than the other boroughs.-image::images/math-expressions/significantTerms2.png[]+image::math-expressions/significantTerms2.png[]The final example shows a visualization of the `significantTerms` from a text field containing movie reviews.The result shows the significant terms that appear in movie reviews that have the phrase "sci-fi".@@ -218,12 +218,12 @@ The result shows the significant terms that appear in movie reviews that have thThe results are visualized using a bubble chart with the *foreground* count on plotted on the x-axis and the *background* count on the y-axis.Each term is shown in a bubble sized by the *score*.-image::images/math-expressions/sterms.png[]+image::math-expressions/sterms.png[]=== nodesThe `nodes` function performs aggregations of nodes during a breadth first search of a graph.-This function is covered in detail in the section <<graph-traversal.adoc#,Graph Traversal>>.+This function is covered in detail in the section xref:graph-traversal.adoc[].In this example the focus will be on finding correlated nodes in a time series graph using the `nodes` expressions.The example below finds stock tickers whose daily movements tend to be correlated with the ticker *jpm* (JP Morgan).@@ -248,6 +248,6 @@ The result below shows the ticker symbols in the `nodes` field and the counts foNotice *jpm* is first, which shows how many days *jpm* had a change greater then .25 in this time period.The next set of ticker symbols (*mtb*, *slvb*, *gs* and *pnc*) are the symbols with highest number of days with a change greater then .25 on the same days that *jpm* had a change greater then .25.-image::images/math-expressions/nodestab.png[]+image::math-expressions/nodestab.png[]The `nodes` function supports any combination of the following aggregate functions: `count(*)`, `sum`, `avg`, `min`, `max`.diff --git a/solr/solr-ref-guide/src/searching-nested-documents.adoc b/solr/solr-ref-guide/modules/query-guide/pages/searching-nested-documents.adocsimilarity index 86%rename from solr/solr-ref-guide/src/searching-nested-documents.adocrename to solr/solr-ref-guide/modules/query-guide/pages/searching-nested-documents.adocindex 983cc7db480..2a92df2d37e 100644--- a/solr/solr-ref-guide/src/searching-nested-documents.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/searching-nested-documents.adoc@@ -1,4 +1,5 @@= Searching Nested Child Documents+:page-partial:// 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@@ -19,24 +20,24 @@This section exposes potential techniques which can be used for searching deeply nested documents, showcasing how more complex queries can be constructed using some of Solr's query parsers and document transformers.These features require `\_root_` and `\_nest_path_` to be declared in the schema.-Please refer to <<indexing-nested-documents.adoc#, Indexing Nested Documents>> for details about schema and index configuration.+Please refer to xref:indexing-guide:indexing-nested-documents.adoc[] for details about schema and index configuration.[NOTE]This section does not demonstrate faceting on nested documents.-For nested document faceting, please refer to the <<json-facet-api#uniqueblock-and-block-join-counts,Block Join Facet Counts>> section.+For nested document faceting, please refer to the xref:json-facet-api.adoc#uniqueblock-and-block-join-counts[Block Join Facet Counts] section.== Query Examples-For the upcoming examples, we'll assume an index containing the same documents covered in <<indexing-nested-documents#example-indexing-syntax,Indexing Nested Documents>>:+For the upcoming examples, we'll assume an index containing the same documents covered in xref:indexing-guide:indexing-nested-documents.adoc#example-indexing-syntax[Indexing Nested Documents]:-include::indexing-nested-documents.adoc[tag=sample-indexing-deeply-nested-documents]+include::indexing-guide:page$indexing-nested-documents.adoc[tag=sample-indexing-deeply-nested-documents]=== Child Doc TransformerBy default, documents that match a query do not include any of their nested children in the response.The `[child]` Doc Transformer Can be used enrich query results with the documents' descendants.-For a detailed explanation of this transformer, and specifics on it's syntax & limitations, please refer to the section <<document-transformers.adoc#child-childdoctransformerfactory, [child] - ChildDocTransformerFactory>>.+For a detailed explanation of this transformer, and specifics on it's syntax & limitations, please refer to the section xref:document-transformers.adoc#child-childdoctransformerfactory[[child] - ChildDocTransformerFactory].A simple query matching all documents with a description that includes "staplers":@@ -105,7 +106,7 @@ $ curl 'http://localhost:8983/solr/gettingstarted/select?omitHeader=true&q=descr=== Child Query ParserThe `{!child}` query parser can be used to search for the _descendent_ documents of parent documents matching a wrapped query.-For a detailed explanation of this parser, see the section <<block-join-query-parser.adoc#block-join-children-query-parser, Block Join Children Query Parser>>.+For a detailed explanation of this parser, see the section xref:block-join-query-parser.adoc#block-join-children-query-parser[Block Join Children Query Parser].Let's consider again the `description_t:staplers` query used above -- if we wrap that query in a `{!child}` query parser then instead of "matching" & returning the product level documents, we instead match all of the _descendent_ child documents of the original query:@@ -145,7 +146,7 @@ $ curl 'http://localhost:8983/solr/gettingstarted/select' -d 'omitHeader=true' -}}-----In this example we've used `\*:* -\_nest_path_:*` as our <<block-join-query-parser.adoc#block-mask,`of` parameter>> to indicate we want to consider all documents which don't have a nest path -- i.e., all "root" level document -- as the set of possible parents.+In this example we've used `\*:* -\_nest_path_:*` as our xref:block-join-query-parser.adoc#block-mask[`of` parameter] to indicate we want to consider all documents which don't have a nest path -- i.e., all "root" level document -- as the set of possible parents.By changing the `of` parameter to match ancestors at specific `\_nest_path_` levels, we can narrow down the list of children we return.In the query below, we search for all descendants of `skus` (using an `of` parameter that identifies all documents that do _not_ have a `\_nest_path_` with the prefix `/skus/*`) with a `price_i` less then `50`:@@ -175,7 +176,7 @@ Note that in the above example, the `/` characters in the `\_nest_path_` were "d(You can see that only a single level of of `\` escaping is needed in the body of the query string -- to prevent the Regex syntax -- because it's not a quoted string local param).-You may find it more convenient to use <<local-params#parameter-dereferencing,parameter references>> in conjunction with <<other-parsers#other-parsers,other parsers>> that do not treat `/` as a special character to express the same query in a more verbose form:+You may find it more convenient to use xref:local-params.adoc#parameter-dereferencing[parameter references] in conjunction with xref:other-parsers.adoc[other parsers] that do not treat `/` as a special character to express the same query in a more verbose form:[source,text]----@@ -186,7 +187,7 @@ $ curl 'http://localhost:8983/solr/gettingstarted/select' -d 'omitHeader=true' -=== Parent Query ParserThe inverse of the `{!child}` query parser is the `{!parent}` query parser, which lets you search for the _ancestor_ documents of some child documents matching a wrapped query.-For a detailed explanation of this parser, see the section <<block-join-query-parser.adoc#block-join-parent-query-parser,Block Join Parent Query Parser>>.+For a detailed explanation of this parser, see the section xref:block-join-query-parser.adoc#block-join-parent-query-parser[Block Join Parent Query Parser].Let's first consider this example of searching for all "manual" type documents that have exactly `1` page:@@ -236,7 +237,7 @@ $ curl 'http://localhost:8983/solr/gettingstarted/select' -d 'omitHeader=true' -}}-----In this example we've used `\*:* -\_nest_path_:*` as our <<block-join-query-parser#block-mask,`which` parameter>> to indicate we want to consider all documents which don't have a nest path -- i.e., all "root" level document -- as the set of possible parents.+In this example we've used `\*:* -\_nest_path_:*` as our xref:block-join-query-parser.adoc#block-mask[`which` parameter] to indicate we want to consider all documents which don't have a nest path -- i.e., all "root" level document -- as the set of possible parents.By changing the `which` parameter to match ancestors at specific `\_nest_path_` levels, we can change the type of ancestors we return.In the query below, we search for `skus` (using an `which` parameter that identifies all documents that do _not_ have a `\_nest_path_` with the prefix `/skus/*`) that are the ancestors of `manuals` with exactly `1` page:@@ -261,7 +262,7 @@ $ curl 'http://localhost:8983/solr/gettingstarted/select' -d 'omitHeader=true' -[CAUTION]====-Note that in the above example, the `/` characters in the `\_nest_path_` were "double escaped" in the `which` parameter, for the <<#double-escaping-nest-path-slashes,same reasons discussed above>> regarding the `{!child} pasers `of` parameter.+Note that in the above example, the `/` characters in the `\_nest_path_` were "double escaped" in the `which` parameter, for the <<double-escaping-nest-path-slashes,same reasons discussed above>> regarding the `{!child} pasers `of` parameter.======= Combining Block Join Query Parsers with Child Doc Transformerdiff --git a/solr/solr-ref-guide/src/simulations.adoc b/solr/solr-ref-guide/modules/query-guide/pages/simulations.adocsimilarity index 94%rename from solr/solr-ref-guide/src/simulations.adocrename to solr/solr-ref-guide/modules/query-guide/pages/simulations.adocindex cd7c9a32db0..ca5915f0af7 100644--- a/solr/solr-ref-guide/src/simulations.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/simulations.adoc@@ -31,7 +31,7 @@ A useful first step in understanding the difference is to visualize daily stockThe example below uses the `search` function to return 1000 days of daily stock returns for the ticker *CVX* (Chevron).The `change_d` field, which is the change in price for the day, is then plotted as a time series.-image::images/math-expressions/randomwalk1.png[]+image::math-expressions/randomwalk1.png[]Notice that the time series of daily price changes moves randomly above andbelow zero.@@ -51,7 +51,7 @@ Then the `conv` (convolution) function is used to autocorrelate the `change_d` vNotice that the `conv` function is simply "convolving" the `change_d` vectorwith a reversed copy of itself.This is the technique for performing autocorrelation using convolution.-The <<dsp.adoc#,Signal Processing>> section of the user guide covers both convolution and autocorrelation in detail.+The xref:dsp.adoc[] section of the user guide covers both convolution and autocorrelation in detail.In this section we'll just discuss the plot.The plot shows the intensity of correlation that is calculated as the `change_d` vector is slid across itself by the `conv` function.@@ -62,7 +62,7 @@ This is followed by another long period of low intensity correlation.This is the autocorrelation plot of pure noise.The daily stock changes appear to be a random time series.-image::images/math-expressions/randomwalk2.png[]+image::math-expressions/randomwalk2.png[]=== Visualizing the Distribution@@ -72,7 +72,7 @@ In the example below the `change_d` vector is plotted using the `empiricalDistriNotice that the distribution appears to be normally distributed.Daily stock price changes do tend to be normally distributed although *CVX* was chosen specifically for this example because of this characteristic.-image::images/math-expressions/randomwalk3.png[]+image::math-expressions/randomwalk3.png[]=== Fitting the Distribution@@ -84,7 +84,7 @@ The `ks` test is checking the reference distribution against the `change_d` vectNotice in the example below the `ks` test reports a p-value of .16278.A p-value of .05 or less is typically used to invalidate the null hypothesis of the test which is that the vector could have been drawn from the reference distribution.-image::images/math-expressions/randomwalk4.png[]+image::math-expressions/randomwalk4.png[]The `ks` test, which tends to be fairly sensitive, has confirmed the visualization which appeared to be normal.@@ -116,14 +116,14 @@ The result of the simulation is set to variable `s`, which contains the total reThe `empiricalDistribution` function is then used to visualize the output of the simulation as a 50 bin histogram.The distribution visualizes the probability of the different total returns from 100 days of stock returns for ticker *CVX*.-image::images/math-expressions/randomwalk5.png[]+image::math-expressions/randomwalk5.png[]The `probability` and `cumulativeProbability` functions can then used to learn more about the `empiricalDistribution`.For example the `probability` function can be used to calculate the probability of a non-negative return from 100 days of stock returns.The example below uses the `probability` function to return the probability of a return between the range of 0 and 40 from the `empiricalDistribution` of the simulation.-image::images/math-expressions/randomwalk5.1.png[]+image::math-expressions/randomwalk5.1.png[]=== Random Walk@@ -136,7 +136,7 @@ The variable `v` is maintained between iterations so each iteration uses the preThe `double` function is the final function run each iteration, which simply returns the value of `v` as a double.The example iterates 1000 times to create a random walk with 1000 steps.-image::images/math-expressions/randomwalk6.png[]+image::math-expressions/randomwalk6.png[]Notice the autocorrelation in the daily stock prices caused by the dependency between steps produces a very different plot then the random daily change in stock price.@@ -156,13 +156,13 @@ Before getting started with actual simulations it's useful to first understand tThe example below runs two searches to retrieve the daily stock returns for all Allstate and Chevron.The `change_d` vectors from both returns are read into variables (`all` and `cvx`) and Pearson's correlation is calculated for the two vectors with the `corr` function.-image::images/math-expressions/corrsim1.png[]+image::math-expressions/corrsim1.png[]Covariance is an unscaled measure of correlation.Covariance is the measure used by the multivariate simulations so it's useful to also compute the covariance for the two stock returns.The example below computes the covariance.-image::images/math-expressions/corrsim2.png[]+image::math-expressions/corrsim2.png[]=== Covariance Matrix@@ -174,7 +174,7 @@ The matrix is then transposed with the `transpose` function so that the `all` veThe `cov` function then computes the covariance matrix for the columns of the matrix and returns the result.-image::images/math-expressions/corrsim3.png[]+image::math-expressions/corrsim3.png[]The covariance matrix is a square matrix which contains the variance of each vector and the covariance between the vectors as follows:@@ -209,7 +209,7 @@ The output of the simulation is a vector which can be treated as an empirical diIn this example it is plotted as a 50 bin histogram which visualizes the probability of the different total returns from 100 days of stock returns for the tickers `all` and `cvx`.-image::images/math-expressions/mnorm.png[]+image::math-expressions/mnorm.png[]=== The Effect of Correlation@@ -218,4 +218,4 @@ The example below demonstrates this by providing a hard coded covariance matrixThis results is a simulated outcome distribution with a higher standard deviation or larger spread from the mean.This measures the degree that higher correlation produces higher volatility in the random walk.-image::images/math-expressions/mnorm2.png[]+image::math-expressions/mnorm2.png[]diff --git a/solr/solr-ref-guide/src/spatial-search.adoc b/solr/solr-ref-guide/modules/query-guide/pages/spatial-search.adocsimilarity index 96%rename from solr/solr-ref-guide/src/spatial-search.adocrename to solr/solr-ref-guide/modules/query-guide/pages/spatial-search.adocindex 28c4d39b375..37aa5802bd2 100644--- a/solr/solr-ref-guide/src/spatial-search.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/spatial-search.adoc@@ -126,7 +126,7 @@ A spatial indexed field.|Optional |Default: `none`|===+-If the query is used in a scoring context (e.g., as the main query in `q`), this _<<local-params.adoc#,local param>>_ determines what scores will be produced.+If the query is used in a scoring context (e.g., as the main query in `q`), this xref:local-params.adoc[_local param_] determines what scores will be produced.Advanced option; not supported by PointType.+Valid values are:@@ -172,7 +172,7 @@ For example, to find all documents within five kilometers of a given lat/lon poiThis filter returns all results within a circle of the given radius around the initial point:-image::images/spatial-search/circle.png[5KM radius]+image::spatial-search/circle.png[5KM radius]=== bbox@@ -190,7 +190,7 @@ The rectangular shape is faster to compute and so it's sometimes used as an alteHowever, if the ideal goal is a circle but you want it to run faster, then instead consider using the RPT field and try a large `distErrPct` value like `0.1` (10% radius).This will return results outside the radius but it will do so somewhat uniformly around the shape.-image::images/spatial-search/bbox.png[Bounding box]+image::spatial-search/bbox.png[Bounding box][IMPORTANT]====@@ -227,11 +227,11 @@ The only spatial types which stand to benefit from this technique are those withThere are four distance function queries:* `geodist`, see below, usually the most appropriate;-* <<function-queries.adoc#dist-function,`dist`>>, to calculate the p-norm distance between multi-dimensional vectors;-* <<function-queries.adoc#hsin-function,`hsin`>>, to calculate the distance between two points on a sphere;-* <<function-queries.adoc#sqedist-function,`sqedist`>>, to calculate the squared Euclidean distance between two points.+* xref:function-queries.adoc#dist-function[`dist`], to calculate the p-norm distance between multi-dimensional vectors;+* xref:function-queries.adoc#hsin-function[`hsin`], to calculate the distance between two points on a sphere;+* xref:function-queries.adoc#sqedist-function[`sqedist`], to calculate the squared Euclidean distance between two points.-For more information about these function queries, see the section on <<function-queries.adoc#,Function Queries>>.+For more information about these function queries, see the section on xref:function-queries.adoc[].=== geodist@@ -270,7 +270,7 @@ There are other ways to do it too, like using a `{!geofilt}` in each facet.query=== Boost Nearest Results-Using the <<dismax-query-parser.adoc#,DisMax>> or <<edismax-query-parser.adoc#,Extended DisMax>>, you can combine spatial search with the boost function to boost the nearest results:+Using the xref:dismax-query-parser.adoc[] or xref:edismax-query-parser.adoc[], you can combine spatial search with the boost function to boost the nearest results:[source,text]&q.alt=*:*&fq={!geofilt}&sfield=store&pt=45.15,-93.85&d=50&bf=recip(geodist(),2,200,20)&sort=score desc@@ -564,7 +564,7 @@ Assuming you name your field "geom", you can configure an optional cache in `sol----When using this field type, you will likely _not_ want to mark the field as stored because it's redundant with the DocValues data and surely larger because of the formatting (be it WKT or GeoJSON).-To retrieve the spatial data in search results from DocValues, use the <<document-transformers.adoc#geo-geospatial-formatter,`[geo]` transformer>>.+To retrieve the spatial data in search results from DocValues, use the xref:document-transformers.adoc#geo-geospatial-formatter[`[geo]` transformer].=== Heatmap Faceting@@ -574,7 +574,7 @@ The grid cells are determined at index-time based on RPT's configuration.At facet counting time, the indexed cells in the region of interest are traversed and a grid of counters corresponding to each cell are incremented.Solr can return the data in a straight-forward 2D array of integers or in a PNG which compresses better for larger data sets but must be decoded.-The heatmap feature is accessible both from Solr's standard faceting feature, plus the newer more flexible <<json-facet-api.adoc#heatmap-facet,JSON Facet API>>.+The heatmap feature is accessible both from Solr's standard faceting feature and the xref:json-facet-api.adoc#heatmap-facet[JSON Facet API].We'll proceed now with standard faceting.As a part of faceting, it supports the `key` local parameter as well as excluding tagged filter queries, just like other types of faceting do.This allows multiple heatmaps to be returned on the same field with different filters.diff --git a/solr/solr-ref-guide/src/spell-checking.adoc b/solr/solr-ref-guide/modules/query-guide/pages/spell-checking.adocsimilarity index 98%rename from solr/solr-ref-guide/src/spell-checking.adocrename to solr/solr-ref-guide/modules/query-guide/pages/spell-checking.adocindex 37789ea19db..84b0194b5e2 100644--- a/solr/solr-ref-guide/src/spell-checking.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/spell-checking.adoc@@ -173,7 +173,7 @@ The results are combined and collations can contain a mix of corrections from bo=== Add It to a Request Handler-Queries will be sent to a <<query-syntax-and-parsers.adoc#,RequestHandler>>.+Queries will be sent to a xref:configuration-guide:requesthandlers-searchcomponents.adoc[request handler].If every request should generate a suggestion, then you would add the following to the `requestHandler` that you are using:[source,xml]@@ -227,7 +227,7 @@ This parameter specifies the query to spellcheck.+If `spellcheck.q` is defined, then it is used; otherwise the original input query is used.The `spellcheck.q` parameter is intended to be the original query, minus any extra markup like field names, boosts, and so on.-If the `q` parameter is specified, then the `SpellingQueryConverter` class is used to parse it into tokens; otherwise the <<tokenizers.adoc#white-space-tokenizer,`WhitespaceTokenizer`>> is used.+If the `q` parameter is specified, then the `SpellingQueryConverter` class is used to parse it into tokens; otherwise the xref:indexing-guide:tokenizers.adoc#white-space-tokenizer[WhitespaceTokenizer] is used.+The choice of which one to use is up to the application.Essentially, if you have a spelling "ready" version in your application, then it is probably better to use `spellcheck.q`.@@ -507,7 +507,7 @@ s|Required |Default: none|===+Specifies the shards in your distributed indexing configuration.-For more information about distributed indexing, see <<user-managed-distributed-search.adoc#,User-Managed Distributed Search>>.+For more information about distributed indexing, see xref:deployment-guide:cluster-types.adoc[].`shards.qt`::+diff --git a/solr/solr-ref-guide/src/sql-query.adoc b/solr/solr-ref-guide/modules/query-guide/pages/sql-query.adocsimilarity index 97%rename from solr/solr-ref-guide/src/sql-query.adocrename to solr/solr-ref-guide/modules/query-guide/pages/sql-query.adocindex c7d793a9955..7c234e3f5c9 100644--- a/solr/solr-ref-guide/src/sql-query.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/sql-query.adoc@@ -29,7 +29,7 @@ Both MapReduce style and JSON Facet API aggregations are supported, which means== SQL ArchitectureThe SQL interface allows sending a SQL query to Solr and getting documents streamed back in response.-Under the covers, Solr's SQL interface uses the Apache Calcite SQL engine to translate SQL queries to physical query plans implemented as <<streaming-expressions.adoc#,Streaming Expressions>>.+Under the covers, Solr's SQL interface uses the Apache Calcite SQL engine to translate SQL queries to physical query plans implemented as xref:streaming-expressions.adoc[].More information about how to Solr supports SQL queries for Solr is described in the <<Configuration>> section below.@@ -252,7 +252,7 @@ SELECT distinct fieldA as fa, fieldB as fb FROM tableA ORDER BY fa desc, fb descThe SQL interface supports simple statistics calculated on numeric fields.The supported functions are `COUNT(*)`, `COUNT(DISTINCT field)`, `APPROX_COUNT_DISTINCT(field)`, `MIN`, `MAX`, `SUM`, and `AVG`.-Because these functions never require data to be shuffled, the aggregations are pushed down into the search engine and are generated by the <<stats-component.adoc#,StatsComponent>>.+Because these functions never require data to be shuffled, the aggregations are pushed down into the search engine and are generated by the xref:stats-component.adoc[].[source,sql]----@@ -356,7 +356,7 @@ By default, the `/sql` request handler is configured as an implicit handler, mea==== Authorization for SQL Requests-If your Solr cluster is configured to use the <<rule-based-authorization-plugin.adoc#,Rule-based Authorization Plugin>>,+If your Solr cluster is configured to use the xref:deployment-guide:rule-based-authorization-plugin.adoc[],then you need to grant `GET` and `POST` permissions on the `/sql`, `/select`, and `/export` endpoints for all collections you intend to execute SQL queries against.The `/select` endpoint is used for `LIMIT` queries, whereas the `/export` handler is used for queries without a `LIMIT`, so in most cases, you'll want to grant access to both.If you're using a worker collection for the `/sql` handler, then you only need to grant access to the `/sql` endpoint for the worker collection and not the collections in the data tier.@@ -372,7 +372,7 @@ If you have high cardinality fields and a large amount of data, please be sure t=== /stream and /export Request HandlersThe Streaming API is an extensible parallel computing framework for SolrCloud.-<<streaming-expressions.adoc#,Streaming Expressions>> provide a query language and a serialization format for the Streaming API.+xref:streaming-expressions.adoc[] provide a query language and a serialization format for the Streaming API.The Streaming API provides support for fast MapReduce allowing it to perform parallel relational algebra on extremely large data sets.Under the covers the SQL interface parses SQL queries using the Apache Calcite SQL Parser.@@ -507,7 +507,8 @@ This means the tuples are always sorted and partitioned before they hit the netwThe partitioned tuples are sent directly to the correct worker nodes in the proper sort order, ready to be reduced..How Parallel SQL Queries are Distributed-image::images/sql-query/cluster.png[image,width=492,height=250]++image::sql-query/cluster.png[image,width=492,height=250]The image above shows the three tiers broken out into different SolrCloud collections for clarity.In practice the `/sql` handler and worker collection by default share the same collection.@@ -541,11 +542,11 @@ The SQL interface supports queries sent from SQL clients and database visualizatThis Guide contains documentation to configure the following tools and clients:-* <<jdbc-zeppelin.adoc#,Apache Zeppelin>>-* <<jdbc-dbvisualizer.adoc#,DbVisualizer>>-* <<jdbc-squirrel.adoc#,SQuirreL SQL>>-* <<jdbc-r.adoc#,R>>-* <<jdbc-python-jython.adoc#,Python/Jython>>+* xref:jdbc-zeppelin.adoc[]+* xref:jdbc-dbvisualizer.adoc[]+* xref:jdbc-squirrel.adoc[]+* xref:jdbc-r.adoc[]+* xref:jdbc-python-jython.adoc[]=== Generic Clientsdiff --git a/solr/solr-ref-guide/src/sql-screen.adoc b/solr/solr-ref-guide/modules/query-guide/pages/sql-screen.adocsimilarity index 83%rename from solr/solr-ref-guide/src/sql-screen.adocrename to solr/solr-ref-guide/modules/query-guide/pages/sql-screen.adocindex eab86f5cae7..a088e37a0fb 100644--- a/solr/solr-ref-guide/src/sql-screen.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/sql-screen.adoc@@ -21,6 +21,6 @@ You can use the *SQL Query* screen to submit a SQL query to a Solr collection anIn the example in the screenshot, a SQL query has been submitted, and the screen shows the query results listed as a table..Results of a SQL Query-image::images/sql-screen/sql-query-ui.png[image,height=400]+image::sql-screen/sql-query-ui.png[image,height=400]-Learn more about by reading the <<sql-query.adoc#,SQL details>>, including the specific <<sql-query.adoc#solr-sql-syntax,SQL syntax>> supported by Solr.+Learn more by reading the xref:sql-query.adoc[], including the specific xref:sql-query.adoc#solr-sql-syntax[SQL syntax] supported by Solr.diff --git a/solr/solr-ref-guide/src/standard-query-parser.adoc b/solr/solr-ref-guide/modules/query-guide/pages/standard-query-parser.adocsimilarity index 94%rename from solr/solr-ref-guide/src/standard-query-parser.adocrename to solr/solr-ref-guide/modules/query-guide/pages/standard-query-parser.adocindex e7effed16fd..fe9bb929bcd 100644--- a/solr/solr-ref-guide/src/standard-query-parser.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/standard-query-parser.adoc@@ -19,11 +19,11 @@Solr's default Query Parser is also known as the "```lucene```" parser.The key advantage of the standard query parser is that it supports a robust and fairly intuitive syntax allowing you to create a variety of structured queries.-The largest disadvantage is that it's very intolerant of syntax errors, as compared with something like the <<dismax-query-parser.adoc#,DisMax>> query parser which is designed to throw as few errors as possible.+The largest disadvantage is that it's very intolerant of syntax errors, as compared with something like the xref:dismax-query-parser.adoc[] which is designed to throw as few errors as possible.== Standard Query Parser Parameters-In addition to the <<common-query-parameters.adoc#,Common Query Parameters>>, <<faceting.adoc#,Faceting Parameters>>, <<highlighting.adoc#,Highlighting Parameters>>, and <<morelikethis.adoc#,MoreLikeThis Parameters>>, the standard query parser supports the parameters described in the table below.+In addition to the xref:common-query-parameters.adoc[], xref:faceting.adoc[] Parameters, xref:highlighting.adoc[] Parameters, and xref:morelikethis.adoc[] Parameters, the standard query parser supports the parameters described in the table below.`q`::Defines a query using standard query syntax.@@ -46,9 +46,9 @@ Default parameter values are specified in `solrconfig.xml`, or overridden by que== Standard Query Parser ResponseBy default, the response from the standard query parser contains one `<result>` block, which is unnamed.-If the <<common-query-parameters.adoc#debug-parameter,`debug` parameter>> is used, then an additional `<lst>` block will be returned, using the name "debug".+If the xref:common-query-parameters.adoc#debug-parameter[`debug` parameter] is used, then an additional `<lst>` block will be returned, using the name "debug".This will contain useful debugging info, including the original query string, the parsed query string, and explain info for each document in the <result> block.-If the <<common-query-parameters.adoc#explainother-parameter,`explainOther` parameter>> is also used, then additional explain info will be provided for all the documents matching that query.+If the xref:common-query-parameters.adoc#explainother-parameter[`explainOther` parameter] is also used, then additional explain info will be provided for all the documents matching that query.=== Sample Responses@@ -200,7 +200,7 @@ The brackets around a query determine its inclusiveness.Here's an example: `count:{1 TO 10]`Wildcards, `*`, can also be used for either or both endpoints to specify an open-ended range query.-This is a <<#differences-between-lucenes-classic-query-parser-and-solrs-standard-query-parser,divergence from Lucene's Classic Query Parser>>.+This is a <<differences-between-lucenes-classic-query-parser-and-solrs-standard-query-parser,divergence from Lucene's Classic Query Parser>>.* `field:[* TO 100]` finds all field values less than or equal to 100.* `field:[100 TO *]` finds all field values greater than or equal to 100.@@ -253,7 +253,7 @@ Example:== Querying Specific Fields-Data indexed in Solr is organized in fields, which are <<fields.adoc#,defined in the Solr Schema>>.+Data indexed in Solr is organized in xref:indexing-guide:fields.adoc[fields], which are defined in xref:indexing-guide:schema-elements.adoc[a schema].Searches can take advantage of fields to add precision to queries.For example, you can search for a term only in a specific field, such as a title field.@@ -438,7 +438,8 @@ There is no limitation on the number of terms that match (as there was in past v=== Specifying Dates and Times-Queries against date based fields must use the <<date-formatting-math.adoc#,appropriate date formating>>. Queries for exact date values will require quoting or escaping since `:` is the parser syntax used to denote a field query:+Queries against date based fields must use the xref:indexing-guide:date-formatting-math.adoc[appropriate date formating].+Queries for exact date values will require quoting or escaping since `:` is the parser syntax used to denote a field query:* `createdate:1976-03-06T23\:59\:59.999Z`* `createdate:"1976-03-06T23:59:59.999Z"`diff --git a/solr/solr-ref-guide/src/statistics.adoc b/solr/solr-ref-guide/modules/query-guide/pages/statistics.adocsimilarity index 97%rename from solr/solr-ref-guide/src/statistics.adocrename to solr/solr-ref-guide/modules/query-guide/pages/statistics.adocindex 5644bcfedf7..2427c90e292 100644--- a/solr/solr-ref-guide/src/statistics.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/statistics.adoc@@ -68,7 +68,7 @@ Samples of this size can be used to reliably estimate the statistics for very laThe `describe` function can also be visualized in a table with Zeppelin-Solr:-image::images/math-expressions/describe.png[]+image::math-expressions/describe.png[]== Histograms and Frequency Tables@@ -138,15 +138,15 @@ When this expression is sent to the `/stream` handler it responds with:With Zeppelin-Solr the histogram can be first visualized as a table:-image::images/math-expressions/histtable.png[]+image::math-expressions/histtable.png[]Then the histogram can be visualized with an area chart by plotting the *mean* of the bins on the *x-axis* and the *prob* (probability) on the *y-axis*:-image::images/math-expressions/hist.png[]+image::math-expressions/hist.png[]The cumulative probability can be plotted by switching the *y-axis* to the *cumProb* column:-image::images/math-expressions/cumProb.png[]+image::math-expressions/cumProb.png[]=== Custom Histograms@@ -169,7 +169,7 @@ Then an `array` of labels is created and set to variable *l*.Finally the `zplot` function is used to plot the labels vector and the `count(*)` column.Notice the `col` function is used inside of the `zplot` function to extract the counts from the `stats` results.-image::images/math-expressions/custom-hist.png[]+image::math-expressions/custom-hist.png[]=== Frequency Tables@@ -242,11 +242,11 @@ When this expression is sent to the `/stream` handler it responds with:With Zeppelin-Solr the frequency table can be first visualized as a table:-image::images/math-expressions/freqTable.png[]+image::math-expressions/freqTable.png[]The frequency table can then be plotted by switching to a scatter chart and selecting the *value* column for the *x-axis* and the *count* column for the *y-axis*-image::images/math-expressions/freqTable1.png[]+image::math-expressions/freqTable1.png[]Notice that the visualization nicely displays the frequency of daily change in stock prices rounded to integers.The most frequently occurring value is 0 with 1494 occurrences followed by -1 and 1 with around 700 occurrences.@@ -337,7 +337,7 @@ Notice that the variable *p* is used to specify the list of percentiles that areFinally `zplot` is used to plot the percentiles sequence on the *x-axis* and the calculated percentile values for both distributions on the *y-axis*.And a line plot is used to visualize the QQ plot.-image::images/math-expressions/quantile-plot.png[]+image::math-expressions/quantile-plot.png[]This quantile plot provides a clear picture of the distributions of daily price changes for *amzn* and *googl*.In the plot the *x-axis* is the percentiles and the *y-axis* is the percentile value calculated.@@ -366,7 +366,7 @@ The type of correlation is specified by adding the *type* named parameter in theIn the example below a random sample containing two fields, `filesize_d` and `response_d`, is drawn from the logs collection using the `random` function.The fields are vectorized into the variables *x* and *y* and then *Spearman's* correlation for the two vectors is calculated using the `corr` function.-image::images/math-expressions/correlation.png[]+image::math-expressions/correlation.png[]==== Correlation Matrices@@ -390,14 +390,14 @@ Another way to look at this is it shows how the different complaint types tend tFinally the `zplot` function is used to plot the correlation matrix as a heat map.-image::images/math-expressions/corrmatrix.png[]+image::math-expressions/corrmatrix.png[]Notice in the example the correlation matrix is square with complaint types shown on both the *x* and y-axises.The color of the cells in the heat map shows the intensity of the correlation between the complaint types.The heat map is interactive, so mousing over one of the cells pops up the values for the cell.-image::images/math-expressions/corrmatrix2.png[]+image::math-expressions/corrmatrix2.png[]Notice that HEAT/HOT WATER and UNSANITARY CONDITION complaints have a correlation of 8 (rounded to the nearesttenth).@@ -410,7 +410,7 @@ The `cov` function calculates the covariance of two vectors of data.In the example below a random sample containing two fields, `filesize_d` and `response_d`, is drawn from the logs collection using the `random` function.The fields are vectorized into the variables *x* and *y* and then the covariance for the two vectors is calculated using the `cov` function.-image::images/math-expressions/covariance.png[]+image::math-expressions/covariance.png[]If a matrix is passed to the `cov` function it will automatically compute a covariance matrix for the *columns* of the matrix.diff --git a/solr/solr-ref-guide/src/stats-component.adoc b/solr/solr-ref-guide/modules/query-guide/pages/stats-component.adocsimilarity index 95%rename from solr/solr-ref-guide/src/stats-component.adocrename to solr/solr-ref-guide/modules/query-guide/pages/stats-component.adocindex 4a36effe451..32614751ca0 100644--- a/solr/solr-ref-guide/src/stats-component.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/stats-component.adoc@@ -48,7 +48,7 @@ s|Required |Default: noneSpecifies a field for which statistics should be generated.This parameter may be invoked multiple times in a query in order to request statistics on multiple fields.+-<<local-params.adoc#,Local Params>> may be used to indicate a subset of the supported statistics should be computed, and/or that statistics should be computed over the results of an arbitrary numeric function (or query) instead of a simple field name.+xref:local-params.adoc[] may be used to indicate a subset of the supported statistics should be computed, and/or that statistics should be computed over the results of an arbitrary numeric function (or query) instead of a simple field name.See the examples below.@@ -165,7 +165,7 @@ This statistic is computed for all field types but is not computed by default.== Local Params with the Stats Component-Similar to the <<faceting.adoc#,Facet Component>>, the `stats.field` parameter supports local params for:+Similar to the xref:faceting.adoc[Facet Component], the `stats.field` parameter supports local params for:* Tagging & Excluding Filters: `stats.field={!ex=filterA}price`* Changing the Output Key: `stats.field={!key=my_price_stats}price`@@ -227,4 +227,4 @@ http://localhost:8983/solr/techproducts/select?q=*:*&fq={!tag=stock_check}inStocSets of `stats.field` parameters can be referenced by `tag` when using Pivot Faceting to compute multiple statistics at every level (i.e., field) in the tree of pivot constraints.-For more information and a detailed example, please see <<faceting.adoc#combining-stats-component-with-pivots,Combining Stats Component With Pivots>>.+For more information and a detailed example, please see xref:faceting.adoc#combining-stats-component-with-pivots[Combining Stats Component With Pivots].diff --git a/solr/solr-ref-guide/src/stream-api.adoc b/solr/solr-ref-guide/modules/query-guide/pages/stream-api.adocsimilarity index 96%rename from solr/solr-ref-guide/src/stream-api.adocrename to solr/solr-ref-guide/modules/query-guide/pages/stream-api.adocindex 55cada03140..a8e4b8f17c3 100644--- a/solr/solr-ref-guide/src/stream-api.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/stream-api.adoc@@ -63,7 +63,7 @@ http://localhost:8983/solr/gettingstarted/stream?action=PLUGINS[[list]]== LIST: List Daemon processes-The <<stream-decorator-reference.adoc#daemon,daemon>> function allows you to wrap a streaming expression and run it at intervals to provide both continuous push and pull streaming.+The xref:stream-decorator-reference.adoc#daemon[`daemon`] function allows you to wrap a streaming expression and run it at intervals to provide both continuous push and pull streaming.This command lists out all the currently running daemon processes.`/stream?action=LIST`diff --git a/solr/solr-ref-guide/src/stream-decorator-reference.adoc b/solr/solr-ref-guide/modules/query-guide/pages/stream-decorator-reference.adocsimilarity index 97%rename from solr/solr-ref-guide/src/stream-decorator-reference.adocrename to solr/solr-ref-guide/modules/query-guide/pages/stream-decorator-reference.adocindex 0ec4f825ec9..7774a355bac 100644--- a/solr/solr-ref-guide/src/stream-decorator-reference.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/stream-decorator-reference.adoc@@ -388,8 +388,8 @@ As you can see in the examples above, the `cartesianProduct` function does suppo== classifyThe `classify` function classifies tuples using a logistic regression text classification model.-It was designed specifically to work with models trained using the <<stream-source-reference.adoc#train,train function>>.-The `classify` function uses the <<stream-source-reference.adoc#model,model function>> to retrieve a stored model and then scores a stream of tuples using the model.+It was designed specifically to work with models trained using the xref:stream-source-reference.adoc#train[`train` function].+The `classify` function uses the xref:stream-source-reference.adoc#model[`model` function] to retrieve a stored model and then scores a stream of tuples using the model.The tuples read by the classifier must contain a text field that can be used for classification.The classify function uses a Lucene analyzer to extract the features from the text so the model can be applied.By default the `classify` function looks for the analyzer using the name of text field in the tuple.@@ -528,7 +528,7 @@ daemon(id="uniqueId",The sample code above shows a `daemon` function wrapping an `update` function, which is wrapping a `topic` function.When this expression is sent to the `/stream` handler, the `/stream` hander sees the `daemon` function and keeps it in memory where it will run at intervals.In this particular example, the `daemon` function will run the `update` function every second.-The `update` function is wrapping a <<stream-source-reference.adoc#topic,`topic` function>>, which will stream tuples that match the `topic` function query in batches.+The `update` function is wrapping a xref:stream-source-reference.adoc#topic[`topic` function], which will stream tuples that match the `topic` function query in batches.Each subsequent call to the topic will return the next batch of tuples for the topic.The `update` function will send all the tuples matching the topic to another collection to be indexed.The `terminate` parameter tells the daemon to terminate when the `topic` function stops sending tuples.@@ -539,7 +539,7 @@ Custom push functions can be plugged in that push documents out of Solr and intoPush streaming can also be used for continuous background aggregation scenarios where aggregates are rolled up in the background at intervals and pushed to other Solr collections.Another use case is continuous background machine learning model optimization, where the optimized model is pushed to another Solr collection where it can be integrated into queries.-The `/stream` handler supports a small <<stream-api.adoc#plugins,set of commands>> for listing and controlling daemon functions:+The `/stream` handler supports a small xref:stream-api.adoc#plugins[set of commands] for listing and controlling daemon functions:[source,text]----@@ -630,9 +630,9 @@ daemonStream.close();== delete-The `delete` function wraps other functions and uses the `id` and `\_version_` values found to send the tuples to a SolrCloud collection as <<indexing-with-update-handlers.adoc#delete-operations,Delete By Id>> commands.+The `delete` function wraps other functions and uses the `id` and `\_version_` values found to send the tuples to a SolrCloud collection as xref:indexing-guide:indexing-with-update-handlers.adoc#delete-operations[Delete By Id] commands.-This is similar to the `<<#update,update()>>` function described below.+This is similar to the `<<update,update()>>` function described below.=== delete Parameters@@ -660,7 +660,7 @@ The example above consumes the tuples returned by the `search` function against[NOTE]====Unlike the `update()` function, `delete()` defaults to `pruneVersionField=false` -- preserving any `\_version_` values found in the inner stream when converting the tuples to "Delete By ID" requests.-This ensures that using this stream will not (by default) result in deleting any documents that were updated _after_ the `search(...)` was executed, but _before_ the `delete(...)` processed that tuple (leveraging <<partial-document-updates.adoc#optimistic-concurrency,Optimistic concurrency>> constraints).+This ensures that using this stream will not (by default) result in deleting any documents that were updated _after_ the `search(...)` was executed, but _before_ the `delete(...)` processed that tuple (leveraging xref:indexing-guide:partial-document-updates.adoc#optimistic-concurrency[optimistic concurrency] constraints).Users who wish to ignore concurrent updates and delete all matched documents should set `pruneVersionField=true` (or ensure that the inner stream tuples do not include any `\_version_` values).@@ -723,7 +723,7 @@ daemon(id="myDaemon",id="myTopic")))-----In the example above a <<daemon,daemon>> wraps an executor, which wraps a <<stream-source-reference.adoc#topic,topic>> that is returning tuples with expressions to execute.+In the example above a <<daemon,`daemon`>> wraps an executor, which wraps a xref:stream-source-reference.adoc#topic[`topic`] that is returning tuples with expressions to execute.When sent to the stream handler, the daemon will call the executor at intervals which will cause the executor to read from the topic and execute the expressions found in the `expr_s` field.The daemon will repeatedly call the executor until all the tuples that match the topic have been iterated, then it will terminate.This is the approach for executing batches of streaming expressions from a `topic` queue.@@ -1229,7 +1229,7 @@ The `priority` function is a simple priority scheduler for the <<executor>> funcThe `executor` function doesn't directly have a concept of task prioritization; instead it simply executes tasks in the order that they are read from its underlying stream.The `priority` function provides the ability to schedule a higher priority task ahead of lower priority tasks that were submitted earlier.-The `priority` function wraps two <<stream-source-reference.adoc#topic,topics>> that are both emitting tuples that contain streaming expressions to execute.+The `priority` function wraps two xref:stream-source-reference.adoc#topic[`topic` functions] that are both emitting tuples that contain streaming expressions to execute.The first topic is considered the higher priority task queue.Each time the `priority` function is called, it checks the higher priority task queue to see if there are any tasks to execute.@@ -1334,7 +1334,7 @@ This allows the rollup function to rollup the over the `a_s` field, one group at== scoreNodes-See section in <<graph-traversal.adoc#using-the-scorenodes-function-to-make-a-recommendation,graph traversal>>.+See section in xref:graph-traversal.adoc#using-the-scorenodes-function-to-make-a-recommendation[graph traversal].== select@@ -1483,4 +1483,4 @@ The `update` function wraps another functions and sends the tuples to a SolrClouThe example above sends the tuples returned by the `search` function to the `destinationCollection` to be indexed.Wrapping `search(...)` as showing in this example is the common case usage of this decorator: to read documents from a collection as tuples, process or modify them in some way, and then add them back to a new collection.-For this reason, `pruneVersionField=true` is the default behavior -- stripping any `\_version_` values found in the inner stream when converting the tuples to Solr documents to prevent any unexpected errors from <<partial-document-updates.adoc#optimistic-concurrency,Optimistic concurrency>> constraints.+For this reason, `pruneVersionField=true` is the default behavior -- stripping any `\_version_` values found in the inner stream when converting the tuples to Solr documents to prevent any unexpected errors from xref:indexing-guide:partial-document-updates.adoc#optimistic-concurrency[optimistic concurrency] constraints.diff --git a/solr/solr-ref-guide/src/stream-evaluator-reference.adoc b/solr/solr-ref-guide/modules/query-guide/pages/stream-evaluator-reference.adocsimilarity index 99%rename from solr/solr-ref-guide/src/stream-evaluator-reference.adocrename to solr/solr-ref-guide/modules/query-guide/pages/stream-evaluator-reference.adocindex 04877edc2e9..5e3accf0575 100644--- a/solr/solr-ref-guide/src/stream-evaluator-reference.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/stream-evaluator-reference.adoc@@ -101,7 +101,7 @@ add(fieldA,if(gt(fieldA,fieldB),fieldA,fieldB)) // if fieldA > fieldB then field== analyzeThe `analyze` function analyzes text using a Lucene/Solr analyzer and returns a list of tokens emitted by the analyzer.-The `analyze` function can be called on its own or within the `<<stream-decorator-reference.adoc#select,select>>` and `<<stream-decorator-reference.adoc#cartesianproduct,cartesianProduct>>` streaming expressions.+The `analyze` function can be called on its own or within the xref:stream-decorator-reference.adoc#select[`select`] and xref:stream-decorator-reference.adoc#cartesianproduct[`cartesianProduct`] streaming expressions.=== analyze Parametersdiff --git a/solr/solr-ref-guide/src/stream-screen.adoc b/solr/solr-ref-guide/modules/query-guide/pages/stream-screen.adocsimilarity index 81%rename from solr/solr-ref-guide/src/stream-screen.adocrename to solr/solr-ref-guide/modules/query-guide/pages/stream-screen.adocindex 04785106839..7fc2e48f51a 100644--- a/solr/solr-ref-guide/src/stream-screen.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/stream-screen.adoc@@ -16,8 +16,8 @@// specific language governing permissions and limitations// under the License.-The Stream screen allows you to enter a <<streaming-expressions.adoc#,streaming expression>> and see the results.-It is very similar to the <<query-screen.adoc#,Query Screen>>, except the input box is at the top and all options must be declared in the expression.+The Stream screen allows you to enter a xref:streaming-expressions.adoc[] and see the results.+It is very similar to the xref:query-screen.adoc[], except the input box is at the top and all options must be declared in the expression.The screen will insert everything up to the streaming expression itself, so you do not need to enter the full URI with the hostname, port, collection, etc.Simply input the expression after the `expr=` part, and the URL will be constructed dynamically as appropriate.@@ -28,4 +28,4 @@ Under this, the streamed results are shown.A URL to be able to view the output in a browser is also available..Stream Screen with query and results-image::images/stream-screen/StreamScreen.png[image,height=400]+image::stream-screen/StreamScreen.png[image,height=400]diff --git a/solr/solr-ref-guide/src/stream-source-reference.adoc b/solr/solr-ref-guide/modules/query-guide/pages/stream-source-reference.adocsimilarity index 98%rename from solr/solr-ref-guide/src/stream-source-reference.adocrename to solr/solr-ref-guide/modules/query-guide/pages/stream-source-reference.adocindex b1169ce58a2..60f421f380c 100644--- a/solr/solr-ref-guide/src/stream-source-reference.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/stream-source-reference.adoc@@ -27,7 +27,7 @@ By default, the `/select` handler is used.The `/select` handler can be used for simple rapid prototyping of expressions.For production, however, you will most likely want to use the `/export` handler which is designed to `sort` and `export` entire result sets.The `/export` handler is not used by default because it has stricter requirements then the `/select` handler so it's not as easy to get started working with.-To read more about the `/export` handler requirements review the section <<exporting-result-sets.adoc#,Exporting Result Sets>>.+To read more about the `/export` handler requirements review the section xref:exporting-result-sets.adoc[].=== search Parameters@@ -43,7 +43,7 @@ The default is `/select`.This parameter is only needed with the `/select` handler (which is the default) since the `/export` handler always returns all rows.* `partitionKeys`: Comma delimited list of keys to partition the search results by.To be used with the parallel function for parallelizing operations across worker nodes.-See the <<stream-decorator-reference.adoc#parallel,parallel>> function for details.+See the xref:stream-decorator-reference.adoc#parallel[parallel] function for details.=== search Syntax@@ -349,7 +349,7 @@ cat("authors.txt,fiction/scifi/", maxLines=500)== nodesThe `nodes` function provides breadth-first graph traversal.-For details, see the section <<graph-traversal.adoc#,Graph Traversal>>.+For details, see the section xref:graph-traversal.adoc[].== knnSearch@@ -386,7 +386,7 @@ knnSearch(collection1,The `model` function retrieves and caches logistic regression text classification models that are stored in a SolrCloud collection.The `model` function is designed to work with models that are created by the <<train,train function>>, but can also be used to retrieve text classification models trained outside of Solr, as long as they conform to the specified format.-After the model is retrieved it can be used by the <<stream-decorator-reference.adoc#classify,classify function>> to classify documents.+After the model is retrieved it can be used by the xref:stream-decorator-reference.adoc#classify[classify function] to classify documents.A single model tuple is fetched and returned based on the *id* parameter.The model is retrieved by matching the *id* parameter with a model name in the index.@@ -560,7 +560,7 @@ When used in parallel mode the partitionKeys parameter must be provided.* `zkHost`: Only needs to be defined if the collection being searched is found in a different zkHost than the local stream handler.* `partitionKeys`: Comma delimited list of keys to partition the search results by.To be used with the parallel function for parallelizing operations across worker nodes.-See the <<stream-decorator-reference.adoc#parallel,parallel>> function for details.+See the xref:stream-decorator-reference.adoc#parallel[parallel] function for details.=== shuffle Syntaxdiff --git a/solr/solr-ref-guide/src/streaming-expressions.adoc b/solr/solr-ref-guide/modules/query-guide/pages/streaming-expressions.adocsimilarity index 89%rename from solr/solr-ref-guide/src/streaming-expressions.adocrename to solr/solr-ref-guide/modules/query-guide/pages/streaming-expressions.adocindex 0d5dc494ff6..f61bca2477a 100644--- a/solr/solr-ref-guide/src/streaming-expressions.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/streaming-expressions.adoc@@ -43,7 +43,7 @@ Streaming expressions are comprised of streaming functions which work with a SolThey emit a stream of tuples (key/value Maps).Some of the provided streaming functions are designed to work with entire result sets rather than the top N results like normal search.-This is supported by the <<exporting-result-sets.adoc#,/export handler>>.+This is supported by the xref:exporting-result-sets.adoc[/export handler].Some streaming functions act as stream sources to originate the stream flow.Other streaming functions act as stream decorators to wrap other stream functions and perform operations on the stream of tuples.@@ -53,7 +53,7 @@ This can be particularly powerful for relational algebra functions.=== Streaming Requests and ResponsesSolr has a `/stream` request handler that takes streaming expression requests and returns the tuples as a JSON stream.-This request handler is implicitly defined, meaning there is nothing that has to be defined in `solrconfig.xml` - see <<implicit-requesthandlers.adoc#,Implicit Request Handlers>>.+This request handler is implicitly defined, meaning there is nothing that has to be defined in `solrconfig.xml` - see xref:configuration-guide:implicit-requesthandlers.adoc[].The `/stream` request handler takes one parameter, `expr`, which is used to specify the streaming expression.For example, this curl command encodes and POSTs a simple `search()` expression to the `/stream` handler:@@ -107,14 +107,14 @@ Timeouts for Streaming Expressions can be configured with the `socketTimeout` anStream sources originate streams.There are rich set of searching, sampling and aggregation stream sources to choose from.-A full reference to all available source expressions is available in <<stream-source-reference.adoc#,Stream Source Reference>>.+A full reference to all available source expressions is available in xref:stream-source-reference.adoc[].=== Stream DecoratorsStream decorators wrap stream sources and other stream decorators to transform a stream.-A full reference to all available decorator expressions is available in <<stream-decorator-reference.adoc#,Stream Decorator Reference>>.+A full reference to all available decorator expressions is available in xref:stream-decorator-reference.adoc[].=== Math Expressions@@ -129,17 +129,17 @@ The math expressions user guide is available in <<>>From a language standpoint math expressions are referred to as *stream evaluators*.-A full reference to all available evaluator expressions is available in <<stream-evaluator-reference.adoc#,Stream Evaluator Reference>>.+A full reference to all available evaluator expressions is available in xref:stream-evaluator-reference.adoc[].=== VisualizationVisualization of both streaming expressions and math expressions is done using Apache Zeppelin and the Zeppelin-Solr Interpreter.-Visualizing Streaming expressions and setting up of Apache Zeppelin is documented in <<math-start.adoc#zeppelin-solr-interpreter,Zeppelin-Solr Interpreter>>.+Visualizing Streaming expressions and setting up of Apache Zeppelin is documented in xref:math-start.adoc#zeppelin-solr-interpreter[Zeppelin-Solr Interpreter].-The <<math-expressions.adoc#,Math Expressions User Guide>> has in depth coverage of visualization techniques.+The xref:math-expressions.adoc[] has in depth coverage of visualization techniques.=== Stream Screen-* <<stream-screen.adoc#,Stream Screen>>: Submit streaming expressions and see results and parsing explanations.+* xref:stream-screen.adoc[]: Submit streaming expressions and see results and parsing explanations.diff --git a/solr/solr-ref-guide/src/suggester.adoc b/solr/solr-ref-guide/modules/query-guide/pages/suggester.adocsimilarity index 97%rename from solr/solr-ref-guide/src/suggester.adocrename to solr/solr-ref-guide/modules/query-guide/pages/suggester.adocindex e21888d39cc..3907ecfdabe 100644--- a/solr/solr-ref-guide/src/suggester.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/suggester.adoc@@ -20,7 +20,7 @@ The SuggestComponent in Solr provides users with automatic suggestions for queryYou can use this to implement a powerful auto-suggest feature in your search application.-Although it is possible to use the <<spell-checking.adoc#,Spell Checking>> functionality to power autosuggest behavior, Solr has a dedicated {solr-javadocs}/core/org/apache/solr/handler/component/SuggestComponent.html[SuggestComponent] designed for this functionality.+Although it is possible to use the xref:spell-checking.adoc[] functionality to power autosuggest behavior, Solr has a dedicated {solr-javadocs}/core/org/apache/solr/handler/component/SuggestComponent.html[SuggestComponent] designed for this functionality.This approach utilizes Lucene's Suggester implementation and supports all of the lookup implementations available in Lucene.@@ -31,7 +31,7 @@ The main features of this Suggester are:* Distributed supportThe `solrconfig.xml` found in Solr's "techproducts" example has a Suggester implementation configured already.-For more on search components, see the section <<requesthandlers-searchcomponents.adoc#,Request Handlers and Search Components>>.+For more on search components, see the section xref:configuration-guide:requesthandlers-searchcomponents.adoc[].The "techproducts" example `solrconfig.xml` has a `suggest` search component and a `/suggest` request handler already configured.You can use that as the basis for your configuration, or create it from scratch, as detailed below.@@ -130,7 +130,7 @@ A field from the index to use as the basis of suggestion terms.If `sourceLocation` is empty (meaning any dictionary implementation other than `FileDictionaryFactory`), then terms from this field in the index will be used.+To be used as the basis for a suggestion, the field must be stored.-You may want to <<copy-fields.adoc#,use copyField rules>> to create a special 'suggest' field comprised of terms from other fields in documents.+You may want to xref:indexing-guide:copy-fields.adoc[use copyField rules] to create a special 'suggest' field comprised of terms from other fields in documents.+You usually want a minimal amount of analysis on the field (no stemming, no synonyms, etc.), so an option is to create a field type in your schema that only uses basic tokenizers or filters.An example of such a field type is shown here:@@ -689,7 +689,7 @@ See the <<Example Usages>> section below for an example request and response.== Adding the Suggest Request HandlerAfter adding the search component, a request handler must be added to `solrconfig.xml`.-This request handler works the <<requesthandlers-searchcomponents.adoc#,same as any other request handler>>, and allows you to configure default parameters for serving suggestion requests.+This request handler works the xref:configuration-guide:requesthandlers-searchcomponents.adoc[same as any other request handler], and allows you to configure default parameters for serving suggestion requests.The request handler definition must incorporate the "suggest" search component defined previously.[source,xml]diff --git a/solr/solr-ref-guide/src/tagger-handler.adoc b/solr/solr-ref-guide/modules/query-guide/pages/tagger-handler.adocsimilarity index 98%rename from solr/solr-ref-guide/src/tagger-handler.adocrename to solr/solr-ref-guide/modules/query-guide/pages/tagger-handler.adocindex 4026b6898e6..41ecaf0aae5 100644--- a/solr/solr-ref-guide/src/tagger-handler.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/tagger-handler.adoc@@ -39,7 +39,7 @@ be supported; the maximum is mostly limited only by memory.To configure the tagger, your Solr schema needs 2 fields:-* A unique key field (see <<schema-elements.adoc#unique-key,Unique Key>> for how to define a unique key in your schema).+* A unique key field (see xref:indexing-guide:schema-elements.adoc#unique-key[Unique Key] for how to define a unique key in your schema).Recommended field settings: set `docValues=true`.* A tag field, which must be a `TextField`, with `ConcatenateGraphFilterFactory` at the end of the index chain (not the query chain):Set `preservePositionIncrements=false` on that filter.diff --git a/solr/solr-ref-guide/src/term-vector-component.adoc b/solr/solr-ref-guide/modules/query-guide/pages/term-vector-component.adocsimilarity index 98%rename from solr/solr-ref-guide/src/term-vector-component.adocrename to solr/solr-ref-guide/modules/query-guide/pages/term-vector-component.adocindex c2eb593b931..cd11b8617a0 100644--- a/solr/solr-ref-guide/src/term-vector-component.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/term-vector-component.adoc@@ -230,7 +230,7 @@ This can be computationally expensive.To see an example of TermVector component output, see the Wiki page: https://cwiki.apache.org/confluence/display/solr/TermVectorComponentExampleOptions-For schema requirements, see also the section <<field-properties-by-use-case.adoc#, Field Properties by Use Case>>.+For schema requirements, see also the section xref:indexing-guide:field-properties-by-use-case.adoc[].== SolrJ and the Term Vector Componentdiff --git a/solr/solr-ref-guide/src/term-vectors.adoc b/solr/solr-ref-guide/modules/query-guide/pages/term-vectors.adocsimilarity index 99%rename from solr/solr-ref-guide/src/term-vectors.adocrename to solr/solr-ref-guide/modules/query-guide/pages/term-vectors.adocindex 4a7c348556c..7ca5527fff0 100644--- a/solr/solr-ref-guide/src/term-vectors.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/term-vectors.adoc@@ -130,7 +130,7 @@ The `hashRollup` function then aggregates the bigrams and the `top` function emiThen Zeppelin-Solr is used to visualize the top 10 ten bigrams.-image::images/math-expressions/text-analytics.png[]+image::math-expressions/text-analytics.png[]Lucene/Solr analyzers can be configured in many different ways to support aggregations over NLP entities (people, places, companies, etc.) as well as tokens extracted with regular expressions or dictionaries.diff --git a/solr/solr-ref-guide/src/terms-component.adoc b/solr/solr-ref-guide/modules/query-guide/pages/terms-component.adocsimilarity index 96%rename from solr/solr-ref-guide/src/terms-component.adocrename to solr/solr-ref-guide/modules/query-guide/pages/terms-component.adocindex 897891c9114..f69cb0251cc 100644--- a/solr/solr-ref-guide/src/terms-component.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/terms-component.adoc@@ -25,7 +25,7 @@ The document frequencies returned are the number of documents that match the ter== Configuring the Terms Component-Terms Component is one of <<requesthandlers-searchcomponents.adoc#defining-search-components,the default search components>>+Terms Component is one of xref:configuration-guide:requesthandlers-searchcomponents.adoc#defining-search-components[the default search components]and does not need to be defined in `solrconfig.xml`.The definition is equivalent to:@@ -37,7 +37,7 @@ The definition is equivalent to:=== Using the Terms Component in a Request Handler-Solr comes with an <<implicit-requesthandlers.adoc#query-handlers,Implicit RequestHandler>> definition `/terms`, which enables (only) Terms component.+Solr comes with an xref:configuration-guide:implicit-requesthandlers.adoc#query-handlers[implicit request handler] definition `/terms`, which enables (only) Terms component.If you want to enable Terms component when using another Request Handler, `terms=true` parameter needs to be passed during the request or be set in the handler's defaults.@@ -425,7 +425,7 @@ Results (notice that the term counts are not affected by the query):== Using the Terms Component for an Auto-Suggest Feature-If the <<suggester.adoc#,Suggester>> doesn't suit your needs, you can use the Terms component in Solr to build a similar feature for your own search application.+If the xref:suggester.adoc[] doesn't suit your needs, you can use the Terms component in Solr to build a similar feature for your own search application.Simply submit a query specifying whatever characters the user has typed so far as a prefix.For example, if the user has typed "at", the search engine's interface would submit the following query:diff --git a/solr/solr-ref-guide/src/time-series.adoc b/solr/solr-ref-guide/modules/query-guide/pages/time-series.adocsimilarity index 94%rename from solr/solr-ref-guide/src/time-series.adocrename to solr/solr-ref-guide/modules/query-guide/pages/time-series.adocindex c24cb752809..bd5d0392952 100644--- a/solr/solr-ref-guide/src/time-series.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/time-series.adoc@@ -77,7 +77,7 @@ When this expression is sent to the `/stream` handler it responds with:Using Zeppelin-Solr this time series can be visualized using a line chart.-image::images/math-expressions/timeseries1.png[]+image::math-expressions/timeseries1.png[]== Vectorizing the Time Series@@ -88,7 +88,7 @@ The `col` function can be used to copy a column of data from a list of tuples inThe expression below demonstrates the vectorization of the `date_dt` and `avg(close_d)` fields.The `zplot` function is then used to plot the months on the x-axis and the average closing prices on the y-axis.-image::images/math-expressions/timeseries2.png[]+image::math-expressions/timeseries2.png[]== Smoothing@@ -114,7 +114,7 @@ The `zplot` function is then used to plot the months on the x-axis, and the averNotice that the `ltrim` function is used to trim the first 4 values from the x-axis and the average closing prices.This is done to line up the three arrays so they start from the 5th value.-image::images/math-expressions/movingavg.png[]+image::math-expressions/movingavg.png[]=== Exponential Moving Average@@ -124,7 +124,7 @@ This means that it is less of a lagging indicator than the simple moving averageBelow is an example that computes a moving average and exponential moving average and plots them along with the original y values.Notice how the exponential moving average is more sensitive to changes in the y values.-image::images/math-expressions/expmoving.png[]+image::math-expressions/expmoving.png[]=== Moving Median@@ -134,7 +134,7 @@ In many cases the moving median will be more *robust* to outliers than moving avBelow is an example computing the moving median:-image::images/math-expressions/movingMedian.png[]+image::math-expressions/movingMedian.png[]== Differencing@@ -152,24 +152,24 @@ The examples below uses the first difference to make two time series stationaryIn this example we'll be comparing the average monthly closing price for two stocks: Amazon and Google.The image below plots both time series before differencing is applied.-image::images/math-expressions/timecompare.png[]+image::math-expressions/timecompare.png[]In the next example the `diff` function is applied to both time series inside the `zplot` function.The `diff` can be applied inside the `zplot` function or like any other function inside of the `let` function.Notice that both time series now have the trend removed and the monthly movements of the stock price can be studied without being influenced by the trend.-image::images/math-expressions/diff1.png[]+image::math-expressions/diff1.png[]In the next example the `zoom` function of the time series visualization is used to zoom into a specific range of months.This allows for closer inspection of the data.With closer inspection of the data there appears to be some correlation between the monthly movements of the two stocks.-image::images/math-expressions/diffzoom.png[]+image::math-expressions/diffzoom.png[]In the final example the differenced time series are correlated with the `corr` function.-image::images/math-expressions/diffcorr.png[]+image::math-expressions/diffcorr.png[]=== Lagged Differences@@ -181,14 +181,14 @@ The simple example below demonstrates how lagged differencing works.Notice that the array in the example follows a simple repeated pattern.This type of pattern is often displayed with seasonality.-image::images/math-expressions/season.png[]+image::math-expressions/season.png[]In this example we remove this pattern using the `diff` function with a lag of 4.This will subtract the value lagging four indexes behind the current index.Notice that the result set size is the original array size minus the lag.This is because the `diff` function only returns results for values where the lag of 4 is possible to compute.-image::images/math-expressions/seasondiff.png[]+image::math-expressions/seasondiff.png[]== Anomaly Detection@@ -202,19 +202,19 @@ The daily stock data will provide a larger data set to study.In the example below the `search` expression is used to return the daily closing price for the ticker *AMZN* over a two year period.-image::images/math-expressions/anomaly.png[]+image::math-expressions/anomaly.png[]The next step is to apply the `movingMAD` function to the data to calculate the moving mean absolute deviation over a 10 day window.The example below shows the function being applied and visualized.-image::images/math-expressions/mad.png[]+image::math-expressions/mad.png[]Once the moving MAD has been calculated we can visualize the distribution of dispersion with the `empiricalDistribution` function.The example below plots the empirical distribution with 10 bins, creating a 10 bin histogram of the dispersion of the time series.This visualization shows that most of the mean absolute deviations fall between 0 and 9.2 with the mean of the final bin at 11.94.-image::images/math-expressions/maddist.png[]+image::math-expressions/maddist.png[]The final step is to detect outliers in the series using the `outliers` function.The `outliers` function uses a probability distribution to find outliers in a numeric vector.@@ -242,7 +242,7 @@ The final parameter is the original result set containing the `close_d` and `datThe output of the `outliers` function contains the results where an outlier was detected.In this case 5 results above the .99 probability threshold were detected.-image::images/math-expressions/outliers.png[]+image::math-expressions/outliers.png[]== Modeling@@ -264,7 +264,7 @@ The fitted model is then directly plotted with `zplot` along with the original `The visualization shows the smooth line fit through the average closing price data.-image::images/math-expressions/timemodel.png[]+image::math-expressions/timemodel.png[]== Forecasting@@ -283,4 +283,4 @@ The `predict` function uses the fitted model to predict values for the new x-axiThe `zplot` function is then used to plot the `x10` vector on the x-axis and the `y10` vector and extrapolated model on the y-axis.Notice that the `y10` vector drops to zero where the observed data ends, but the forecast continues along the fitted curve of the model.-image::images/math-expressions/forecast.png[]+image::math-expressions/forecast.png[]diff --git a/solr/solr-ref-guide/src/transform.adoc b/solr/solr-ref-guide/modules/query-guide/pages/transform.adocsimilarity index 90%rename from solr/solr-ref-guide/src/transform.adocrename to solr/solr-ref-guide/modules/query-guide/pages/transform.adocindex adc06109473..fa0dc933058 100644--- a/solr/solr-ref-guide/src/transform.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/transform.adoc@@ -32,11 +32,11 @@ Below is an example showing the `select` function wrapping a `search` function aThe `recNum` function is a math expression which simply returns the current record number of the tuple.The `select` expression can call any math expression to compute new values.-image::images/math-expressions/select1.png[]+image::math-expressions/select1.png[]Below is an example using the `div` function to compute a new field from two existing fields:-image::images/math-expressions/select-math.png[]+image::math-expressions/select-math.png[]== Filtering Tuples@@ -45,7 +45,7 @@ The `having` function can be used to filter tuples in the stream based on booleaIn the example below the `having` function is filtering the output of the `facet` function to only emit tuples that have `count(*)` greater than 20404.-image::images/math-expressions/having.png[]+image::math-expressions/having.png[]== Paging@@ -54,7 +54,7 @@ The *record number*, added with the `recNum` function, can be filtered on to supIn the example below the `and` function with nested `lt` and `gt` functions are used to select records within a specific record number range:-image::images/math-expressions/search-page.png[]+image::math-expressions/search-page.png[]== Handling Nulls@@ -67,18 +67,18 @@ The first is a boolean expression, in this case `isNull`.The `if` function returns the second parameter if the boolean function returns true, and the third parameter if it returns false.In this case `isNull` is always true because its checking for a field in the tuples that is not included in the result set.-image::images/math-expressions/select2.png[]+image::math-expressions/select2.png[]`notNull` and `isNull` can also be used with the `having` function to filter out tuples with null values.The example below emits all the documents because it is evaluating `isNull` for a field that is not in the result set, which always returns true.-image::images/math-expressions/having2.png[]+image::math-expressions/having2.png[]The example below emits zero documents because it is evaluating `notNull` fora field that is not in the result set, which always returns false.-image::images/math-expressions/having3.png[]+image::math-expressions/having3.png[]== Regex Matching and Filtering@@ -87,7 +87,7 @@ This allows for sophisticated regex matching over search results.The example below uses the `matches` function to return all records where the `complaint_type_s` field ends with *Commercial*.-image::images/math-expressions/search-matches.png[]+image::math-expressions/search-matches.png[]== Sorting@@ -95,7 +95,7 @@ The `sort` and `top` function can be used to resort a result set in memory.The `sort` function sorts and returns the entire result set based on the sort criteria.The `top` function can be used to return the top N values in a result set based on the sort criteria.-image::images/math-expressions/search-resort.png[]+image::math-expressions/search-resort.png[]== Rollups@@ -110,4 +110,4 @@ This requires enough memory to store all the distinct group by fields in memory,The example below shows a visualization of the top 5 complaint types from a random sample of the `nyc311` complaint database.The `top` function is used to select the top 5 complaint types based on the `count(*)` field output by the `hashRollup`.-image::images/math-expressions/hashRollup.png[]+image::math-expressions/hashRollup.png[]diff --git a/solr/solr-ref-guide/src/variables.adoc b/solr/solr-ref-guide/modules/query-guide/pages/variables.adocsimilarity index 98%rename from solr/solr-ref-guide/src/variables.adocrename to solr/solr-ref-guide/modules/query-guide/pages/variables.adocindex 548ed1f42e3..2df2df6acd4 100644--- a/solr/solr-ref-guide/src/variables.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/variables.adoc@@ -188,12 +188,12 @@ When this expression is sent to the `/stream` handler it responds with:Using this approach variables can by visualized using Zeppelin-Solr.In the example below the arrays are shown in table format.-image::images/math-expressions/variables.png[]+image::math-expressions/variables.png[]Once in table format we can plot the variables using one of the plotting or charting visualizations.The example below shows variables plotted on a line chart:-image::images/math-expressions/variables1.png[]+image::math-expressions/variables1.png[]== Caching Variablesdiff --git a/solr/solr-ref-guide/src/vector-math.adoc b/solr/solr-ref-guide/modules/query-guide/pages/vector-math.adocsimilarity index 98%rename from solr/solr-ref-guide/src/vector-math.adocrename to solr/solr-ref-guide/modules/query-guide/pages/vector-math.adocindex 504ec35fd50..18031168f86 100644--- a/solr/solr-ref-guide/src/vector-math.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/vector-math.adoc@@ -58,7 +58,7 @@ The `zplot` function can be used to visualize vectors using Zeppelin-Solr.Let's first see what happens when we visualize the array function as a table.-image::images/math-expressions/array.png[]+image::math-expressions/array.png[]It appears as one row with a comma-delimited list of values.You'll find that you can't visualize this output@@ -138,12 +138,12 @@ Now we have three tuples with `x` and `y` fields.Let's see how Zeppelin-Solr handles this output in table format:-image::images/math-expressions/xy.png[]+image::math-expressions/xy.png[]Now that we have `x` and `y` columns defined we can simply switch to one of the line chartsand plugin the fields to plot using the chart settings:-image::images/math-expressions/line1.png[]+image::math-expressions/line1.png[]Each chart has settings which can be explored by clicking on *settings*.@@ -151,7 +151,7 @@ You can switch between chart types for different types of visualizations.Below is an example ofa bar chart:-image::images/math-expressions/bar.png[]+image::math-expressions/bar.png[]== Array Operationsdiff --git a/solr/solr-ref-guide/src/visualization.adoc b/solr/solr-ref-guide/modules/query-guide/pages/visualization.adocsimilarity index 53%rename from solr/solr-ref-guide/src/visualization.adocrename to solr/solr-ref-guide/modules/query-guide/pages/visualization.adocindex 1cc02ea6539..8e6a2c746b8 100644--- a/solr/solr-ref-guide/src/visualization.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/visualization.adoc@@ -21,126 +21,126 @@=== Result Tables-image::images/math-expressions/search-sort.png[]+image::math-expressions/search-sort.png[]=== Random Sampling & Scatter Plots-image::images/math-expressions/bivariate.png[]+image::math-expressions/bivariate.png[]=== Correlation Matrices and Heat Maps-image::images/math-expressions/corrmatrix.png[]+image::math-expressions/corrmatrix.png[]=== Visualizing CSV Files-image::images/math-expressions/csv.png[]+image::math-expressions/csv.png[]=== Probability Distributions-image::images/math-expressions/dist.png[]+image::math-expressions/dist.png[]=== Histograms-image::images/math-expressions/cumProb.png[]+image::math-expressions/cumProb.png[]=== Frequency Tables-image::images/math-expressions/freqTable1.png[]+image::math-expressions/freqTable1.png[]=== Quantile Plots-image::images/math-expressions/quantiles.png[]+image::math-expressions/quantiles.png[]=== Time Series Aggregation-image::images/math-expressions/timeseries1.png[]+image::math-expressions/timeseries1.png[]=== Time Series With Moving Average-image::images/math-expressions/movingavg.png[]+image::math-expressions/movingavg.png[]=== Time Series Forecast-image::images/math-expressions/forecast.png[]+image::math-expressions/forecast.png[]=== Multiple Time Lines-image::images/math-expressions/timecompare.png[]+image::math-expressions/timecompare.png[]=== Linear Regression-image::images/math-expressions/linear.png[]+image::math-expressions/linear.png[]=== Knn Regression-image::images/math-expressions/knnRegress.png[]+image::math-expressions/knnRegress.png[]=== Multivariate, Non-linear Regression with Residual Plot-image::images/math-expressions/redwine1.png[]+image::math-expressions/redwine1.png[]=== Monte Carlo Simulations-image::images/math-expressions/randomwalk5.png[]+image::math-expressions/randomwalk5.png[]=== Random Walks-image::images/math-expressions/randomwalk6.png[]+image::math-expressions/randomwalk6.png[]=== Distance Matrices-image::images/math-expressions/distance.png[]+image::math-expressions/distance.png[]=== DBSCAN Clustering-image::images/math-expressions/dbscan1.png[]+image::math-expressions/dbscan1.png[]=== KMeans Clustering-image::images/math-expressions/2DCluster1.png[]+image::math-expressions/2DCluster1.png[]=== Mapping Cluster Centroids-image::images/math-expressions/centroidplot.png[]+image::math-expressions/centroidplot.png[]=== Convex Hulls-image::images/math-expressions/convex2.png[]+image::math-expressions/convex2.png[]=== Significant Terms-image::images/math-expressions/sterms.png[]+image::math-expressions/sterms.png[]=== Phrase Aggregation-image::images/math-expressions/text-analytics.png[]+image::math-expressions/text-analytics.png[]=== Curve Fitting-image::images/math-expressions/hfit.png[]+image::math-expressions/hfit.png[]=== Interpolation-image::images/math-expressions/interpolate1.png[]+image::math-expressions/interpolate1.png[]=== Derivatives-image::images/math-expressions/sined.png[]+image::math-expressions/sined.png[]=== Integrals-image::images/math-expressions/integral.png[]+image::math-expressions/integral.png[]=== Convolutional Smoothing-image::images/math-expressions/conv-smooth.png[]+image::math-expressions/conv-smooth.png[]=== Autocorrelation-image::images/math-expressions/noise-autocorrelation.png[]+image::math-expressions/noise-autocorrelation.png[]=== Fourier Transform-image::images/math-expressions/signal-fft.png[]+image::math-expressions/signal-fft.png[]diff --git a/solr/solr-ref-guide/modules/query-guide/querying-nav.adoc b/solr/solr-ref-guide/modules/query-guide/querying-nav.adocnew file mode 100644index 00000000000..d030d6503a4--- /dev/null+++ b/solr/solr-ref-guide/modules/query-guide/querying-nav.adoc@@ -0,0 +1,85 @@+.Query Guide++* xref:query-syntax-and-parsers.adoc[]+** xref:common-query-parameters.adoc[]+** xref:standard-query-parser.adoc[]+** xref:dismax-query-parser.adoc[]+** xref:edismax-query-parser.adoc[]+** xref:function-queries.adoc[]+** xref:local-params.adoc[]+** xref:json-request-api.adoc[]+*** xref:json-query-dsl.adoc[]+** xref:searching-nested-documents.adoc[]+** xref:block-join-query-parser.adoc[]+** xref:join-query-parser.adoc[]+** xref:spatial-search.adoc[]+** xref:dense-vector-search.adoc[]+** xref:other-parsers.adoc[]+** xref:sql-query.adoc[]+*** xref:jdbc-dbvisualizer.adoc[]+*** xref:jdbc-squirrel.adoc[]+*** xref:jdbc-zeppelin.adoc[]+*** xref:jdbc-python-jython.adoc[]+*** xref:jdbc-r.adoc[]+** xref:query-screen.adoc[]+** xref:sql-screen.adoc[]++* Enhancing Queries+** xref:spell-checking.adoc[]+** xref:suggester.adoc[]+** xref:morelikethis.adoc[]+** xref:query-re-ranking.adoc[]+** xref:learning-to-rank.adoc[]+** xref:tagger-handler.adoc[]+** xref:analytics.adoc[]+*** xref:analytics-expression-sources.adoc[]+*** xref:analytics-mapping-functions.adoc[]+*** xref:analytics-reduction-functions.adoc[]+** xref:terms-component.adoc[]+** xref:term-vector-component.adoc[]+** xref:stats-component.adoc[]++* Controlling Results+** xref:faceting.adoc[]+** xref:json-facet-api.adoc[]+*** xref:json-faceting-domain-changes.adoc[]+** xref:collapse-and-expand-results.adoc[]+** xref:result-grouping.adoc[]+** xref:result-clustering.adoc[]+** xref:highlighting.adoc[]+** xref:query-elevation-component.adoc[]+** xref:document-transformers.adoc[]+** xref:response-writers.adoc[]+** xref:exporting-result-sets.adoc[]+** xref:pagination-of-results.adoc[]++* xref:streaming-expressions.adoc[]+** xref:stream-source-reference.adoc[]+** xref:stream-decorator-reference.adoc[]+** xref:stream-evaluator-reference.adoc[]+** xref:math-expressions.adoc[]+*** xref:visualization.adoc[]+*** xref:math-start.adoc[]+*** xref:loading.adoc[]+*** xref:search-sample.adoc[]+*** xref:transform.adoc[]+*** xref:scalar-math.adoc[]+*** xref:vector-math.adoc[]+*** xref:variables.adoc[]+*** xref:matrix-math.adoc[]+*** xref:term-vectors.adoc[]+*** xref:probability-distributions.adoc[]+*** xref:statistics.adoc[]+*** xref:regression.adoc[]+*** xref:curve-fitting.adoc[]+*** xref:time-series.adoc[]+*** xref:numerical-analysis.adoc[]+*** xref:dsp.adoc[]+*** xref:simulations.adoc[]+*** xref:machine-learning.adoc[]+*** xref:graph.adoc[]+*** xref:computational-geometry.adoc[]+*** xref:logs.adoc[]+** xref:graph-traversal.adoc[]+** xref:stream-api.adoc[]+** xref:stream-screen.adoc[]diff --git a/solr/solr-ref-guide/src/major-changes-in-solr-6.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-6.adocsimilarity index 50%rename from solr/solr-ref-guide/src/major-changes-in-solr-6.adocrename to solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-6.adocindex 04fced28ac9..ace04dd3b05 100644--- a/solr/solr-ref-guide/src/major-changes-in-solr-6.adoc+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-6.adoc@@ -18,7 +18,8 @@There are some major changes in Solr 6 to consider before starting to migrate your configurations and indexes.-There are many hundreds of changes, so a thorough review of the <<solr-upgrade-notes.adoc#,Solr Upgrade Notes>> section as well as the {solr-javadocs}/changes//Changes.html[CHANGES.txt] file in your Solr instance will help you plan your migration to Solr 6. This section attempts to highlight some of the major changes you should be aware of.+There are many hundreds of changes, so a thorough review of the xref:solr-upgrade-notes.adoc[] section as well as the {solr-javadocs}/changes//Changes.html[CHANGES.txt] file in your Solr instance will help you plan your migration to Solr 6.+This section attempts to highlight some of the major changes you should be aware of.== Highlights of New Features in Solr 6@@ -27,7 +28,7 @@ Some of the major improvements in Solr 6 include:[[major-5-6-streaming]]=== Streaming Expressions-Introduced in Solr 5, <<streaming-expressions.adoc#,Streaming Expressions>> allow querying Solr and getting results as a stream of data, sorted and aggregated as requested.+Introduced in Solr 5, xref:query-guide:streaming-expressions.adoc[] allow querying Solr and getting results as a stream of data, sorted and aggregated as requested.Several new expression types have been added in Solr 6:@@ -40,7 +41,8 @@ Several new expression types have been added in Solr 6:[[major-5-6-parallel-sql]]=== SQL Query-Built on streaming expressions, new in Solr 6 is a <<sql-query.adoc#,SQL support>> to be able to send SQL queries to Solr. SQL statements are compiled to streaming expressions on the fly, providing the full range of aggregations available to streaming expression requests. A JDBC driver is included, which allows using SQL clients and database visualization tools to query your Solr index and import data to other systems.+Built on streaming expressions, new in Solr 6 is a xref:query-guide:sql-query.adoc[SQL support] to be able to send SQL queries to Solr. SQL statements are compiled to streaming expressions on the fly, providing the full range of aggregations available to streaming expression requests.+A JDBC driver is included, which allows using SQL clients and database visualization tools to query your Solr index and import data to other systems.=== Cross Data Center Replication@@ -49,42 +51,52 @@ Replication across data centers is now possible with Cross Data Center Replicati=== Graph QueryParser-A new <<other-parsers.adoc#graph-query-parser,`graph` query parser>> makes it possible to to graph traversal queries of Directed (Cyclic) Graphs modelled using Solr documents.+A new xref:query-guide:other-parsers.adoc#graph-query-parser[`graph` query parser] makes it possible to to graph traversal queries of Directed (Cyclic) Graphs modelled using Solr documents.[[major-5-6-docvalues]]=== DocValues-Most non-text field types in the Solr sample configsets now default to using <<docvalues.adoc#,DocValues>>.+Most non-text field types in the Solr sample configsets now default to using xref:indexing-guide:docvalues.adoc[].== Java 8 Required-The minimum supported version of Java for Solr 6 (and the <<solrj.adoc#,SolrJ client libraries>>) is now Java 8.+The minimum supported version of Java for Solr 6 (and the xref:deployment-guide:solrj.adoc[SolrJ client libraries]) is now Java 8.== Index Format Changes-Solr 6 has no support for reading Lucene/Solr 4.x and earlier indexes. Be sure to run the Lucene `IndexUpgrader` included with Solr 5.5 if you might still have old 4x formatted segments in your index. Alternatively: fully optimize your index with Solr 5.5 to make sure it consists only of one up-to-date index segment.+Solr 6 has no support for reading Lucene/Solr 4.x and earlier indexes.+Be sure to run the Lucene `IndexUpgrader` included with Solr 5.5 if you might still have old 4x formatted segments in your index.+Alternatively: fully optimize your index with Solr 5.5 to make sure it consists only of one up-to-date index segment.== Managed Schema is now the Default-Solr's default behavior when a `solrconfig.xml` does not explicitly define a `<schemaFactory/>` is now dependent on the `luceneMatchVersion` specified in that `solrconfig.xml`. When `luceneMatchVersion < 6.0`, `ClassicIndexSchemaFactory` will continue to be used for back compatibility, otherwise an instance of <<schema-factory.adoc#,`ManagedIndexSchemaFactory`>> will be used.+Solr's default behavior when a `solrconfig.xml` does not explicitly define a `<schemaFactory/>` is now dependent on the `luceneMatchVersion` specified in that `solrconfig.xml`.+When `luceneMatchVersion < 6.0`, `ClassicIndexSchemaFactory` will continue to be used for back compatibility, otherwise an instance of xref:configuration-guide:schema-factory.adoc[`ManagedIndexSchemaFactory`] will be used.The most notable impacts of this change are:* Existing `solrconfig.xml` files that are modified to use `luceneMatchVersion >= 6.0`, but do _not_ have an explicitly configured `ClassicIndexSchemaFactory`, will have their `schema.xml` file automatically upgraded to a `managed-schema` file.-* Schema modifications via the <<schema-api.adoc#,Schema API>> will now be enabled by default.+* Schema modifications via the xref:indexing-guide:schema-api.adoc[] will now be enabled by default.-Please review the <<schema-factory.adoc#,Schema Factory Definition in SolrConfig>> section for more details.+Please review the xref:configuration-guide:schema-factory.adoc[] section for more details.== Default Similarity Changes-Solr's default behavior when a Schema does not explicitly define a global <<schema-elements.adoc#similarity,`<similarity/>`>> is now dependent on the `luceneMatchVersion` specified in the `solrconfig.xml`. When `luceneMatchVersion < 6.0`, an instance of `ClassicSimilarityFactory` will be used, otherwise an instance of `SchemaSimilarityFactory` will be used. Most notably this change means that users can take advantage of per Field Type similarity declarations, without needing to also explicitly declare a global usage of `SchemaSimilarityFactory`.+Solr's default behavior when a Schema does not explicitly define a global xref:indexing-guide:schema-elements.adoc#similarity[`<similarity/>`] is now dependent on the `luceneMatchVersion` specified in the `solrconfig.xml`.+When `luceneMatchVersion < 6.0`, an instance of `ClassicSimilarityFactory` will be used, otherwise an instance of `SchemaSimilarityFactory` will be used.+Most notably this change means that users can take advantage of per Field Type similarity declarations, without needing to also explicitly declare a global usage of `SchemaSimilarityFactory`.-Regardless of whether it is explicitly declared, or used as an implicit global default, `SchemaSimilarityFactory` 's implicit behavior when a Field Types do not declare an explicit `<similarity />` has also been changed to depend on the `luceneMatchVersion`. When `luceneMatchVersion < 6.0`, an instance of `ClassicSimilarity` will be used, otherwise an instance of `BM25Similarity` will be used. A `defaultSimFromFieldType` init option may be specified on the `SchemaSimilarityFactory` declaration to change this behavior. Please review the `SchemaSimilarityFactory` javadocs for more details.+Regardless of whether it is explicitly declared, or used as an implicit global default, `SchemaSimilarityFactory` 's implicit behavior when a Field Types do not declare an explicit `<similarity />` has also been changed to depend on the `luceneMatchVersion`.+When `luceneMatchVersion < 6.0`, an instance of `ClassicSimilarity` will be used, otherwise an instance of `BM25Similarity` will be used.+A `defaultSimFromFieldType` init option may be specified on the `SchemaSimilarityFactory` declaration to change this behavior.+Please review the `SchemaSimilarityFactory` javadocs for more details.== Replica & Shard Delete Command Changes-DELETESHARD and DELETEREPLICA now default to deleting the instance directory, data directory, and index directory for any replica they delete. Please review the <<collections-api.adoc#,Collection API>> documentation for details on new request parameters to prevent this behavior if you wish to keep all data on disk when using these commands.+DELETESHARD and DELETEREPLICA now default to deleting the instance directory, data directory, and index directory for any replica they delete.+Please review the xref:configuration-guide:collections-api.adoc[] documentation for details on new request parameters to prevent this behavior if you wish to keep all data on disk when using these commands.== facet.date.* Parameters Removed-The `facet.date` parameter (and associated `facet.date.*` parameters) that were deprecated in Solr 3.x have been removed completely. If you have not yet switched to using the equivalent <<faceting.adoc#,`facet.range`>> functionality you must do so now before upgrading.+The `facet.date` parameter (and associated `facet.date.*` parameters) that were deprecated in Solr 3.x have been removed completely.+If you have not yet switched to using the equivalent xref:query-guide:faceting.adoc[`facet.range`] functionality you must do so now before upgrading.diff --git a/solr/solr-ref-guide/src/major-changes-in-solr-7.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-7.adocsimilarity index 56%rename from solr/solr-ref-guide/src/major-changes-in-solr-7.adocrename to solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-7.adocindex adc62f56b57..ca942e1e388 100644--- a/solr/solr-ref-guide/src/major-changes-in-solr-7.adoc+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-7.adoc@@ -19,28 +19,40 @@Solr 7 is a major new release of Solr which introduces new features and a number of other changes that may impact your existing installation.== Upgrade Planning-There are major changes in Solr 7 to consider before starting to migrate your configurations and indexes. This page is designed to highlight the biggest changes - new features you may want to be aware of, but also changes in default behavior and deprecated features that have been removed.+There are major changes in Solr 7 to consider before starting to migrate your configurations and indexes.+This page is designed to highlight the biggest changes - new features you may want to be aware of, but also changes in default behavior and deprecated features that have been removed.-There are many hundreds of changes in Solr 7, however, so a thorough review of the <<solr-upgrade-notes.adoc#,Solr Upgrade Notes>> as well as the {solr-javadocs}/changes//Changes.html[CHANGES.txt] file in your Solr instance will help you plan your migration to Solr 7. This section attempts to highlight some of the major changes you should be aware of.+There are many hundreds of changes in Solr 7, however, so a thorough review of the xref:solr-upgrade-notes.adoc[] as well as the {solr-javadocs}/changes//Changes.html[CHANGES.txt] file in your Solr instance will help you plan your migration to Solr 7.+This section attempts to highlight some of the major changes you should be aware of.-You should also consider all changes that have been made to Solr in any version you have not upgraded to already. For example, if you are currently using Solr 6.2, you should review changes made in all subsequent 6.x releases in addition to changes for 7.0.+You should also consider all changes that have been made to Solr in any version you have not upgraded to already.+For example, if you are currently using Solr 6.2, you should review changes made in all subsequent 6.x releases in addition to changes for 7.0.-<<reindexing.adoc#upgrades,Reindexing>> your data is considered the best practice and you should try to do so if possible. However, if reindexing is not feasible, keep in mind you can only upgrade one major version at a time. Thus, Solr 6.x indexes will be compatible with Solr 7 but Solr 5.x indexes will not be.+xref:indexing-guide:reindexing.adoc#upgrades[Reindexing] your data is considered the best practice and you should try to do so if possible.+However, if reindexing is not feasible, keep in mind you can only upgrade one major version at a time.+Thus, Solr 6.x indexes will be compatible with Solr 7 but Solr 5.x indexes will not be.-If you do not reindex now, keep in mind that you will need to either reindex your data or upgrade your indexes before you will be able to move to Solr 8 when it is released in the future. See the section <<indexupgrader-tool.adoc#,IndexUpgrader Tool>> for more details on how to upgrade your indexes.+If you do not reindex now, keep in mind that you will need to either reindex your data or upgrade your indexes before you will be able to move to Solr 8 when it is released in the future.+See the section xref:deployment-guide:indexupgrader-tool.adoc[] for more details on how to upgrade your indexes.-See also the section <<upgrading-a-solr-cluster.adoc#,Upgrading a Solr Cluster>> for details on how to upgrade a SolrCloud cluster.+See also the section xref:deployment-guide:upgrading-a-solr-cluster.adoc[] for details on how to upgrade a SolrCloud cluster.== New Features & Enhancements=== Replication Modes-Until Solr 7, the SolrCloud model for replicas has been to allow any replica to become a leader when a leader is lost. This is highly effective for most users, providing reliable failover in case of issues in the cluster. However, it comes at a cost in large clusters because all replicas must be in sync at all times.+Until Solr 7, the SolrCloud model for replicas has been to allow any replica to become a leader when a leader is lost.+This is highly effective for most users, providing reliable failover in case of issues in the cluster.+However, it comes at a cost in large clusters because all replicas must be in sync at all times.-To provide additional flexibility, two new types of replicas have been added, named TLOG & PULL. These new types provide options to have replicas which only sync with the leader by copying index segments from the leader. The TLOG type has an additional benefit of maintaining a transaction log (the "tlog" of its name), which would allow it to recover and become a leader if necessary; the PULL type does not maintain a transaction log, so cannot become a leader.+To provide additional flexibility, two new types of replicas have been added, named TLOG & PULL.+These new types provide options to have replicas which only sync with the leader by copying index segments from the leader.+The TLOG type has an additional benefit of maintaining a transaction log (the "tlog" of its name), which would allow it to recover and become a leader if necessary; the PULL type does not maintain a transaction log, so cannot become a leader.-As part of this change, the traditional type of replica is now named NRT. If you do not explicitly define a number of TLOG or PULL replicas, Solr defaults to creating NRT replicas. If this model is working for you, you will not have to change anything.+As part of this change, the traditional type of replica is now named NRT.+If you do not explicitly define a number of TLOG or PULL replicas, Solr defaults to creating NRT replicas.+If this model is working for you, you will not have to change anything.-See the section <<solrcloud-shards-indexing.adoc#types-of-replicas,Types of Replicas>> for more details on the new replica modes, and how define the replica type in your cluster.+See the section xref:deployment-guide:solrcloud-shards-indexing.adoc#types-of-replicas[Types of Replicas] for more details on the new replica modes, and how define the replica type in your cluster.=== AutoscalingSolr autoscaling is a new suite of features in Solr to make managing a SolrCloud cluster easier and more automated.@@ -49,23 +61,25 @@ At its core, Solr autoscaling provides users with a rule syntax to define prefer=== Other Features & Enhancements-* The <<analytics.adoc#,Analytics Component>> has been refactored.+* The xref:query-guide:analytics.adoc[] has been refactored.* There were several other new features released in earlier 6.x releases, which you may have missed:-** <<learning-to-rank.adoc#,Learning to Rank>>-** <<highlighting.adoc#unified-highlighter,Unified Highlighter>>-** <<metrics-reporting.adoc#,Metrics API>>. See also information about related deprecations in the section <<JMX Support and MBeans>> below.-** <<other-parsers.adoc#payload-query-parsers,Payload queries>>-** <<stream-evaluator-reference.adoc#,Streaming Evaluators>>-** <<v2-api.adoc#,/v2 API>>-** <<graph-traversal.adoc#,Graph streaming expressions>>+** xref:query-guide:learning-to-rank.adoc[]+** xref:query-guide:highlighting.adoc#unified-highlighter[Unified Highlighter]+** xref:deployment-guide:metrics-reporting.adoc[Metrics API].+See also information about related deprecations in the section <<JMX Support and MBeans>> below.+** xref:query-guide:other-parsers.adoc#payload-query-parsers[Payload queries]+** xref:query-guide:stream-evaluator-reference.adoc[Streaming Evaluators]+** xref:configuration-guide:v2-api.adoc[v2 API]+** xref:query-guide:graph-traversal.adoc[Graph streaming expressions]== Configuration and Default Changes=== New Default ConfigsetSeveral changes have been made to configsets that ship with Solr; not only their content but how Solr behaves in regard to them:-* The `data_driven_configset` and `basic_configset` have been removed, and replaced by the `_default` configset. The `sample_techproducts_configset` also remains, and is designed for use with the example documents shipped with Solr in the `example/exampledocs` directory.+* The `data_driven_configset` and `basic_configset` have been removed, and replaced by the `_default` configset.+The `sample_techproducts_configset` also remains, and is designed for use with the example documents shipped with Solr in the `example/exampledocs` directory.* When creating a new collection, if you do not specify a configset, the `_default` will be used.** If you use SolrCloud, the `_default` configset will be automatically uploaded to ZooKeeper.** If you run a user-managed cluster or a single-node installation, the instanceDir will be created automatically, using the `_default` configset as its basis.@@ -74,14 +88,20 @@ Several changes have been made to configsets that ship with Solr; not only theirTo improve the functionality of Schemaless Mode, Solr now behaves differently when it detects that data in an incoming field should have a text-based field type.-* Incoming fields will be indexed as `text_general` by default (you can change this). The name of the field will be the same as the field name defined in the document.-* A copy field rule will be inserted into your schema to copy the new `text_general` field to a new field with the name `<name>_str`. This field's type will be a `strings` field (to allow for multiple values). The first 256 characters of the text field will be inserted to the new `strings` field.+* Incoming fields will be indexed as `text_general` by default (you can change this).+The name of the field will be the same as the field name defined in the document.+* A copy field rule will be inserted into your schema to copy the new `text_general` field to a new field with the name `<name>_str`.+This field's type will be a `strings` field (to allow for multiple values).+The first 256 characters of the text field will be inserted to the new `strings` field.-This behavior can be customized if you wish to remove the copy field rule, or to change the number of characters inserted to the string field, or the field type used. See the section <<schemaless-mode.adoc#,Schemaless Mode>> for details.+This behavior can be customized if you wish to remove the copy field rule, or to change the number of characters inserted to the string field, or the field type used.+See the section xref:indexing-guide:schemaless-mode.adoc[] for details.-TIP: Because copy field rules can slow indexing and increase index size, it's recommended you only use copy fields when you need to. If you do not need to sort or facet on a field, you should remove the automatically-generated copy field rule.+TIP: Because copy field rules can slow indexing and increase index size, it's recommended you only use copy fields when you need to.+If you do not need to sort or facet on a field, you should remove the automatically-generated copy field rule.-Automatic field creation can be disabled with the `update.autoCreateFields` property. To do this, you can use the Config API with a command such as:+Automatic field creation can be disabled with the `update.autoCreateFields` property.+To do this, you can use the Config API with a command such as:[.dynamic-tabs]--@@ -105,28 +125,40 @@ curl http://host:8983/api/collections/mycollection/config -d '{"set-user-propert--=== Changes to Default Behaviors-* JSON is now the default response format. If you rely on XML responses, you must now define `wt=xml` in your request. In addition, line indentation is enabled by default (`indent=on`).-* The `sow` parameter (short for "Split on Whitespace") now defaults to `false`, which allows support for multi-word synonyms out of the box. This parameter is used with the eDisMax and standard/"lucene" query parsers. If this parameter is not explicitly specified as `true`, query text will not be split on whitespace before analysis.-* The `legacyCloud` parameter now defaults to `false`. If an entry for a replica does not exist in `state.json`, that replica will not get registered.+* JSON is now the default response format.+If you rely on XML responses, you must now define `wt=xml` in your request.+In addition, line indentation is enabled by default (`indent=on`).+* The `sow` parameter (short for "Split on Whitespace") now defaults to `false`, which allows support for multi-word synonyms out of the box.+This parameter is used with the eDisMax and standard/"lucene" query parsers.+If this parameter is not explicitly specified as `true`, query text will not be split on whitespace before analysis.+* The `legacyCloud` parameter now defaults to `false`.+If an entry for a replica does not exist in `state.json`, that replica will not get registered.+-This may affect users who bring up replicas and they are automatically registered as a part of a shard. It is possible to fall back to the old behavior by setting the property `legacyCloud=true`, in the cluster properties using the following command:+This may affect users who bring up replicas and they are automatically registered as a part of a shard.+It is possible to fall back to the old behavior by setting the property `legacyCloud=true`, in the cluster properties using the following command:+`./server/scripts/cloud-scripts/zkcli.sh -zkhost 127.0.0.1:2181 -cmd clusterprop -name legacyCloud -val true`-* The eDisMax query parser parameter `lowercaseOperators` now defaults to `false` if the `luceneMatchVersion` in `solrconfig.xml` is 7.0.0 or above. Behavior for `luceneMatchVersion` lower than 7.0.0 is unchanged (so, `true`). This means that clients must sent boolean operators (such as AND, OR and NOT) in upper case in order to be recognized, or you must explicitly set this parameter to `true`.-* The `handleSelect` parameter in `solrconfig.xml` now defaults to `false` if the `luceneMatchVersion` is 7.0.0 or above. This causes Solr to ignore the `qt` parameter if it is present in a request. If you have request handlers without a leading '/', you can set `handleSelect="true"` or consider migrating your configuration.+* The eDisMax query parser parameter `lowercaseOperators` now defaults to `false` if the `luceneMatchVersion` in `solrconfig.xml` is 7.0.0 or above.+Behavior for `luceneMatchVersion` lower than 7.0.0 is unchanged (so, `true`).+This means that clients must sent boolean operators (such as AND, OR and NOT) in upper case in order to be recognized, or you must explicitly set this parameter to `true`.+* The `handleSelect` parameter in `solrconfig.xml` now defaults to `false` if the `luceneMatchVersion` is 7.0.0 or above.+This causes Solr to ignore the `qt` parameter if it is present in a request.+If you have request handlers without a leading '/', you can set `handleSelect="true"` or consider migrating your configuration.+The `qt` parameter is still used as a SolrJ special parameter that specifies the request handler (tail URL path) to use.-* The `lucenePlusSort` query parser (aka the "Old Lucene Query Parser") has been deprecated and is no longer implicitly defined. If you wish to continue using this parser until Solr 8 (when it will be removed), you must register it in your `solrconfig.xml`, as in: `<queryParser name="lucenePlusSort" class="solr.OldLuceneQParserPlugin"/>`.+* The `lucenePlusSort` query parser (aka the "Old Lucene Query Parser") has been deprecated and is no longer implicitly defined.+If you wish to continue using this parser until Solr 8 (when it will be removed), you must register it in your `solrconfig.xml`, as in: `<queryParser name="lucenePlusSort" class="solr.OldLuceneQParserPlugin"/>`.* The name of `TemplateUpdateRequestProcessorFactory` is changed to `template` from `Template` and the name of `AtomicUpdateProcessorFactory` is changed to `atomic` from `Atomic`** Also, `TemplateUpdateRequestProcessorFactory` now uses `{}` instead of `${}` for `template`.-== Deprecations and Removed Features=== Point Fields Are Default Numeric Types-Solr has implemented \*PointField types across the board, to replace Trie* based numeric fields. All Trie* fields are now considered deprecated, and will be removed in Solr 8.+Solr has implemented \*PointField types across the board, to replace Trie* based numeric fields.+All Trie* fields are now considered deprecated, and will be removed in Solr 8.-If you are using Trie* fields in your schema, you should consider moving to PointFields as soon as feasible. Changing to the new PointField types will require you to reindex your data.+If you are using Trie* fields in your schema, you should consider moving to PointFields as soon as feasible.+Changing to the new PointField types will require you to reindex your data.=== Spatial Fields@@ -143,50 +175,70 @@ Choose one of these field types instead:* `SpatialRecursivePrefixTreeField`* `RptWithGeometrySpatialField`-See the section <<spatial-search.adoc#,Spatial Search>> for more information.+See the section xref:query-guide:spatial-search.adoc[] for more information.=== JMX Support and MBeans* The `<jmx>` element in `solrconfig.xml` has been removed in favor of `<metrics><reporter>` elements defined in `solr.xml`.+-Limited back-compatibility is offered by automatically adding a default instance of `SolrJmxReporter` if it's missing AND when a local MBean server is found. A local MBean server can be activated either via `ENABLE_REMOTE_JMX_OPTS` in `solr.in.sh` or via system properties, e.g., `-Dcom.sun.management.jmxremote`. This default instance exports all Solr metrics from all registries as hierarchical MBeans.+Limited back-compatibility is offered by automatically adding a default instance of `SolrJmxReporter` if it's missing AND when a local MBean server is found.+A local MBean server can be activated either via `ENABLE_REMOTE_JMX_OPTS` in `solr.in.sh` or via system properties, e.g., `-Dcom.sun.management.jmxremote`.+This default instance exports all Solr metrics from all registries as hierarchical MBeans.+-This behavior can be also disabled by specifying a `SolrJmxReporter` configuration with a boolean init argument `enabled` set to `false`. For a more fine-grained control users should explicitly specify at least one `SolrJmxReporter` configuration.+This behavior can be also disabled by specifying a `SolrJmxReporter` configuration with a boolean init argument `enabled` set to `false`.+For a more fine-grained control users should explicitly specify at least one `SolrJmxReporter` configuration.+-See also the section <<metrics-reporting.adoc#the-metrics-reporters-element,The <metrics><reporters> Element>>, which describes how to set up Metrics Reporters in `solr.xml`. Note that back-compatibility support may be removed in Solr 8.+See also the section xref:deployment-guide:metrics-reporting.adoc#the-metrics-reporters-element[The <metrics><reporters> Element], which describes how to set up Metrics Reporters in `solr.xml`.+Note that back-compatibility support may be removed in Solr 8.-* MBean names and attributes now follow the hierarchical names used in metrics. This is reflected also in `/admin/mbeans` and `/admin/plugins` output, and can be observed in the UI Plugins tab, because now all these APIs get their data from the metrics API. The old (mostly flat) JMX view has been removed.+* MBean names and attributes now follow the hierarchical names used in metrics. This is reflected also in `/admin/mbeans` and `/admin/plugins` output, and can be observed in the UI Plugins tab, because now all these APIs get their data from the metrics API.+The old (mostly flat) JMX view has been removed.=== SolrJThe following changes were made in SolrJ.* `HttpClientInterceptorPlugin` is now `HttpClientBuilderPlugin` and must work with a `SolrHttpClientBuilder` rather than an `HttpClientConfigurer`.-* `HttpClientUtil` now allows configuring `HttpClient` instances via `SolrHttpClientBuilder` rather than an `HttpClientConfigurer`. Use of env variable `SOLR_AUTHENTICATION_CLIENT_CONFIGURER` no longer works, please use `SOLR_AUTHENTICATION_CLIENT_BUILDER`-* `SolrClient` implementations now use their own internal configuration for socket timeouts, connect timeouts, and allowing redirects rather than what is set as the default when building the `HttpClient` instance. Use the appropriate setters on the `SolrClient` instance.+* `HttpClientUtil` now allows configuring `HttpClient` instances via `SolrHttpClientBuilder` rather than an `HttpClientConfigurer`.+Use of env variable `SOLR_AUTHENTICATION_CLIENT_CONFIGURER` no longer works, please use `SOLR_AUTHENTICATION_CLIENT_BUILDER`+* `SolrClient` implementations now use their own internal configuration for socket timeouts, connect timeouts, and allowing redirects rather than what is set as the default when building the `HttpClient` instance.+Use the appropriate setters on the `SolrClient` instance.* `HttpSolrClient#setAllowCompression` has been removed and compression must be enabled as a constructor parameter.-* `HttpSolrClient#setDefaultMaxConnectionsPerHost` and `HttpSolrClient#setMaxTotalConnections` have been removed. These now default very high and can only be changed via parameter when creating an HttpClient instance.+* `HttpSolrClient#setDefaultMaxConnectionsPerHost` and `HttpSolrClient#setMaxTotalConnections` have been removed.+These now default very high and can only be changed via parameter when creating an HttpClient instance.=== Other Deprecations and Removals-* The `defaultOperator` parameter in the schema is no longer supported. Use the `q.op` parameter instead. This option had been deprecated for several releases. See the section <<standard-query-parser.adoc#standard-query-parser-parameters,Standard Query Parser Parameters>> for more information.-* The `defaultSearchField` parameter in the schema is no longer supported. Use the `df` parameter instead. This option had been deprecated for several releases. See the section <<standard-query-parser.adoc#standard-query-parser-parameters,Standard Query Parser Parameters>> for more information.-* The `mergePolicy`, `mergeFactor` and `maxMergeDocs` parameters have been removed and are no longer supported. You should define a `mergePolicyFactory` instead. See the section <<index-segments-merging.adoc#mergepolicyfactory,the mergePolicyFactory>> for more information.-* The PostingsSolrHighlighter has been deprecated. It's recommended that you move to using the UnifiedHighlighter instead. See the section <<highlighting.adoc#unified-highlighter,Unified Highlighter>> for more information about this highlighter.-* Index-time boosts have been removed from Lucene, and are no longer available from Solr. If any boosts are provided, they will be ignored by the indexing chain. As a replacement, index-time scoring factors should be indexed in a separate field and combined with the query score using a function query. See the section <<function-queries.adoc#,Function Queries>> for more information.-* The `StandardRequestHandler` is deprecated. Use `SearchHandler` instead.-* To improve parameter consistency in the Collections API, the parameter names `fromNode` for the MOVEREPLICA command and `source`, `target` for the REPLACENODE command have been deprecated and replaced with `sourceNode` and `targetNode` instead. The old names will continue to work for back-compatibility but they will be removed in Solr 8.+* The `defaultOperator` parameter in the schema is no longer supported. Use the `q.op` parameter instead. This option had been deprecated for several releases. See the section xref:query-guide:standard-query-parser.adoc#standard-query-parser-parameters[Standard Query Parser Parameters] for more information.+* The `defaultSearchField` parameter in the schema is no longer supported.+Use the `df` parameter instead. This option had been deprecated for several releases.+See the section xref:query-guide:standard-query-parser.adoc#standard-query-parser-parameters[Standard Query Parser Parameters] for more information.+* The `mergePolicy`, `mergeFactor` and `maxMergeDocs` parameters have been removed and are no longer supported.+You should define a `mergePolicyFactory` instead. See the section xref:configuration-guide:index-segments-merging.adoc#mergepolicyfactory[mergePolicyFactory] for more information.+* The PostingsSolrHighlighter has been deprecated. It's recommended that you move to using the UnifiedHighlighter instead.+See the section xref:query-guide:highlighting.adoc#unified-highlighter[Unified Highlighter] for more information about this highlighter.+* Index-time boosts have been removed from Lucene, and are no longer available from Solr.+If any boosts are provided, they will be ignored by the indexing chain.+As a replacement, index-time scoring factors should be indexed in a separate field and combined with the query score using a function query.+See the section xref:query-guide:function-queries.adoc[] for more information.+* The `StandardRequestHandler` is deprecated.+Use `SearchHandler` instead.+* To improve parameter consistency in the Collections API, the parameter names `fromNode` for the MOVEREPLICA command and `source`, `target` for the REPLACENODE command have been deprecated and replaced with `sourceNode` and `targetNode` instead.+The old names will continue to work for back-compatibility but they will be removed in Solr 8.* The unused `valType` option has been removed from ExternalFileField, if you have this in your schema you can safely remove it.== Major Changes in Earlier 6.x Versions-The following summary of changes in earlier 6.x releases highlights significant changes released between Solr 6.0 and 6.6 that were listed in earlier versions of this Guide. Mentions of deprecations are likely superseded by removal in Solr 7, as noted in the above sections.+The following summary of changes in earlier 6.x releases highlights significant changes released between Solr 6.0 and 6.6 that were listed in earlier versions of this Guide.+Mentions of deprecations are likely superseded by removal in Solr 7, as noted in the above sections.Note again that this is not a complete list of all changes that may impact your installation, so a thorough review of CHANGES.txt is highly recommended if upgrading from any version earlier than 6.6.* The Solr modules `map-reduce`, `morphlines-core` and `morphlines-cell` have been removed.* JSON Facet API now uses hyper-log-log for numBuckets cardinality calculation and calculates cardinality before filtering buckets by any `mincount` greater than 1.* If you use historical dates, specifically on or before the year 1582, you should reindex for better date handling.-* If you use the JSON Facet API (json.facet) with `method=stream`, you must now set `sort='index asc'` to get the streaming behavior; otherwise it won't stream. Reminder: `method` is a hint that doesn't change defaults of other parameters.+* If you use the JSON Facet API (json.facet) with `method=stream`, you must now set `sort='index asc'` to get the streaming behavior; otherwise it won't stream.+Reminder: `method` is a hint that doesn't change defaults of other parameters.* If you use the JSON Facet API (json.facet) to facet on a numeric field and if you use `mincount=0` or if you set the prefix, you will now get an error as these options are incompatible with numeric faceting.* Solr's logging verbosity at the INFO level has been greatly reduced, and you may need to update the log configs to use the DEBUG level to see all the logging messages you used to see at INFO level before.-* We are no longer backing up `solr.log` and `solr_gc.log` files in date-stamped copies forever. If you relied on the `solr_log_<date>` or `solr_gc_log_<date>` being in the logs folder that will no longer be the case. See the section <<configuring-logging.adoc#,Configuring Logging>> for details on how log rotation works as of Solr 6.3.+* We are no longer backing up `solr.log` and `solr_gc.log` files in date-stamped copies forever. If you relied on the `solr_log_<date>` or `solr_gc_log_<date>` being in the logs folder that will no longer be the case.+See the section xref:deployment-guide:configuring-logging.adoc[] for details on how log rotation works as of Solr 6.3.* The create/deleteCollection methods on `MiniSolrCloudCluster` have been deprecated. Clients should instead use the `CollectionAdminRequest` API. In addition, `MiniSolrCloudCluster#uploadConfigDir(File, String)` has been deprecated in favour of `#uploadConfigSet(Path, String)`.* The `bin/solr.in.sh` (`bin/solr.in.cmd` on Windows) is now completely commented by default. Previously, this wasn't so, which had the effect of masking existing environment variables.* The `\_version_` field is no longer indexed and is now defined with `indexed=false` by default, because the field has DocValues enabled.@@ -196,7 +248,7 @@ Note again that this is not a complete list of all changes that may impact your** The metrics "75thPctlRequestTime", "95thPctlRequestTime", "99thPctlRequestTime" and "999thPctlRequestTime" in Overseer Status API have been renamed to "75thPcRequestTime", "95thPcRequestTime" and so on for consistency with stats output in other parts of Solr.** The metrics "avgRequestsPerMinute", "5minRateRequestsPerMinute" and "15minRateRequestsPerMinute" have been replaced by corresponding per-second rates viz. "avgRequestsPerSecond", "5minRateRequestsPerSecond" and "15minRateRequestsPerSecond" for consistency with stats output in other parts of Solr.* A new highlighter named UnifiedHighlighter has been added. You are encouraged to try out the UnifiedHighlighter by setting `hl.method=unified` and report feedback. It's more efficient/faster than the other highlighters, especially compared to the original Highlighter. See `HighlightParams.java` for a listing of highlight parameters annotated with which highlighters use them. `hl.useFastVectorHighlighter` is now considered deprecated in lieu of `hl.method=fastVector`.-* The <<caches-warming.adoc#,`maxWarmingSearchers` parameter>> now defaults to 1, and more importantly commits will now block if this limit is exceeded instead of throwing an exception (a good thing). Consequently there is no longer a risk in overlapping commits. Nonetheless users should continue to avoid excessive committing. Users are advised to remove any pre-existing `maxWarmingSearchers` entries from their `solrconfig.xml` files.-* The <<other-parsers.adoc#complex-phrase-query-parser,Complex Phrase query parser>> now supports leading wildcards. Beware of its possible heaviness, users are encouraged to use ReversedWildcardFilter in index time analysis.+* The xref:configuration-guide:caches-warming.adoc[`maxWarmingSearchers` parameter] now defaults to 1, and more importantly commits will now block if this limit is exceeded instead of throwing an exception (a good thing). Consequently there is no longer a risk in overlapping commits. Nonetheless users should continue to avoid excessive committing. Users are advised to remove any pre-existing `maxWarmingSearchers` entries from their `solrconfig.xml` files.+* The xref:query-guide:other-parsers.adoc#complex-phrase-query-parser[Complex Phrase query parser] now supports leading wildcards. Beware of its possible heaviness, users are encouraged to use ReversedWildcardFilter in index time analysis.* The JMX metric "avgTimePerRequest" (and the corresponding metric in the metrics API for each handler) used to be a simple non-decaying average based on total cumulative time and the number of requests. The Codahale Metrics implementation applies exponential decay to this value, which heavily biases the average towards the last 5 minutes.-* Parallel SQL now uses Apache Calcite as its SQL framework. As part of this change the default aggregation mode has been changed to `facet` rather than `map_reduce`. There have also been changes to the SQL aggregate response and some SQL syntax changes. Consult the <<sql-query.adoc#,SQL Query>> documentation for full details.+* Parallel SQL now uses Apache Calcite as its SQL framework. As part of this change the default aggregation mode has been changed to `facet` rather than `map_reduce`. There have also been changes to the SQL aggregate response and some SQL syntax changes. Consult the xref:query-guide:sql-query.adoc[] documentation for full details.diff --git a/solr/solr-ref-guide/src/major-changes-in-solr-8.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-8.adocsimilarity index 81%rename from solr/solr-ref-guide/src/major-changes-in-solr-8.adocrename to solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-8.adocindex 16df48a35df..88c0a2dbac8 100644--- a/solr/solr-ref-guide/src/major-changes-in-solr-8.adoc+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-8.adoc@@ -52,7 +52,7 @@ When using this parameter internal requests are sent by using HTTP/1.1../bin/solr start -c -Dsolr.http1=true -z localhost:2481/solr -s /path/to/solr/home----+-Note the above command *must* be customized for your environment. The section <<solr-control-script-reference.adoc#,Solr Control Script Reference>> has all the possible options. If you are running Solr as a service, you may prefer to review the section <<upgrading-a-solr-cluster.adoc#,Upgrading a Solr Cluster>>.+Note the above command *must* be customized for your environment. The section xref:deployment-guide:solr-control-script-reference.adoc[] has all the possible options. If you are running Solr as a service, you may prefer to review the section xref:deployment-guide:upgrading-a-solr-cluster.adoc[].. When all nodes have been upgraded to 8.0, restart each one without the `-Dsolr.http1` parameter.@@ -60,7 +60,7 @@ Note the above command *must* be customized for your environment. The section <<It is always strongly recommended that you fully reindex your documents after a major version upgrade.-Solr has a new section of the Reference Guide, <<reindexing.adoc#,Reindexing>> which covers several strategies for how to reindex.+Solr has a new section of the Reference Guide, xref:indexing-guide:reindexing.adoc[] which covers several strategies for how to reindex.[#new-features-8]== New Features & Enhancements@@ -135,8 +135,8 @@ then you must do so with a delete-by-query technique.* Solr has a new field in the `\_default` configset, called `_nest_path_`. This field stores the path of the documentin the hierarchy for non-root documents.-See the sections <<indexing-nested-documents.adoc#,Indexing Nested Documents>> and-<<searching-nested-documents.adoc#,Searching Nested Documents>> for more information+See the sections xref:indexing-guide:indexing-nested-documents.adoc[] and+xref:query-guide:searching-nested-documents.adoc[] for more informationand configuration details.[#config-changes-8]@@ -153,15 +153,15 @@ The following changes impact how fields behave.Note that if you have not specified any similarityFactory in the schema, or use the default`SchemaSimilarityFactory`, then `LegacyBM25Similarity` is automatically selected when the value for `luceneMatchVersion` is lower than `8.0.0`.+-See also the section <<schema-elements.adoc#similarity,Similarity>> for more information.+See also the section xref:indexing-guide:schema-elements.adoc#similarity[Similarity] for more information.*Memory Codecs Removed** Memory codecs have been removed from Lucene (`MemoryPostings`, `MemoryDocValues`) and are no longer available in Solr.If you used `postingsFormat="Memory"` or `docValuesFormat="Memory"` on any field or field type configuration then either remove that setting to use the default or experiment with one of the other options.+-For more information on defining a codec, see the section <<codec-factory.adoc#,Codec Factory>>;-for more information on field properties, see the section <<field-type-definitions-and-properties.adoc#, Field Type Definitions and Properties>>.+For more information on defining a codec, see the section xref:configuration-guide:codec-factory.adoc[];+for more information on field properties, see the section xref:indexing-guide:field-type-definitions-and-properties.adoc[].*LowerCaseTokenizer*@@ -177,7 +177,7 @@ The following changes impact how documents are indexed.*Index-time Boosts*-* Index-time boosts were removed from <<major-changes-in-solr-7.adoc#other-deprecations-and-removals,Lucene in version 7.0>>, and in Solr 7.x the syntax was still allowed (although it logged a warning in the logs). The syntax was similar to:+* Index-time boosts were removed from xref:major-changes-in-solr-7.adoc#other-deprecations-and-removals[Lucene in version 7.0], and in Solr 7.x the syntax was still allowed (although it logged a warning in the logs). The syntax was similar to:+[source,json]----@@ -192,13 +192,13 @@ This syntax has been removed entirely and if sent to Solr it will now produce anThe pattern language is very similar but not the same.Typically, simply update the pattern by changing an uppercase 'Z' to lowercase 'z' and that's it.+-For the current recommended set of patterns in schemaless mode, see the section <<schemaless-mode.adoc#,Schemaless Mode>>, or simply examine the `_default` configset (found in `server/solr/configsets`).+For the current recommended set of patterns in schemaless mode, see the section xref:indexing-guide:schemaless-mode.adoc[], or simply examine the `_default` configset (found in `server/solr/configsets`).+Also note that the default set of date patterns (formats) have expanded from previous releases to subsume those patterns previously handled by the "extraction" module (Solr Cell / Tika).*Solr Cell*-* The extraction module (<<indexing-with-tika.adoc#,Solr Cell>>) no longer does any date parsing, and thus no longer supports the `date.formats` parameter. To ensure date strings are properly parsed, use the `ParseDateFieldUpdateProcessorFactory` in your update chain. This update request processor is found by default with the "parse-date" update processor when running Solr in "<<schemaless-mode.adoc#set-the-default-updaterequestprocessorchain,schemaless mode>>".+* The extraction module xref:indexing-guide:indexing-with-tika.adoc[Solr Cell]) no longer does any date parsing, and thus no longer supports the `date.formats` parameter. To ensure date strings are properly parsed, use the `ParseDateFieldUpdateProcessorFactory` in your update chain. This update request processor is found by default with the "parse-date" update processor when running Solr in xref:indexing-guide:schemaless-mode.adoc#set-the-default-updaterequestprocessorchain[schemaless mode]".*Langid Module*@@ -210,7 +210,7 @@ The following changes impact query behavior.*Highlighting*-* The Unified Highlighter parameter `hl.weightMatches` now defaults to `true`. See the section <<highlighting.adoc#,Highlighting>> for more information about Highlighter parameters.+* The Unified Highlighter parameter `hl.weightMatches` now defaults to `true`. See the section xref:query-guide:highlighting.adoc[] for more information about Highlighter parameters.*eDisMax Query Parser*@@ -218,7 +218,7 @@ The following changes impact query behavior.*Function Query Parser*-* The <<other-parsers.adoc#function-query-parser,Function Query Parser>> now returns scores that are equal to zero (0) when a negative value is produced. This change is due to the fact that Lucene now requires scores to be positive.+* The xref:query-guide:other-parsers.adoc#function-query-parser[Function Query Parser] now returns scores that are equal to zero (0) when a negative value is produced. This change is due to the fact that Lucene now requires scores to be positive.=== Authentication & Security Changes in 8.0@@ -277,8 +277,8 @@ When upgrading to Solr 7.7.x, users should be aware of the following major chang*Admin UI** The Admin UI now presents a login screen for any users with authentication enabled on their cluster.-Clusters with <<basic-authentication-plugin.adoc#,Basic Authentication>> will prompt users to enter a username and password.-On clusters configured to use <<kerberos-authentication-plugin.adoc#,Kerberos Authentication>>, authentication is handled transparently by the browser as before, but if authentication fails, users will be directed to configure their browser to provide an appropriate Kerberos ticket.+Clusters with xref:deployment-guide:basic-authentication-plugin.adoc[Basic Authentication] will prompt users to enter a username and password.+On clusters configured to use xref:deployment-guide:kerberos-authentication-plugin.adoc[Kerberos Authentication], authentication is handled transparently by the browser as before, but if authentication fails, users will be directed to configure their browser to provide an appropriate Kerberos ticket.+The login screen's purpose is cosmetic only - Admin UI-triggered Solr requests were subject to authentication prior to 7.7 and still are today. The login screen changes only the user experience of providing this authentication.@@ -291,7 +291,7 @@ In SolrCloud mode this allow-list is automatically configured to contain all livIn a user-managed cluster or a single-node installation the allow-list is empty by default.Upgrading users who use the `shards` parameter in these installations can set this value by setting the `shardsWhitelist` property in any `shardHandler` configurations in their `solrconfig.xml` file.+-For more information, see the <<solrcloud-distributed-requests.adoc#configuring-the-shardhandlerfactory,Distributed Request>> documentation.+For more information, see the xref:deployment-guide:solrcloud-distributed-requests.adoc#configuring-the-shardhandlerfactory[Distributed Request] documentation.=== Solr 7.6@@ -301,7 +301,7 @@ When upgrading to Solr 7.6, users should be aware of the following major changes*Collections*-* The JSON parameter to set cluster-wide default cluster properties with the <<cluster-node-management.adoc#clusterprop,CLUSTERPROP>> command has changed.+* The JSON parameter to set cluster-wide default cluster properties with the xref:deployment-guide:cluster-node-management.adoc#clusterprop[CLUSTERPROP] command has changed.+The old syntax nested the defaults into a property named `clusterDefaults`. The new syntax uses only `defaults`. The command to use is still `set-obj-property`.+@@ -348,7 +348,7 @@ While most users are still encouraged to use the `NRTCachingDirectoryFactory`, w+For more information about the new directory factory, see the Jira issue https://issues.apache.org/jira/browse/LUCENE-8438[LUCENE-8438].+-For more information about the directory factory configuration in Solr, see the section <<index-location-format.adoc#,DataDir and DirectoryFactory in SolrConfig>>.+For more information about the directory factory configuration in Solr, see the section xref:configuration-guide:index-location-format.adoc[].=== Solr 7.5@@ -358,12 +358,12 @@ When upgrading to Solr 7.5, users should be aware of the following major changes*Schema Changes*-* Since Solr 7.0, Solr's schema field-guessing has created `_str` fields for all `_txt` fields, and returned those by default with queries. As of 7.5, `_str` fields will no longer be returned by default. They will still be available and can be requested with the `fl` parameter on queries. See also the section on <<schemaless-mode.adoc#enable-field-class-guessing,field guessing>> for more information about how schema field guessing works.+* Since Solr 7.0, Solr's schema field-guessing has created `_str` fields for all `_txt` fields, and returned those by default with queries. As of 7.5, `_str` fields will no longer be returned by default. They will still be available and can be requested with the `fl` parameter on queries. See also the section on xref:indexing-guide:schemaless-mode.adoc#enable-field-class-guessing[field guessing] for more information about how schema field guessing works.* The Standard Filter, which has been non-operational since at least Solr v4, has been removed.*Index Merge Policy*-* When using the <<index-segments-merging.adoc#mergepolicyfactory,`TieredMergePolicy`>>, the default merge policy for Solr, `optimize` and `expungeDeletes` now respect the `maxMergedSegmentMB` configuration parameter, which defaults to `5000` (5GB).+* When using the xref:configuration-guide:index-segments-merging.adoc#mergepolicyfactory[`TieredMergePolicy`], the default merge policy for Solr, `optimize` and `expungeDeletes` now respect the `maxMergedSegmentMB` configuration parameter, which defaults to `5000` (5GB).+If it is absolutely necessary to control the number of segments present after optimize, specify `maxSegments` as a positive integer. Setting `maxSegments` higher than `1` are honored on a "best effort" basis.+@@ -377,8 +377,7 @@ The `TieredMergePolicy` will also reclaim resources from segments that exceed `m* Solr's logging configuration file is now located in `server/resources/log4j2.xml` by default.-* A bug for Windows users has been corrected. When using Solr's examples (`bin/solr start -e`) log files will now be put in the correct location (`example/` instead of `server`). See also <<installing-solr.adoc#solr-examples,Solr Examples>> and <<solr-control-script-reference.adoc#,Solr Control Script Reference>> for more information.-+* A bug for Windows users has been corrected. When using Solr's examples (`bin/solr start -e`) log files will now be put in the correct location (`example/` instead of `server`). See also xref:deployment-guide:installing-solr.adoc#solr-examples[Solr Examples] and xref:deployment-guide:solr-control-script-reference.adoc[] for more information.=== Solr 7.4@@ -388,13 +387,13 @@ When upgrading to Solr 7.4, users should be aware of the following major changes*Logging*-* Solr now uses Log4j v2.11. The Log4j configuration is now in `log4j2.xml` rather than `log4j.properties` files. This is a server side change only and clients using SolrJ won't need any changes. Clients can still use any logging implementation which is compatible with SLF4J. We now let Log4j handle rotation of Solr logs at startup, and `bin/solr` start scripts will no longer attempt this nor move existing console or garbage collection logs into `logs/archived` either. See <<configuring-logging.adoc#,Configuring Logging>> for more details about Solr logging.+* Solr now uses Log4j v2.11. The Log4j configuration is now in `log4j2.xml` rather than `log4j.properties` files. This is a server side change only and clients using SolrJ won't need any changes. Clients can still use any logging implementation which is compatible with SLF4J. We now let Log4j handle rotation of Solr logs at startup, and `bin/solr` start scripts will no longer attempt this nor move existing console or garbage collection logs into `logs/archived` either. See xref:deployment-guide:configuring-logging.adoc[] for more details about Solr logging.* Configuring `slowQueryThresholdMillis` now logs slow requests to a separate file named `solr_slow_requests.log`. Previously they would get logged in the `solr.log` file.*User-Managed Clusters*-* In the <<user-managed-index-replication.adoc#,leader-follower model>> of scaling Solr, a follower no longer commits an empty index when a completely new index is detected on leader during replication. To return to the previous behavior pass `false` to `skipCommitOnLeaderVersionZero` in the follower section of replication handler configuration, or pass it to the `fetchindex` command.+* In the xref:deployment-guide:user-managed-index-replication.adoc[leader-follower model] of scaling Solr, a follower no longer commits an empty index when a completely new index is detected on leader during replication. To return to the previous behavior pass `false` to `skipCommitOnLeaderVersionZero` in the follower section of replication handler configuration, or pass it to the `fetchindex` command.If you are upgrading from a version earlier than Solr 7.3, please see previous version notes below.@@ -410,7 +409,7 @@ When upgrading to Solr 7.3, users should be aware of the following major changes*Learning to Rank*-* The `rq` parameter used with Learning to Rank `rerank` query parsing no longer considers the `defType` parameter. See <<learning-to-rank.adoc#running-a-rerank-query,Running a Rerank Query>> for more information about this parameter.+* The `rq` parameter used with Learning to Rank `rerank` query parsing no longer considers the `defType` parameter. See xref:query-guide:learning-to-rank.adoc#running-a-rerank-query[Running a Rerank Query] for more information about this parameter.*Autoscaling & AutoAddReplicas*@@ -422,7 +421,7 @@ When upgrading to Solr 7.3, users should be aware of the following major changes*Logging*-* The default Solr log file size and number of backups have been raised to 32MB and 10 respectively. See the section <<configuring-logging.adoc#,Configuring Logging>> for more information about how to configure logging.+* The default Solr log file size and number of backups have been raised to 32MB and 10 respectively. See the section xref:deployment-guide:configuring-logging.adoc[] for more information about how to configure logging.*SolrCloud*@@ -430,11 +429,11 @@ When upgrading to Solr 7.3, users should be aware of the following major changes+This means to upgrade to Solr 8 in the future, you will need to be on Solr 7.3 or higher.-* Replicas which are not up-to-date are no longer allowed to become leader. Use the <<shard-management.adoc#forceleader,FORCELEADER command>> of the Collections API to allow these replicas become leader.+* Replicas which are not up-to-date are no longer allowed to become leader. Use the xref:deployment-guide:shard-management.adoc#forceleader[FORCELEADER command] of the Collections API to allow these replicas become leader.*Spatial*-* If you are using the spatial JTS library with Solr, you must upgrade to 1.15.0. This new version of JTS is now dual-licensed to include a BSD style license. See the section on <<spatial-search.adoc#,Spatial Search>> for more information.+* If you are using the spatial JTS library with Solr, you must upgrade to 1.15.0. This new version of JTS is now dual-licensed to include a BSD style license. See the section on xref:query-guide:spatial-search.adoc[] for more information.*Highlighting*@@ -450,7 +449,7 @@ When upgrading to Solr 7.2, users should be aware of the following major changes*Local Params*-* Starting a query string with <<local-params.adoc#,local params>> `{!myparser ...}` is used to switch from one query parser to another, and is intended for use by Solr system developers, not end users doing searches. To reduce negative side-effects of unintended hack-ability, Solr now limits the cases when local params will be parsed to only contexts in which the default parser is "<<standard-query-parser.adoc#,lucene>>" or "<<other-parsers.adoc#function-query-parser,func>>".+* Starting a query string with xref:query-guide:local-params.adoc[] `{!myparser ...}` is used to switch from one query parser to another, and is intended for use by Solr system developers, not end users doing searches. To reduce negative side-effects of unintended hack-ability, Solr now limits the cases when local params will be parsed to only contexts in which the default parser is xref:query-guide:standard-query-parser.adoc[`lucene`] or xref:query-guide:other-parsers.adoc#function-query-parser[`func`].+So, if `defType=edismax` then `q={!myparser ...}` won't work. In that example, put the desired query parser into the `defType` parameter.+@@ -480,7 +479,7 @@ When upgrading to Solr 7.1, users should be aware of the following major changes+Existing users of this feature should not have to change anything. However, they should note these changes:-** Behavior: Changing the `autoAddReplicas` property from disabled (`false`) to enabled (`true`) using <<collection-management.adoc#modifycollection,MODIFYCOLLECTION API>> no longer replaces down replicas for the collection immediately. Instead, replicas are only added if a node containing them went down while `autoAddReplicas` was enabled. The parameters `autoReplicaFailoverBadNodeExpiration` and `autoReplicaFailoverWorkLoopDelay` are no longer used.+** Behavior: Changing the `autoAddReplicas` property from disabled (`false`) to enabled (`true`) using xref:deployment-guide:collection-management.adoc#modifycollection[MODIFYCOLLECTION API] no longer replaces down replicas for the collection immediately. Instead, replicas are only added if a node containing them went down while `autoAddReplicas` was enabled. The parameters `autoReplicaFailoverBadNodeExpiration` and `autoReplicaFailoverWorkLoopDelay` are no longer used.** Deprecations: Enabling/disabling autoAddReplicas cluster-wide with the API will be deprecated; use suspend/resume trigger APIs with `name=".auto_add_replicas"` instead.*Metrics Reporters*@@ -507,4 +506,4 @@ See the section in Metrics Reporting: Shard and Cluster Reporters for more infor* In the XML query parser (`defType=xmlparser` or `{!xmlparser ... }`) the resolving of external entities is now disallowed by default.-If you are upgrading from a version earlier than Solr 7.0, please see <<major-changes-in-solr-7.adoc#,Major Changes in Solr 7>> before starting your upgrade.+If you are upgrading from a version earlier than Solr 7.0, please see xref:major-changes-in-solr-7.adoc[] before starting your upgrade.diff --git a/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adocsimilarity index 95%rename from solr/solr-ref-guide/src/major-changes-in-solr-9.adocrename to solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adocindex fbc5f8e9c23..182159799a2 100644--- a/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc@@ -44,7 +44,7 @@ Also removes support for cluster property `legacyCloud` (as if always false now)Otherwise, SolrJ will not be able to connect to the cluster once it has upgraded to Solr 9.Once you have upgraded all Solr clusters that the client is connecting to, you can upgrade the SolrJ client to 9.x.-* If you're using Solr in standalone mode with the <<query-elevation-component.adoc#,Query Elevation Component>> with it's elevation file in the data directory, you'll have to move it to the <<config-sets.adoc#,Configset>> instead.+* If you're using Solr in standalone mode with the xref:query-guide:query-elevation-component.adoc[] with it's elevation file in the data directory, you'll have to move it to the xref:configuration-guide:config-sets.adoc[Configset] instead.The only reason QEC supported the data directory was to support loading its changes on a commit instead of a more expensive core reload.That feature now works from the configset dir too.SolrCloud doesn't support that but may sometime.@@ -69,7 +69,7 @@ The `dist/` directory in the Solr binary release has been removed as of Solr 9.0* The Solr module jars can be found in `modules/<module-name>/lib`, packaged individually for each module.* The `solrj-deps` (SolrJ Dependencies) are no longer separated out from the other Server jars.Please refer to the SolrJ Maven artifact to see the exact dependencies you need to include from `server/solr-webapp/webapp/WEB-INF/lib/` and `server/lib/ext/` if you are loading in SolrJ manually.-If you plan on using SolrJ as a JDBC driver, please refer to the <<sql-query.adoc#generic-clients,JDBC documentation>>.+If you plan on using SolrJ as a JDBC driver, please refer to the xref:query-guide:sql-query.adoc#generic-clients[JDBC documentation]== Solr 9.0 Raw Notes@@ -108,7 +108,7 @@ The `response` field is now a map, containing information about the backup (`staThis is only applicable for users returning information in JSON format, which is the default behavior.* SOLR-14660: HDFS storage support has been moved to a module. Existing Solr configurations do not need any HDFS-related-changes, however the module needs to be installed - see <<solr-on-hdfs.adoc#,Running Solr on HDFS>>.+changes, however the module needs to be installed - see the section xref:deployment-guide:solr-on-hdfs.adoc[].* SOLR-15097: JWTAuthPlugin has been moved to a module. Users need to add the module to classpath. The plugin has alsochanged package name to `org.apache.solr.security.jwt`, but can still be loaded as shortform `class="solr.JWTAuthPlugin"`.@@ -174,14 +174,14 @@ values serialized in this way will need to be updated accordingly.=== solr.xml maxBooleanClauses now enforced recursively-Lucene 9.0 has additional safety checks over previous versions that impact how the `solr.xml` global `<<configuring-solr-xml#global-maxbooleanclauses,maxBooleanClauses>>` option is enforced.+Lucene 9.0 has additional safety checks over previous versions that impact how the `solr.xml` global xref:configuration-guide:configuring-solr-xml#global-maxbooleanclauses[`maxBooleanClauses`] option is enforced.In previous versions of Solr, this option was a hard limit on the number of clauses in any `BooleanQuery` object - but it was only enforced for the _direct_ clauses.Starting with Solr 9, this global limit is now also enforced against the total number of clauses in a _nested_ query structure.Users who upgrade from prior versions of Solr may find that some requests involving complex internal query structures (Example: long query strings using `edismax` with many `qf` and `pf` fields that include query time synonym expansion) which worked in the past now hit this limit and fail.-User's in this situation are advised to consider the complexity f their queries/configuration, and increase the value of `<<configuring-solr-xml#global-maxbooleanclauses,maxBooleanClauses>>` if warranted.+User's in this situation are advised to consider the complexity f their queries/configuration, and increase the value of xref:configuration-guide:configuring-solr-xml#global-maxbooleanclauses[`maxBooleanClauses`] if warranted.=== Log4J configuration & Solr MDC values@@ -220,7 +220,7 @@ What percentage of them get reported to a tracing server is up to you.This change is backward incompatible.If you need the pre-9.0 default behavior, you need to explicitly set `blockUnknown:false` in `security.json`.-* The allow-list defining allowed URLs for the `shards` parameter is not in the `shardHandler` configuration anymore. It is defined by the `allowUrls` top-level property of the `solr.xml` file. For more information, see <<configuring-solr-xml.adoc#allow-urls, Format of solr.allowUrls>> documentation.+* The allow-list defining allowed URLs for the `shards` parameter is not in the `shardHandler` configuration anymore. It is defined by the `allowUrls` top-level property of the `solr.xml` file. For more information, see xref:configuration-guide:configuring-solr-xml.adoc#allow-urls[Format of solr.allowUrls] documentation.* SOLR-13985: Solr's Jetty now binds to localhost network interface by default for better out of the box security.Administrators that need Solr exposed more broadly can change the SOLR_JETTY_HOST property in their Solr include (solr.in.sh/solr.in.cmd) file.@@ -239,7 +239,7 @@ Use of these modules remains the same, except for the changes listed below.* SOLR-15916: `dist/` is no longer provided in the binary release.All module jars are now provided under `modules/<name>/lib`, including the module jar and all dependency jars.Please update your `<lib>` entries in your `solrconfig.xml` to use this new location.-More information can be found in the <<libs.adoc#lib-directives-in-solrconfig,Libs documentation>>.+More information can be found in the xref:configuration-guide:libs.adoc#lib-directives-in-solrconfig[Libs documentation].* SOLR-14067: `StatelessScriptUpdateProcessorFactory` moved to `modules/scripting` package instead of shipping as part of Solr, due to security concerns.Renamed to ScriptUpdateProcessorFactory for simpler name.diff --git a/solr/solr-ref-guide/src/solr-upgrade-notes.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/solr-upgrade-notes.adocsimilarity index 85%rename from solr/solr-ref-guide/src/solr-upgrade-notes.adocrename to solr/solr-ref-guide/modules/upgrade-notes/pages/solr-upgrade-notes.adocindex 2843ba7a4e8..ac9c8bcd4ff 100644--- a/solr/solr-ref-guide/src/solr-upgrade-notes.adoc+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/solr-upgrade-notes.adoc@@ -33,7 +33,7 @@ file found in your Solr package.That file includes all the changes and updatesthat may effect your existing implementation.-Detailed steps for upgrading a Solr cluster are in the section <<upgrading-a-solr-cluster.adoc#,Upgrading a Solr Cluster>>.+Detailed steps for upgrading a Solr cluster are in the section xref:deployment-guide:upgrading-a-solr-cluster.adoc[].== Upgrading to 9.x Releases (NOT RELEASED)@@ -60,21 +60,22 @@ The `MultiAuthRuleBasedAuthorizationPlugin` is used when the `MultiAuthPlugin` iFor information on configuring these plugins, see the following sections:-* <<basic-authentication-plugin.adoc#combining-basic-authentication-with-other-schemes,Combining Basic Authentication with Other Schemes>>-* <<rule-based-authorization-plugin.adoc#multiple-authorization-plugins,Multiple Authorization Plugins>>+* xref:deployment-guide:basic-authentication-plugin.adoc#combining-basic-authentication-with-other-schemes[Combining Basic Authentication with Other Schemes]+* xref:deployment-guide:rule-based-authorization-plugin.adoc#multiple-authorization-plugins[Multiple Authorization Plugins]*ZooKeeper chroot*It's now possible to create the ZooKeeper chroot at startup if it does not already exist.-See the section <<zookeeper-ensemble.adoc#using-the-z-parameter-with-binsolr,Using the -z Parameter with bin/solr>> for an example.+See the section xref:deployment-guide:zookeeper-ensemble.adoc#using-the-z-parameter-with-binsolr[Using the -z Parameter with bin/solr] for an example.*Other Changes*A few other minor changes are worth noting:-* The `config-read` pre-defined permission now correctly governs access for various configuration-related APIs. See also <<rule-based-authorization-plugin.adoc#predefined-permissions,Predefined Permissions>>.-* The S3BackupRepository supports configuring the AWS Profile, if necessary. See also <<backup-restore.adoc#s3backuprepository,S3BackupRepository>>.+* The `config-read` pre-defined permission now correctly governs access for various configuration-related APIs.+See also xref:deployment-guide:rule-based-authorization-plugin.adoc#predefined-permissions[Predefined Permissions].+* The S3BackupRepository supports configuring the AWS Profile, if necessary. See also xref:deployment-guide:backup-restore.adoc#s3backuprepository[S3BackupRepository].* Additionally, backups will now properly succeed after SPLITSHARD operations, and will correctly handle incremental backup purges.* SolrJ now supports uploading configsets.@@ -100,13 +101,13 @@ The designer screen provides a safe environment for you to:* Test how schema changes will impact query-time behavior.* Save your changes to a configset to use with a new collection.-See the section <<schema-designer.adoc#,Schema Designer>> for full details.+See the section xref:indexing-guide:schema-designer.adoc[] for full details.*Backups in S3*Following the redesign of backups in Solr 8.8 that allowed storage of incremental backups in Google Cloud environments, Solr 8.10 provides support for storing backups in Amazon S3 buckets.-See the section <<backup-restore.adoc#s3backuprepository,S3BackupRepository>> for how to configure.+See the section xref:deployment-guide:backup-restore.adoc#s3backuprepository[S3BackupRepository] for how to configure.*Security Admin UI*@@ -115,7 +116,7 @@ Solr's Admin UI also got a new screen to support management of users, roles, andThe new UI works when authentication and/or authorization has been enabled with `bin/solr auth` or by manually installing a `security.json` file.Before this, it provides a warning that your Solr instance is unsecured.-See the section <<security-ui.adoc#,Security UI>> for details.+See the section xref:deployment-guide:security-ui.adoc[] for details.*Solr SQL Improvements*@@ -132,12 +133,12 @@ A number of improvements have been made in Solr's SQL functionality:A new option for the `shards.preference` parameter allows selection of nodes based on whether or not the replica is a leader.Now adding `shards.preference=replica.leader:false` will limit queries only to replicas which are not currently their shard's leader.-See the section <<solrcloud-distributed-requests.adoc#shards-preference-parameter,shards.preference Parameter>> for details and examples.+See the section xref:deployment-guide:solrcloud-distributed-requests.adoc#shards-preference-parameter[shards.preference Parameter] for details and examples.*Metrics & Prometheus Exporter*A new `expr` option in the Metrics API allows for more advanced filtering of metrics based on regular expressions.-See the section <<metrics-reporting.adoc#metrics-api,Metrics API>> for examples.+See the section xref:deployment-guide:metrics-reporting.adoc#metrics-api[Metrics API] for examples.The Prometheus Exporter's default `solr-exporter.config` has been improved to use the new `expr` option in the Metrics API to get a smaller set of metrics.The default metrics exported still include most metrics, but the configuration will be easier to trim as needed.@@ -146,7 +147,7 @@ This should help provide performance improvements in busy clusters being monitor*ZooKeeper Credentials*ZooKeeper credentials can now be stored in a file whose location is defined with a system property instead of being passed in plain-text.-See <<zookeeper-access-control.adoc#out-of-the-box-credential-implementations,Out of the Box Credential Implementations>> for how to set this up.+See xref:deployment-guide:zookeeper-access-control.adoc#out-of-the-box-credential-implementations[Out of the Box Credential Implementations] for how to set this up.=== Solr 8.9@@ -170,18 +171,18 @@ The old format is officially deprecated, and support for it is likely to be remoFor the time-being the old format can be created by defining a parameter `incremental=false`.Again, though, this support is likely to be removed in Solr 9.0.-More documentation on backups is available at <<backup-restore.adoc#,Backup and Restore>>.+More documentation on backups is available at xref:deployment-guide:backup-restore.adoc[].New Collections API commands for backups:* LISTBACKUP: Lists information about each backup stored at the specified repository location.-See <<collection-management.adoc#listbackup,List Backups>> for more details.+See xref:deployment-guide:collection-management.adoc#listbackup[List Backups] for more details.* DELETEBACKUP: Deletes specified backups from the repository.-See <<collection-management.adoc#deletebackup,Delete Backups>> for more details.+See xref:deployment-guide:collection-management.adoc#deletebackup[Delete Backups] for more details.A new option for backup repository is also available in 8.9, which is to use Google Cloud Storage (GCS).This is a module (located in `modules/gcs-repository`).-See <<backup-restore.adoc#gcsbackuprepository,GCSBackupRepository>> for configuration details.+See xref:deployment-guide:backup-restore.adoc#gcsbackuprepository[GCSBackupRepository] for configuration details.The Solr community is working to add support for S3 buckets in the near future.*Nested Docs*@@ -195,15 +196,15 @@ There was no escaping here prior to 8.0 either.* BlockCollapse: If documents have been (or could be) indexed in a way where documents with the same collapse key have been indexed contiguously in the index, a new "block collapse" provides a significant speed improvement over traditional collapse.+-See <<collapse-and-expand-results.adoc#block-collapsing,Block Collapsing>> for details.+See xref:query-guide:collapse-and-expand-results.adoc#block-collapsing[Block Collapsing] for details.* Expand Null Groups: A new parameter `expand.nullGroup` allows an expanded group to be returned containing document with no value in the expanded field.-See <<collapse-and-expand-results.adoc#expand-component,Expand Component>> for details.+See xref:query-guide:collapse-and-expand-results.adoc#expand-component[Expand Component] for details.*In-Place Updates*A new request parameter `update.partial.requireInPlace=true` allows telling Solr to "fail fast" if all of the necessary conditions are not satisfied to allow an in-place update to succeed.-See also <<partial-document-updates.adoc#in-place-updates,In-Place Updates>>.+See also xref:indexing-guide:partial-document-updates.adoc#in-place-updates[In-Place Updates].*Metrics History*@@ -240,7 +241,7 @@ The module will be re-introduced in Solr 9.0.* Interleaving support has been added to Learning to Rank (LTR).Currently only the Team Draft Interleaving algorithm is supported.-For examples using this feature, see the section <<learning-to-rank.adoc#running-a-rerank-query-interleaving-two-models,Running a Rerank Query Interleaving Two Models>>.+For examples using this feature, see the section xref:query-guide:learning-to-rank.adoc#running-a-rerank-query-interleaving-two-models[Running a Rerank Query Interleaving Two Models].*Metrics*@@ -250,8 +251,8 @@ For examples using this feature, see the section <<learning-to-rank.adoc#running*Prometheus Exporter*-* The `./bin` scripts included with the Prometheus Exporter module now allow use of custom java options with environment variables.-See the section <<monitoring-with-prometheus-and-grafana.adoc#environment-variable-options,Environment Variable Options>> for more details.+* The `./bin` scripts included with the Prometheus Exporter now allow use of custom java options with environment variables.+See the section xref:deployment-guide:monitoring-with-prometheus-and-grafana.adoc#environment-variable-options[Environment Variable Options] for more details.* The default Grafana dashboards now include panels for query performance monitoring.The default Prometheus Exporter configuration includes metrics like queries-per-second (QPS) and 95th percentiles (P95) to populate the new panels.* The default Prometheus Exporter configuration also includes the two new metrics mentioned in the Metrics above.@@ -308,7 +309,7 @@ CorrespondingThis functionality has only changed in terms of parameter names changed, and we do not expect any back-compatibility issues on upgrade to 8.7 or even 9.0 later.+However, users should update their `solrconfig.xml` files after completing the upgrade on all nodes of a cluster.-Comparing your configuration to the updated configuration examples in <<user-managed-index-replication.adoc#,Index Replication>> will show examples of what needs to change, but here are the main changes:+Comparing your configuration to the updated configuration examples in xref:deployment-guide:user-managed-index-replication.adoc[] will show examples of what needs to change, but here are the main changes:+. On the replication leader, in the definition of the `/replication` request handler:.. Replace "master" with "leader".@@ -323,7 +324,7 @@ This file can be named anything, so you can change it to whatever you'd like to* Performance enhancements for the `relatedness()` statistics function are included with 8.7.These yield the highest benefits with high-cardinality fields and can be disabled if working with lower cardinality fields with a new `sweep_collection` parameter.-See the section <<json-facet-api.adoc#relatedness-options,relatedness() Options>> for details.+See the section xref:query-guide:json-facet-api.adoc#relatedness-options[relatedness() Options] for details.*solr.in.sh / solr.in.cmd*@@ -338,7 +339,7 @@ By default, this parameter is set to the same value as `SOLR_STOP_WAIT`.*Configsets*-* It's now possible to overwrite an existing configset when uploading changes by supplying the `overwrite=true` parameter to the <<configsets-api.adoc#configsets-upload,Configset API>>.+* It's now possible to overwrite an existing configset when uploading changes by supplying the `overwrite=true` parameter to the xref:configuration-guide:configsets-api.adoc#configsets-upload[Configset API].+A related parameter is `cleanup=true`, which allows deleting any files from the old configset that are left behind after the overwrite.+@@ -396,7 +397,7 @@ It is guaranteed that the hit count is accurate up to the value of `minExactCounA new boolean attribute `numFoundExact` is included in all responses to indicate if the hit count in the response is expected to be exact or not.-More information about this new feature is available in the section <<common-query-parameters.adoc#minexactcount-parameter,minExactCount Parameter>>.+More information about this new feature is available in the section xref:query-guide:common-query-parameters.adoc#minexactcount-parameter[minExactCount Parameter].*Autoscaling*@@ -419,7 +420,7 @@ When using the `solr.xml` file that ships with 8.6, you can configure the list oPlease see `bin/solr.in.sh` or `bin\solr.in.cmd` for example usage.Using the value `*` will allow any path as in earlier versions.+-For more on this, see the section <<configuring-solr-xml.adoc#the-solr-element,Solr.xml Parameters>>.+For more on this, see the section xref:configuration-guide:configuring-solr-xml.adoc#the-solr-element[Solr.xml Parameters].+Windows SMB shares on the UNC format, such as `\\myhost\myshare\mypath` are now always disallowed.Please use drive letter mounts instead, i.e., `S:\mypath`.@@ -434,7 +435,7 @@ A new link will also appear in the left-hand navigation to allow a user to log o* The `/export` handler now supports streaming expressions to allow limiting the output of the export to only matching documents.+-For more information about how to use this, see the section <<exporting-result-sets.adoc#specifying-the-local-streaming-expression,Specifying the Local Streaming Expression>>.+For more information about how to use this, see the section xref:query-guide:exporting-result-sets.adoc#specifying-the-local-streaming-expression[Specifying the Local Streaming Expression].* The `stats`, `facet`, and `timeseries` expressions now support percentiles and standard deviation aggregations.@@ -487,7 +488,7 @@ If you are upgrading Solr with an atomic restart strategy:* If you don’t use async or REQUESTSTATUS operations, you should be able to restart and not see any issues.* If you do use Collection API operations:. Pause Collection API operations.-. Cleanup queues (See the section <<collections-api.adoc#deletestatus,DELETESTATUS>> for examples)+. Cleanup queues (See the section xref:configuration-guide:collections-api.adoc#deletestatus[DELETESTATUS] for examples)if you use async operations.. Upgrade and restart the nodes.. Resume all normal operations.@@ -500,7 +501,7 @@ any issues.way is to:. Pause Collection API operations.. Upgrade and restart all nodes.-. Cleanup queues (See the section <<collections-api.adoc#deletestatus,DELETESTATUS>> for examples)+. Cleanup queues (See the section xref:configuration-guide:collections-api.adoc#deletestatus[DELETESTATUS] for examples)if you use async operations.. Resume all normal operations.@@ -524,7 +525,7 @@ Note that if you are using HDFS to store indexes, you cannot enable the securityIn Solr 9.0, this will be the default.-// See SOLR-14147: See also the section <<securing-solr.adoc#enable-security-manager,Enable Security Manager>>.+// See SOLR-14147: See also the section xref:deployment-guide:securing-solr.adoc#enable-security-manager[Enable Security Manager].*Block/Allow Specific IPs*@@ -532,17 +533,17 @@ Solr has two new parameters to allow you to restrict access to Solr using IP addUse `SOLR_IP_WHITELIST` to configure a whitelist, and `SOLR_IP_BLACKLIST` to configure a blacklist.These properties are defined in `solr.in.sh` or `solr.in.cmd`.-See also the section <<securing-solr.adoc#ip-access-control,Enable IP Access Control>>.+See also the section xref:deployment-guide:securing-solr.adoc#ip-access-control[Enable IP Access Control].*BlockJoin Facet Deprecation*The BlockJoinFacetComponent is marked for deprecation and will be removed in 9.0.Users are encouraged to migrate to `uniqueBlock()` in JSON Facet API.-More information about this is available in the section <<json-faceting-domain-changes.adoc#block-join-domain-changes,Block Join Domain Changes>>.+More information about this is available in the section xref:query-guide:json-faceting-domain-changes.adoc#block-join-domain-changes[Block Join Domain Changes].*Caching with the Boolean Query Parser*-By default, the <<other-parsers.adoc#boolean-query-parser,Boolean Query Parser>> caches queries in Solr's filterCache.+By default, the xref:query-guide:other-parsers.adoc#boolean-query-parser[Boolean Query Parser] caches queries in Solr's filterCache.It's now possible to disable this with the local param `cache=false`.*Indexing Log Files*@@ -550,12 +551,12 @@ It's now possible to disable this with the local param `cache=false`.Solr now includes a command line tool, `bin/postlogs` which will index Solr's log files into a collection.This provides an easy way to use Solr or visualization tools (such as Zeppelin) to troubleshoot problems with the system.-This tool is not yet officially documented in the Reference Guide, but draft documentation is available in a branch and can be accessed https://github.com/apache/lucene-solr/blob/visual-guide/solr/solr-ref-guide/src/logs.adoc[via GitHub^].+See the documentation for more details at xref:query-guide:logs.adoc[].*Highlighting*Solr's Unified Highlighter now has two parameters to help control passage sizing, `hl.fragAlignRatio` and `hl.fragsizeIsMinimum`.-See the section <<highlighting.adoc#unified-highlighter,Unified Highlighter>> for details about these new parameters.+See the section xref:query-guide:highlighting.adoc#unified-highlighter[Unified Highlighter] for details about these new parameters.Regardless of the settings, the passages may be sized differently than before._Warning: These default settings were found to be a significant performance regression for apps that highlight lots of text with the default sentence break iterator.See the 8.6 upgrade notes for advise you can apply in 8.5._@@ -593,7 +594,7 @@ to Solr.The system is currently considered experimental, so use with caution.It mustbe enabled with a system parameter passed at start up before it can be used.-For details, please see the section <<package-manager.adoc#,Package Management>>.+For details, please see the section xref:configuration-guide:package-manager.adoc[].With this feature Solr's Blob Store functionality is now deprecated and will likely be removed in 9.0.@@ -613,7 +614,7 @@ the `/browse` sample search interface) are no longer enabled out of the box.** The XSLT and Velocity response writers.+All of these items can be added to your Solr implementation by manually editing-`solrconfig.xml` to add them back in, or use the <<config-api.adoc#,Config API>>.+`solrconfig.xml` to add them back in, or use the xref:configuration-guide:config-api.adoc[].+The `sample_techproducts_configs` and the examples found in `./example` are unchanged.@@ -628,14 +629,11 @@ directives, their corresponding collections will not load (they will cease towork).You have a few options in this case:-** You can secure your Solr instance with <<authentication-and-authorization-plugins.adoc#,authentication>>-and re-upload the configset (using the `bin/solr zk upconfig ...`-<<solr-control-script-reference.adoc#,Solr CLI>> command);+** You can secure your Solr instance with xref:deployment-guide:authentication-and-authorization-plugins.adoc[authentication] and re-upload the configset (using the `bin/solr zk upconfig ...` xref:deployment-guide:solr-control-script-reference.adoc[Solr CLI] command);** You can put your custom Jars in Solr's classpath instead of `lib` directories;** You can try the new package management system to manage your custom Jars.+-See the section <<configsets-api.adoc#configsets-upload,Upload a Configset>>- for more details about trusted vs. untrusted configsets.+See the section xref:configuration-guide:configsets-api.adoc#configsets-upload[Upload a Configset] for more details about trusted vs. untrusted configsets.* Our default Jetty configuration has been updated to now set aContent-Security-Policy (CSP) by default.@@ -656,9 +654,7 @@ It has been replaced with the new package management system.*Using Collapse with Group Disallowed*-Using the <<collapse-and-expand-results.adoc#,CollapsingQueryParser>>-with <<result-grouping.adoc#,Result Grouping>> has never been-supported as it causes inconsistent behavior and NullPointerException errors.+Using the xref:query-guide:collapse-and-expand-results.adoc[CollapsingQueryParser] with xref:query-guide:result-grouping.adoc[] has never been supported as it causes inconsistent behavior and NullPointerException errors.We have now explicitly disallowed this combination to prevent these errors.If you are using these together, you will need to modify your queries.@@ -667,8 +663,7 @@ If you are using these together, you will need to modify your queries.* SolrJ now supports the `shards.preference` parameter for single-shardscenarios to ensure multi-shard and single-shard request routing works in the same way.+-See <<solrj.adoc#cloud-request-routing,Cloud Request Routing>> and-<<solrcloud-distributed-requests.adoc#shards-preference-parameter,shards.preference Parameter>> for details.+See xref:deployment-guide:solrj.adoc#cloud-request-routing[Cloud Request Routing] and xref:deployment-guide:solrcloud-distributed-requests.adoc#shards-preference-parameter[shards.preference Parameter] for details.* `QueryResponse.getExplainMap()` type has changed from `Map<String, String>` to `Map<String, Object>` in order to support structured explanations.+@@ -729,7 +724,7 @@ Since caching has a direct impact on the performance of your Solr* A new parameter, `maxIdleTime`, allows automatic eviction of cache items that have not been used in the defined amount of time.This allows the cache to release some memory and should aid those who want or need to fine-tune their caches.-See the section <<caches-warming.adoc#,Caches and Query Warming>> for more details about these and other cache options and parameters.+See the section xref:configuration-guide:caches-warming.adoc[] for more details about these and other cache options and parameters.=== Solr 8.2@@ -746,7 +741,7 @@ It is recommended that external ensembles set up to work with Solr also be updatThis ZooKeeper release includes many new security features.In order for Solr's Admin UI to work with 3.5.5, the `zoo.cfg` file must allow access to ZooKeeper's "four-letter commands".At a minimum, `ruok`, `conf`, and `mntr` must be enabled, but other commands can optionally be enabled if you choose.-See the section <<zookeeper-ensemble.adoc#configuration-for-a-zookeeper-ensemble,Configuration for a ZooKeeper Ensemble>> for details.+See the section xref:deployment-guide:zookeeper-ensemble.adoc#configuration-for-a-zookeeper-ensemble[Configuration for a ZooKeeper Ensemble] for details.[WARNING]Until 8.3, https://issues.apache.org/jira/browse/SOLR-13672[SOLR-13672] causes the ZK Status screen in the Admin UI to not be able to report status.@@ -770,7 +765,7 @@ Collections created with older versions will continue to work.*Distributed Tracing Support*This release adds support for tracing requests in Solr.-Please review the section <<distributed-tracing.adoc#,Distributed Tracing>> for details on how to configure this feature.+Please review the section xref:deployment-guide:distributed-tracing.adoc[] for details on how to configure this feature.=== Solr 8.1@@ -790,18 +785,18 @@ An identical parameter is available in `solrconfig.xml` for limiting the size of+If your use case demands that you a lot of OR or AND clauses in your queries, upon upgrade to 8.1 you may need to adjust the global `maxBooleanClauses` parameter since between 7.0 and 8.1 the limit was effectively unbounded.+-For more information about the new parameter, see the section <<configuring-solr-xml.adoc#global-maxbooleanclauses,Format of solr.xml: maxBooleanClauses>>.+For more information about the new parameter, see the section xref:configuration-guide:configuring-solr-xml.adoc#global-maxbooleanclauses[maxBooleanClauses].*Security** JSON Web Tokens (JWT) are now supported for authentication.These allow Solr to assert a user is already authenticated via an external identity provider, such as an OpenID Connect-enabled IdP.-For more information, see the section <<jwt-authentication-plugin.adoc#,JWT Authentication Plugin>>.+For more information, see the section xref:deployment-guide:jwt-authentication-plugin.adoc[].* A new security plugin for audit logging has been added.A default class `SolrLogAuditLoggerPlugin` is available and configurable in `security.json`.The base class is also extendable for adding custom audit plugins if needed.-See the section <<audit-logging.adoc#,Audit Logging>> for more information.+See the section xref:deployment-guide:audit-logging.adoc[] for more information.*Collections API*@@ -812,13 +807,13 @@ Previously, it always returned `0`, even in failure.* The MODIFYCOLLECTION command now accepts an attribute to set a collection as read-only.This can be used to block a collection from receiving any updates while still allowing queries to be served.-See the section <<collection-management.adoc#modifycollection,MODIFYCOLLECTION>> for details on how to use it.+See the section xref:deployment-guide:collection-management.adoc#modifycollection[MODIFYCOLLECTION] for details on how to use it.* A new command RENAME allows renaming a collection by setting up a one-to-one alias using the new name.-For more information, see the section <<collection-management.adoc#rename,RENAME>>.+For more information, see the section xref:deployment-guide:collection-management.adoc#rename[RENAME].* A new command REINDEXCOLLECTION allows indexing existing stored fields from a source collection into a new collection.-For more information, please see the section <<collection-management.adoc#reindexcollection,REINDEXCOLLECTION>>.+For more information, please see the section xref:deployment-guide:collection-management.adoc#reindexcollection[REINDEXCOLLECTION].*Logging*@@ -849,7 +844,7 @@ If you prefer to use CMS or any other GC method, you can modify the `GC_TUNE` se== Upgrading from 7.x ReleasesThe upgrade from 7.x to Solr 8.0 introduces several major changes that you should be aware of before upgrading.-These changes are described in the section <<major-changes-in-solr-8.adoc#,Major Changes in Solr 8>>.+These changes are described in the section xref:major-changes-in-solr-8.adoc[].It's strongly recommended that you do a thorough review of that section before starting your upgrade.[NOTE]@@ -860,6 +855,6 @@ If you run in SolrCloud mode, you must be on Solr version 7.3 or higher in orderUsers upgrading from versions of Solr prior to 7.x are strongly encouraged to consult {solr-javadocs}/changes/Changes.html[`CHANGES.txt`] for the details of _all_ changes since the version they are upgrading from.The upgrade from Solr 6.x to Solr 7.0 introduced several *major* changes that you should be aware of before upgrading.-Please do a thorough review of the section <<major-changes-in-solr-7.adoc#,Major Changes in Solr 7>> before starting your upgrade.+Please do a thorough review of the section xref:major-changes-in-solr-7.adoc[] before starting your upgrade.-A summary of the significant changes between Solr 5.x and Solr 6.0 is in the section <<major-changes-in-solr-6.adoc#,Major Changes in Solr 6>>.+A summary of the significant changes between Solr 5.x and Solr 6.0 is in the section xref:major-changes-in-solr-6.adoc[].diff --git a/solr/solr-ref-guide/modules/upgrade-notes/upgrade-nav.adoc b/solr/solr-ref-guide/modules/upgrade-notes/upgrade-nav.adocnew file mode 100644index 00000000000..3ee8638ca9e--- /dev/null+++ b/solr/solr-ref-guide/modules/upgrade-notes/upgrade-nav.adoc@@ -0,0 +1,5 @@+* xref:solr-upgrade-notes.adoc[]+** xref:major-changes-in-solr-9.adoc[]+** xref:major-changes-in-solr-8.adoc[]+** xref:major-changes-in-solr-7.adoc[]+** xref:major-changes-in-solr-6.adoc[]diff --git a/solr/solr-ref-guide/playbook.template.yml b/solr/solr-ref-guide/playbook.template.ymlnew file mode 100644index 00000000000..a3bf9c809f8--- /dev/null+++ b/solr/solr-ref-guide/playbook.template.yml@@ -0,0 +1,40 @@+site:+ title: Apache Solr Reference Guide+ url: ${site_url}+ start_page: solr::index.adoc+urls:+ latest_version_segment: latest+# This does not work unless the redirect_facility below is set to+# something other than the default 'static'+ latest_version_segment_strategy: redirect:from+# If this is set to 'httpd', antora will create a .htaccess file with all redirects, including 'latest'.+# Default is 'static' which produces index.html at the root.+# See https://docs.antora.org/antora/latest/playbook/urls-redirect-facility/+ redirect_facility: ${redirect_facility}+content:+ # The URL for "Edit this page" links will always go to 'main' in Github+ edit_url: '{web_url}/tree/main/{path}'+ sources:+ - url: "${source_url}"+ branches: ${source_branches}+ start_path: "${start_path}"++ui:+ bundle:+ url: "https://nightlies.apache.org/solr/draft-guides/ui-bundle.zip"+ snapshot: true+ supplemental_files: "${supplemental_files}"+output:+ clean: true+ dir: "${site_dir}"+asciidoc:+ attributes:+ stem:+ extensions:+ - '@djencks/asciidoctor-mathjax'++runtime:+ fetch: true+antora:+ extensions:+ - '@antora/lunr-extension'diff --git a/solr/solr-ref-guide/src/.gitignore b/solr/solr-ref-guide/src/.gitignoredeleted file mode 100644index 45c150536e5..00000000000--- a/solr/solr-ref-guide/src/.gitignore+++ /dev/null@@ -1,3 +0,0 @@-_site-.sass-cache-.jekyll-metadatadiff --git a/solr/solr-ref-guide/src/_config.yml.template b/solr/solr-ref-guide/src/_config.yml.templatedeleted file mode 100755index 08f869b772b..00000000000--- a/solr/solr-ref-guide/src/_config.yml.template+++ /dev/null@@ -1,100 +0,0 @@-#-#-#-# NOTE: gradle converts _config.yml.template into create _config.yml and performs script engine substitutions-#-#-#--# Gems that are included for building the site. jekyll-asciidoc allows Jekyll to use Asciidoctor for variables and settings-plugins: [jekyll-asciidoc]--destination: '${htmlOutDir}'--# this property is useful for conditional filtering of content that is separate from another format (if any).-output: web--# this appears on the top navigation bar next to the home button-topnav_title: Solr Ref Guide--# this appears in the html browser tab for the site title (seen mostly by search engines, not users)-site_title: Apache Solr Reference Guide--# this appears in the footer-company_name: Apache Software Foundation---# the preview server used. Leave as is.-host: 127.0.0.1--# the port where the preview is rendered. You can leave this as is unless you have other Jekyll builds using this same port that might cause conflicts. in that case, use another port such as 4006.-port: 4015--# these are the files and directories that jekyll will exclude from the build-exclude:- - .idea/- - .gitignore--# these are defaults used for the frontmatter for these file types-defaults:- -- scope:- path: ""- type: "pages"- values:- layout: "page"- search: true-- -- scope:- path: ""- type: "posts"- values:- layout: "post"- search: true--# needed for sitemap.xml-url: https://solr.apache.org/guide/--# Asciidoc settings - disabled so we can use asciidoctor instead-asciidoc: {}--# Custom Attributes for use in our templates & adoc files.-#-# Declared as a YAML reference so we can refer to them via site.solr-attributes.foo in liquid templates,-# in addition to using them below in our asciidoctor attribute configurations-# (see https://github.com/asciidoctor/jekyll-asciidoc/issues/137)-#-# NOTE: If you add any attributes here for use in adoc files, you almost certainly need to also add-# them to the <asciidoctor:convert/> ant task for precommit validation as well.-solr-attributes: &solr-attributes-ref- solr-root-path: '${solrRootPath}'- solr-full-version: '${solrFullVersion}'- solr-guide-draft-status: '${solrGuideDraftStatus}'- solr-guide-version-path: '${solrGuideVersionPath}'- solr-docs-version: '${solrDocsVersion}'- java-javadocs: '${javadocLink}'- solr-javadocs: '${htmlSolrJavadocs}'- lucene-javadocs: '${htmlLuceneJavadocs}'- build-date: '${buildDate}'- build-year: '${buildYear}'- ivy-commons-codec-version: '${ivyCommonsCodec}'- ivy-dropwizard-version: '${ivyDropwizardMetrics}'- ivy-hadoop-version: '${ivyHadoop}'- ivy-log4j-version: '${ivyLog4j}'- ivy-opennlp-version: '${ivyOpennlpTools}'- ivy-tika-version: '${ivyTika}'- ivy-zookeeper-version: '${ivyZookeeper}'--asciidoctor:- safe: 0- template_dir: _templates- attributes:- <<: *solr-attributes-ref- attribute-missing: "warn"- icons: "font"- source-highlighter: "rouge"- rouge-css: "style"- rouge-style: "github"- stem:- sectanchors: "true"diff --git a/solr/solr-ref-guide/src/_data/strings.yml b/solr/solr-ref-guide/src/_data/strings.ymldeleted file mode 100755index dd5792de10e..00000000000--- a/solr/solr-ref-guide/src/_data/strings.yml+++ /dev/null@@ -1,5 +0,0 @@---# placed here for translation purposes-search_placeholder_text: Page title lookup...-search_no_results_text: No results found.diff --git a/solr/solr-ref-guide/src/_data/tags.yml b/solr/solr-ref-guide/src/_data/tags.ymldeleted file mode 100755index c4029ba414b..00000000000--- a/solr/solr-ref-guide/src/_data/tags.yml+++ /dev/null@@ -1,7 +0,0 @@-allowed-tags:- - getting_started- - content_types- - troubleshooting- - analysis- - languages- - scalingdiff --git a/solr/solr-ref-guide/src/_includes/footer.html b/solr/solr-ref-guide/src/_includes/footer.htmldeleted file mode 100755index d11fd4a7b6f..00000000000--- a/solr/solr-ref-guide/src/_includes/footer.html+++ /dev/null@@ -1,9 +0,0 @@-<footer>- <div class="row">- <div class="col-lg-12 footer">- ©{{ site.solr-attributes.build-year }} {{site.company_name}}. All rights reserved. <br />-{% if page.last_updated %}<p>Page last updated:</span> {{page.last_updated}}<br/>{% endif %} Solr Version: {{ site.solr-attributes.solr-docs-version }} <br />Site last generated: {{ site.solr-attributes.build-date }} <br />-<p><img src="{{ "images/solr-sunOnly-small.png" }}" alt="Apache Solr"/></p>- </div>- </div>-</footer>diff --git a/solr/solr-ref-guide/src/_includes/head.html b/solr/solr-ref-guide/src/_includes/head.htmldeleted file mode 100755index c92db6dbb3f..00000000000--- a/solr/solr-ref-guide/src/_includes/head.html+++ /dev/null@@ -1,32 +0,0 @@-<meta charset="utf-8">-<meta http-equiv="X-UA-Compatible" content="IE=edge">-<meta name="viewport" content="width=device-width, initial-scale=1">-<meta name="description" content="{% if page.description %}{{ page.description | strip_html | strip_newlines | truncate: 160 }}{% endif %}">-<meta name="keywords" content="{{page.tags}}{% if page.tags %}, {% endif %} {{page.keywords}}">-<title>{% if page_id != "index" %}{{ page.title }} | {% endif %}{{ site.site_title }} {{ site.solr-attributes.solr-docs-version}}</title>--<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">-<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">-<link rel="stylesheet" href="{{ "css/navs.css "}}">-<link rel="stylesheet" href="{{ "css/ref-guide.css" }}">-<link rel="stylesheet" href="{{ "css/decoration.css" }}">-<link rel="stylesheet" href="{{ "css/search.css" }}">--<!-- JQuery - we can't use slim because navgoco relies on ajax -->-<script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha384-ZvpUoO/+PpLXR1lu4jmpXWu80pZlYUAfxl5NsBMWOEPSjUn/6Z/hRTt8+pR6L4N2" crossorigin="anonymous"></script>--<!-- Scrollbar Custom CSS -->-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/malihu-custom-scrollbar-plugin/3.1.5/jquery.mCustomScrollbar.min.css" crossorigin="anonymous">--<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.min.js" crossorigin="anonymous"></script>--<script src="{{ "js/jquery.navgoco.min.js" }}"></script>--<link rel="shortcut icon" href="{{ "images/icons/favicon.ico" }}">--<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->-<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->-<!--[if lt IE 9]>-<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>-<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>-<![endif]-->diff --git a/solr/solr-ref-guide/src/_includes/mathjax-support.html b/solr/solr-ref-guide/src/_includes/mathjax-support.htmldeleted file mode 100644index 8d812b5e393..00000000000--- a/solr/solr-ref-guide/src/_includes/mathjax-support.html+++ /dev/null@@ -1,22 +0,0 @@-{% comment %}This adds MathJax support for rendering math formulae and equations in HTML.{% endcomment %}--<script type="text/x-mathjax-config">-MathJax.Hub.Config({- messageStyle: "none",- tex2jax: {- inlineMath: [["\\(","\\)"]],- displayMath: [["\\[","\\]"]],- ignoreClass: "nostem|nolatexmath"- },- asciimath2jax: {- delimiters: [["\\$","\\$"]],- ignoreClass: "nostem|noasciimath"- },- TeX: {- equationNumbers: {- autoNumber: "none"- }- }-});-</script>-<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>diff --git a/solr/solr-ref-guide/src/_includes/sidebar.html b/solr/solr-ref-guide/src/_includes/sidebar.htmldeleted file mode 100755index 9a9bf3c9261..00000000000--- a/solr/solr-ref-guide/src/_includes/sidebar.html+++ /dev/null@@ -1,90 +0,0 @@-{% assign sidebar = site.data.sidebar %}-<div class="sidebar-header">- <div class="sidebarTitle text-center">{{sidebar.title}}</div>- {% if "" != site.solr-attributes.solr-guide-draft-status %}- <p class="draft-notice">- This is an unofficial DRAFT of the Guide for {{ site.solr-attributes.solr-docs-version }}.- <a href="https://solr.apache.org/guide/">Official releases are available from the Solr website</a>.- </p>- {% endif %}-- <!--comment out this block if you want to hide search-->- <!--start search-->- <div id="search-demo-container">- <input type="text" id="search-input" class="form-control" placeholder="{{ site.data.strings.search_placeholder_text }}">- <ul id="results-container"></ul>- </div>- <script src="{{ "js/jekyll-search.js"}}" type="text/javascript"></script>- <script type="text/javascript">- SimpleJekyllSearch.init({- searchInput: document.getElementById('search-input'),- resultsContainer: document.getElementById('results-container'),- dataSource: '{{ "search.json" }}',- searchResultTemplate: '<li><a href="{url}" title="{{page.title | replace: "'", "\"}}">{title}</a></li>',- noResultsText: '{{ site.data.strings.search_no_results_text }}',- limit: 10,- fuzzy: true,- })- </script>- <!--end search-->-- </div>---<ul class="nav" id="mysidebar">- {% for level1item in sidebar.kids %}- <li class="sb-level1">- <a href="{{level1item.url | remove: "/"}}">{{ level1item.title }}</a>- {% if level1item.kids.size > 0 %}- <ul>- {% for level2item in level1item.kids %}- <li class="sb-level2">- <a href="{{ level2item.url | remove: "/" }}">{{ level2item.title }}</a>- {% if level2item.kids.size > 0 %}- <ul>- {% for level3item in level2item.kids %}- <li class="sb-level3">- <a href="{{ level3item.url | remove: "/" }}">{{ level3item.title }}</a>- {% if level3item.kids.size > 0 %}- <ul>- {% for level4item in level3item.kids %}- <li class="sb-level4">- <a href="{{ level4item.url | remove: "/" }}">{{ level4item.title }}</a>- {% comment %}- <!-- NOTE: adding addiional levels here will also require additional changes to- ref-guide.css in order to indent them properly- -->- {% endcomment %}- </li>- {% endfor %}- </ul>- {% endif %}- </li>- {% endfor %}- </ul>- {% endif %}- </li>- {% endfor %}- </ul>- {% endif %}- </li>- {% endfor %}-</ul>--{% comment %}-<!-- if you aren't using the accordion, uncomment this block:- <p class="external">- <a href="#" id="collapseAll">Collapse All</a> | <a href="#" id="expandAll">Expand All</a>- </p>- -->-{% endcomment %}--<!-- set the 'active' class on the current page and ancestors -->-<!-- this highlights the active parent class in the navgoco sidebar. this is critical so that the parent expands when you're viewing a page. This must appear below the sidebar code above. Otherwise, if placed inside customscripts.js, the script runs before the sidebar code runs and the class never gets inserted.-->-<script>$("#mysidebar a[href='{{ page_id }}.html']").parents('li').toggleClass("active", true);</script>-<!-- set the 'current' class on the current page and 'current-tree' on the current page + it's ancestors -->-<!-- this can let us do css highlighting of the current page in the sidebar even if/when the user clicks around in the sidebar causing other sidebar elements to be 'active' -->-<script>- $("#mysidebar a[href='{{ page_id }}.html']").parent('li').toggleClass("current", true);- $("#mysidebar a[href='{{ page_id }}.html']").parents('li').toggleClass("current-tree", true);-</script>diff --git a/solr/solr-ref-guide/src/_includes/topnav.html b/solr/solr-ref-guide/src/_includes/topnav.htmldeleted file mode 100755index d1147288d5a..00000000000--- a/solr/solr-ref-guide/src/_includes/topnav.html+++ /dev/null@@ -1,39 +0,0 @@-<!-- Navigation -->-<nav id="topnav" class="navbar navbar-expand-md fixed-top bg-light flex-nowrap col-10">- <div class="container-fluid">- <div class="navbar-header">- {% comment %} NOTE: Explicitly using *SOLR* version here (not guide){% endcomment %}- <img src="images/solr-sunOnly-small.png" width="30" height="30">- <a class="navbar-brand" href="index.html">- <span class="projectTitle">Solr {{ site.solr-attributes.solr-docs-version }}</span>- </a>- </div>- <div class="collapse navbar-collapse justify-content-end" id="bs-example-navbar-collapse-1">- <ul class="nav navbar-nav navbar-right">- <!-- Link to Solr website -->- <li><a href="https://solr.apache.org/" target="_blank" rel="noreferrer nopener">Solr Website</a></li>- <li><a href="https://solr.apache.org/downloads.html" target="_blank" rel="noreferrer nopener">Download Solr</a></li>- <!-- Other Guide Formats dropdown -->- <li class="dropdown">- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Other Versions<b class="caret"></b></a>- <ul class="dropdown-menu">- <li><a href="https://archive.apache.org/dist/lucene/solr/ref-guide/" target="_blank" rel="noreferrer nopener">Archived PDFs</a></li>- <li><a href="https://solr.apache.org/guide/" target="_blank" rel="noreferrer nopener">Other Versions Online</a></li>- </ul>- </li>- <!-- Solr Resources dropdown -->- <li class="dropdown">- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Solr Resources<b class="caret"></b></a>- <ul class="dropdown-menu">- <li><a href="{{site.solr-attributes.solr-javadocs}}/solr-core/index.html" target="_blank" rel="noreferrer nopener">Javadocs</a></li>- <li><a href="https://solr.apache.org/community.html#version-control" target="_blank" rel="noreferrer nopener">Source Code</a></li>- <li><a href="https://solr.apache.org/community.html" target="_blank" rel="noreferrer nopener">Community Links</a></li>- <li><a href="https://github.com/apache/solr/tree/main/dev-docs/ref-guide" target="_blank" rel="noreferrer nopener">Contribute</a></li>- </ul>- </li>-- </ul>- </div>- </div>- <!-- /.container -->-</nav>diff --git a/solr/solr-ref-guide/src/_layouts/default.html b/solr/solr-ref-guide/src/_layouts/default.htmldeleted file mode 100755index 75b66b2fe46..00000000000--- a/solr/solr-ref-guide/src/_layouts/default.html+++ /dev/null@@ -1,63 +0,0 @@-<!DOCTYPE html>-{% comment %}NOTE: page_id is also defined in page.html{% endcomment %}-{% assign page_id = page.url | split: '/' | last | remove: '.html' %}-<head>- {% include head.html %}- <script>- $(document).ready(function() {- // Initialize navgoco with default options- $("#mysidebar").navgoco({- caretHtml: '',- accordion: true,- openClass: 'active', // open- save: false, // we do *NOT* want cookies used to save the current stage of the sidebar- // instead the code in sidebar.html will ensure that the current page- // (and it's ancestors) are "active" on page load- slide: {- duration: 400,- easing: 'swing'- }- });-- $("#collapseAll").click(function(e) {- e.preventDefault();- $("#mysidebar").navgoco('toggle', false);- });-- $("#expandAll").click(function(e) {- e.preventDefault();- $("#mysidebar").navgoco('toggle', true);- });-- });-- </script>-</head>-<body class="{{ site.solr-attributes.solr-guide-draft-status }}" id="{{ page_id }}">-<div class="container-fluid">- <div class="row">- <nav id="sidebar" class="col-2 d-none d-md-block">- {% include sidebar.html %}- </nav>- <div id="content" class="col-10">- {% include topnav.html %}- <article class="post-content">- {{ content }}- </article>- {% include footer.html %}- </div>-</div>-</div>--<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>--<script src="https://cdnjs.cloudflare.com/ajax/libs/malihu-custom-scrollbar-plugin/3.1.5/jquery.mCustomScrollbar.concat.min.js" crossorigin="anonymous"></script>--<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>--<script src="{{ "js/customscripts.js" }}"></script>--{% include mathjax-support.html %}--</body>-</html>diff --git a/solr/solr-ref-guide/src/_layouts/home.html b/solr/solr-ref-guide/src/_layouts/home.htmldeleted file mode 100644index be1b40137a1..00000000000--- a/solr/solr-ref-guide/src/_layouts/home.html+++ /dev/null@@ -1,21 +0,0 @@-----layout: default------<!-- This layout is ONLY used for index.adoc, which is the default landing page- for the Ref Guide.- Its main difference is that it uses a different class for the content- container in order to have freedom to customize it as needed. -->--{% comment %}NOTE: page_id is also defined in default.html{% endcomment %}-{% assign page_id = page.url | split: '/' | last | remove: '.html' %}--{% comment %}-NOTE: link-check-root is not used in any CSS, but must exist once per page as a wrapper- around all content that should have links checked (ie: we don't link check header/footer)-{% endcomment %}-<div class="homepage container link-check-root">- {{ content }}-</div>--<br />diff --git a/solr/solr-ref-guide/src/_layouts/none.html b/solr/solr-ref-guide/src/_layouts/none.htmldeleted file mode 100755index 60887a9201d..00000000000--- a/solr/solr-ref-guide/src/_layouts/none.html+++ /dev/null@@ -1,3 +0,0 @@---------{{content}}\ No newline at end of filediff --git a/solr/solr-ref-guide/src/_layouts/page.html b/solr/solr-ref-guide/src/_layouts/page.htmldeleted file mode 100755index 2d11f2d0912..00000000000--- a/solr/solr-ref-guide/src/_layouts/page.html+++ /dev/null@@ -1,57 +0,0 @@-----layout: default------{% 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>- {% endif %}-- {% comment %}- NOTE: link-check-root is not used in any CSS, but must exist once per page as a wrapper- around all content that should have links checked (ie: we don't link check header/footer)- {% endcomment %}- <section class="content link-check-root">- {{ content }}- </section>---<!-- Adds tags, if any -->- <div class="tags">- {% if page.tags != null %}- <b>Tags: </b>- {% assign projectTags = site.data.tags.allowed-tags %}- {% for tag in page.tags %}- {% if projectTags contains tag %}- <a href="{{ "tag-" | append: tag | append: ".html" }}" class="btn btn-default navbar-btn cursorNorm" role="button">{{page.tagName}}{{tag}}</a>- {% endif %}- {% endfor %}- {% endif %}- </div>--<!-- Adds nav links on each page -->- {% assign scrollnav = site.data.scrollnav[page_id] %}- {% if scrollnav %}- <nav class="scrollnav row">- <div class="col-lg-12">- {% if scrollnav.prev %}- <a class="btn btn-primary prev float-left" href="{{ scrollnav.prev.url }}">{{ scrollnav.prev.title }}</a>- {% endif %}- {% if scrollnav.next %}- <a class="btn btn-primary next float-right" href="{{ scrollnav.next.url }}">{{ scrollnav.next.title }}</a>- {% endif %}- </div>- </nav>- {% endif %}-</div>diff --git a/solr/solr-ref-guide/src/_templates/_attribution.html.slim b/solr/solr-ref-guide/src/_templates/_attribution.html.slimdeleted file mode 100644index cecaaa7a896..00000000000--- a/solr/solr-ref-guide/src/_templates/_attribution.html.slim+++ /dev/null@@ -1,4 +0,0 @@-footer- '—- cite- =[(attr :attribution), (attr :citetitle)].compact.join(', ')diff --git a/solr/solr-ref-guide/src/_templates/_footer.html.slim b/solr/solr-ref-guide/src/_templates/_footer.html.slimdeleted file mode 100644index 36f69fcb670..00000000000--- a/solr/solr-ref-guide/src/_templates/_footer.html.slim+++ /dev/null@@ -1,8 +0,0 @@-#footer-text- - if attr? :revnumber- | #{attr 'version-label'} #{attr :revnumber}- - if attr? 'last-update-label'- br- | #{attr 'last-update-label'} #{attr :docdatetime}-- unless (docinfo_content = (docinfo :footer)).empty?- =docinfo_contentdiff --git a/solr/solr-ref-guide/src/_templates/_footnotes.html.slim b/solr/solr-ref-guide/src/_templates/_footnotes.html.slimdeleted file mode 100644index 13a164ef710..00000000000--- a/solr/solr-ref-guide/src/_templates/_footnotes.html.slim+++ /dev/null@@ -1,11 +0,0 @@-section.footnotes aria-label='Footnotes' role='doc-endnotes'- hr- ol.footnotes- - footnotes.each do |fn|- li.footnote id=(footnote_id fn.index) role='doc-endnote'- ="#{fn.text} "- a.footnote-backref [- href="##{footnoteref_id fn.index}"- role='doc-backlink'- title='Jump to the first occurrence in the text' ]- | ↩diff --git a/solr/solr-ref-guide/src/_templates/_hdlist.html.slim b/solr/solr-ref-guide/src/_templates/_hdlist.html.slimdeleted file mode 100644index 6e6629d5e8c..00000000000--- a/solr/solr-ref-guide/src/_templates/_hdlist.html.slim+++ /dev/null@@ -1,20 +0,0 @@-= block_with_title :class=>'hdlist'- table- - if (attr? :labelwidth) || (attr? :itemwidth)- colgroup- col style=style_value(width: [(attr :labelwidth), '%'])- col style=style_value(width: [(attr :itemwidth), '%'])- - items.each do |terms, dd|- tr- td.hdlist1 class=('strong' if option? 'strong')- - terms = [*terms]- - terms.each_with_index do |dt, idx|- =dt.text- - unless idx >= terms.count - 1- br- td.hdlist2- - unless dd.nil?- - if dd.text?- p =dd.text- - if dd.blocks?- =dd.contentdiff --git a/solr/solr-ref-guide/src/_templates/_header.html.slim b/solr/solr-ref-guide/src/_templates/_header.html.slimdeleted file mode 100644index 3a4886468ff..00000000000--- a/solr/solr-ref-guide/src/_templates/_header.html.slim+++ /dev/null@@ -1,27 +0,0 @@-- if has_header?- - unless notitle- h1 =header.title- - if [:author, :revnumber, :revdate, :revremark].any? {|a| attr? a }- .details- - if attr? :author- span.author#author =(attr :author)- br- - if attr? :email- span.email#email =sub_macros(attr :email)- br- - if (authorcount = (attr :authorcount).to_i) > 1- - (2..authorcount).each do |idx|- span.author id="author#{idx}" =(attr "author_#{idx}")- br- - if attr? "email_#{idx}"- span.email id="email#{idx}" =sub_macros(attr "email_#{idx}")- - if attr? :revnumber- span#revnumber #{((attr 'version-label') || '').downcase} #{attr :revnumber}#{',' if attr? :revdate}- '- - if attr? :revdate- time#revdate datetime=revdate_iso =(attr :revdate)- - if attr? :revremark- br- span#revremark =(attr :revremark)-- if (attr? :toc) && (attr? 'toc-placement', 'auto')- include _toc.htmldiff --git a/solr/solr-ref-guide/src/_templates/_qanda.html.slim b/solr/solr-ref-guide/src/_templates/_qanda.html.slimdeleted file mode 100644index 2cf70cbd015..00000000000--- a/solr/solr-ref-guide/src/_templates/_qanda.html.slim+++ /dev/null@@ -1,12 +0,0 @@-= block_with_title :class=>'qlist qanda', :role=>'doc-qna'- dl.qanda- - items.each do |questions, answer|- - [*questions].each do |question|- dt.qanda-question =question.text- - unless answer.nil?- dd.qanda-answer- - if answer.text?- = html_tag_if answer.blocks?, :p- =answer.text- - if answer.blocks?- =answer.contentdiff --git a/solr/solr-ref-guide/src/_templates/_toc.html.slim b/solr/solr-ref-guide/src/_templates/_toc.html.slimdeleted file mode 100644index 9cb28b5358a..00000000000--- a/solr/solr-ref-guide/src/_templates/_toc.html.slim+++ /dev/null@@ -1,4 +0,0 @@-nav#toc class=(attr 'toc-class', 'toc') role='doc-toc'- h2#toc-title =(attr 'toc-title')- / Renders block_outline.html.- = converter.convert document, 'outline'diff --git a/solr/solr-ref-guide/src/_templates/colist.html.slim b/solr/solr-ref-guide/src/_templates/colist.html.slimdeleted file mode 100644index 0e5c7b7a681..00000000000--- a/solr/solr-ref-guide/src/_templates/colist.html.slim+++ /dev/null@@ -1,8 +0,0 @@-= block_with_title class: ['colist', style]- table- - items.to_enum.with_index 1 do |item, num|- tr- td- i.conum data-value=num- b =num- td =item.textdiff --git a/solr/solr-ref-guide/src/_templates/dlist.html.slim b/solr/solr-ref-guide/src/_templates/dlist.html.slimdeleted file mode 100644index bd7698db300..00000000000--- a/solr/solr-ref-guide/src/_templates/dlist.html.slim+++ /dev/null@@ -1,13 +0,0 @@-- case style-- when 'qanda'- include _qanda.html-- when 'horizontal'- include _hdlist.html-- else- = block_with_title :class=>['dlist', style]- dl- - items.each do |terms, dd|- - [*terms].each do |dt|- dt =dt.text- - unless dd.nil?- dd =(print_item_content dd)diff --git a/solr/solr-ref-guide/src/_templates/document.html.slim b/solr/solr-ref-guide/src/_templates/document.html.slimdeleted file mode 100644index 2390a8b343d..00000000000--- a/solr/solr-ref-guide/src/_templates/document.html.slim+++ /dev/null@@ -1,30 +0,0 @@-doctype 5-html lang=(attr :lang, 'en' unless attr? :nolang)- head- meta charset=(attr :encoding, 'UTF-8')- /[if IE]- meta http-equiv="X-UA-Compatible" content="IE=edge"- meta name='viewport' content='width=device-width, initial-scale=1.0'- meta name='generator' content="Asciidoctor #{attr 'asciidoctor-version'}"- = html_meta_if 'application-name', (attr 'app-name')- = html_meta_if 'author', (attr :authors)- = html_meta_if 'copyright', (attr :copyright)- = html_meta_if 'description', (attr :description)- = html_meta_if 'keywords', (attr :keywords)- title=((doctitle sanitize: true) || (attr 'untitled-label'))- = styles_and_scripts- - unless (docinfo_content = docinfo).empty?- =docinfo_content- body [- id=id- class=[(attr :doctype), ("#{attr 'toc-class'} toc-#{attr 'toc-position', 'left'}" if (attr? 'toc-class') && (attr? :toc) && (attr? 'toc-placement', 'auto'))]- style=style_value(max_width: (attr 'max-width')) ]- - unless noheader- header- include _header.html- #content =content- - unless !footnotes? || (attr? :nofootnotes)- include _footnotes.html- - unless nofooter- footer- include _footer.htmldiff --git a/solr/solr-ref-guide/src/_templates/helpers.rb b/solr/solr-ref-guide/src/_templates/helpers.rbdeleted file mode 100644index 0f4a7c49b18..00000000000--- a/solr/solr-ref-guide/src/_templates/helpers.rb+++ /dev/null@@ -1,670 +0,0 @@-require 'date' unless RUBY_PLATFORM == 'opal'--# Add custom functions to this module that you want to use in your Slim-# templates. Within the template you can invoke them as top-level functions-# just like in Haml.-module Slim::Helpers-- # URIs of external assets.- FONT_AWESOME_URI = '//cdn.jsdelivr.net/npm/[email protected]/css/font-awesome.min.css'- HIGHLIGHTJS_BASE_URI = '//cdn.jsdelivr.net/gh/highlightjs/[email protected]/build/'- KATEX_CSS_URI = '//cdn.jsdelivr.net/npm/[email protected]/dist/katex.min.css'- KATEX_JS_URI = '//cdn.jsdelivr.net/npm/[email protected]/dist/katex.min.js'-- # Defaults- DEFAULT_HIGHLIGHTJS_THEME = 'github'- DEFAULT_SECTNUMLEVELS = 3- DEFAULT_TOCLEVELS = 2-- KATEX_RENDER_CODE = <<-JS.gsub(/\s+/, ' ')- document.addEventListener("DOMContentLoaded", function() {- var elements = document.getElementsByClassName("math");- for (var i = 0; i < elements.length; i++) {- var el = elements[i];- if (el.getAttribute("data-lang") !== "tex") {- continue;- }- katex.render(el.textContent.slice(2, -2), el, {- "displayMode": el.nodeName.toUpperCase() !== "SPAN",- "throwOnError": false,- });- }- });- JS-- VOID_ELEMENTS = %w(area base br col command embed hr img input keygen link- meta param source track wbr)--- # @return [Logger]- def log- @_html5s_logger ||= ::Asciidoctor::Html5s::Logging.default_logger- end-- ##- # Captures the given block for later yield.- #- # @example Basic capture usage.- # - capture- # img src=image_uri- # - if title?- # figure.image- # - yield_capture- # figcaption =captioned_title- # - else- # - yield_capture- #- # @example Capture with passing parameters.- # - capture do |id|- # img src=image_uri- # - if title?- # figure id=@id- # - yield_capture- # figcaption =caption- # - else- # - yield_capture @id- #- # @see yield_capture- def capture(&block)- @_html5s_capture = block- nil- end-- ##- # Yields the captured block (see {#capture}).- #- # @param *params parameters to pass to the block.- # @return A content of the captured block.- # @see capture- def yield_capture(*params)- @_html5s_capture.call(*params) if @_html5s_capture- end-- ##- # Creates an HTML tag with the given name and optionally attributes. Can take- # a block that will run between the opening and closing tags.- #- # @param name [#to_s] the name of the tag.- # @param attributes [Hash] (default: {})- # @param content [#to_s] the content; +nil+ to call the block. (default: nil).- # @yield The block of Slim/HTML code within the tag (optional).- # @return [String] a rendered HTML element.- #- def html_tag(name, attributes = {}, content = nil)- attrs = attributes.inject([]) do |attrs, (k, v)|- next attrs if !v || v.nil_or_empty?- v = v.compact.join(' ') if v.is_a? Array- attrs << (v == true ? k : %(#{k}="#{v}"))- end- attrs_str = attrs.empty? ? '' : ' ' + attrs.join(' ')-- if VOID_ELEMENTS.include? name.to_s- %(<#{name}#{attrs_str}>)- else- content ||= yield if block_given?- %(<#{name}#{attrs_str}>#{content}</#{name}>)- end- end-- ##- # Conditionally wraps a block in an element. If condition is +true+ then it- # renders the specified tag with optional attributes and the given- # block inside, otherwise it just renders the block.- #- # For example:- #- # = html_tag_if link?, 'a', {class: 'image', href: (attr :link)}- # img src='./img/tux.png'- #- # will produce:- #- # <a href="http://example.org" class="image">- # <img src="./img/tux.png">- # </a>- #- # if +link?+ is truthy, and just- #- # <img src="./img/tux.png">- #- # otherwise.- #- # @param condition [Boolean] the condition to test to determine whether to- # render the enclosing tag.- # @param name (see #html_tag)- # @param attributes (see #html_tag)- # @param content (see #html_tag)- # @yield (see #html_tag)- # @return [String] a rendered HTML fragment.- #- def html_tag_if(condition, name, attributes = {}, content = nil, &block)- if condition- html_tag name, attributes, content, &block- else- content || yield- end- end-- ##- # Wraps a block in a div element with the specified class and optionally- # the node's +id+ and +role+(s). If the node's +title+ is not empty, then a- # nested div with the class "title" and the title's content is added as well.- #- # @example When @id, @role and @title attributes are set.- # = block_with_title :class=>['quote-block', 'center']- # blockquote =content- #- # <section id="myid" class="quote-block center myrole1 myrole2">- # <h6>Block Title</h6>- # <blockquote>Lorem ipsum</blockquote>- # </section>- #- # @example When @id, @role and @title attributes are empty.- # = block_with_title :class=>'quote-block center', :style=>style_value(float: 'left')- # blockquote =content- #- # <div class="quote-block center" style="float: left;">- # <blockquote>Lorem ipsum</blockquote>- # </div>- #- # @example When shorthand style for class attribute is used.- # = block_with_title 'quote-block center'- # blockquote =content- #- # <div class="quote-block center">- # <blockquote>Lorem ipsum</blockquote>- # </div>- #- # @param attrs [Hash, String] the tag's attributes as Hash),- # or the tag's class if it's not a Hash.- # @param title [String, nil] the title.- # @yield The block of Slim/HTML code within the tag (optional).- # @return [String] a rendered HTML fragment.- #- def block_with_title(attrs = {}, title = @title, &block)- if (klass = attrs[:class]).is_a? String- klass = klass.split(' ')- end- attrs[:class] = [klass, role].flatten.uniq- attrs[:id] = id-- if title.nil_or_empty?- # XXX quick hack- nested = is_a?(::Asciidoctor::List) &&- (parent.is_a?(::Asciidoctor::ListItem) || parent.is_a?(::Asciidoctor::List))- html_tag_if !nested, :div, attrs, yield- else- html_tag :section, attrs do- [html_tag(:h6, {class: 'block-title'}, title), yield].join("\n")- end- end- end-- def block_with_caption(position = :bottom, attrs = {}, &block)- if (klass = attrs[:class]).is_a? String- klass = klass.split(' ')- end- attrs[:class] = [klass, role].flatten.uniq- attrs[:id] = id-- if title.nil_or_empty?- html_tag :div, attrs, yield- else- html_tag :figure, attrs do- ary = [yield, html_tag(:figcaption) { captioned_title }]- ary.reverse! if position == :top- ary.compact.join("\n")- end- end- end-- ##- # Delimite the given equation as a STEM of the specified type.- #- # Note: This is not needed nor used for KaTeX, but keep this for the case- # user wants to use a different method.- #- # @param equation [String] the equation to delimite.- # @param type [#to_sym] the type of the STEM renderer (latexmath, or asciimath).- # @return [String] the delimited equation.- #- def delimit_stem(equation, type)- if (@_html5s_stem_type ||= document.attr('html5s-force-stem-type'))- type = @_html5s_stem_type- end-- if is_a? ::Asciidoctor::Block- open, close = ::Asciidoctor::BLOCK_MATH_DELIMITERS[type.to_sym]- else- open, close = ::Asciidoctor::INLINE_MATH_DELIMITERS[type.to_sym]- end-- if !equation.start_with?(open) || !equation.end_with?(close)- equation = [open, equation, close].join- end- equation- end-- ##- # Formats the given hash as CSS declarations for an inline style.- #- # @example- # style_value(text_align: 'right', float: 'left')- # => "text-align: right; float: left;"- #- # style_value(text_align: nil, float: 'left')- # => "float: left;"- #- # style_value(width: [90, '%'], height: '50px')- # => "width: 90%; height: 50px;"- #- # style_value(width: ['120px', 'px'])- # => "width: 90px;"- #- # style_value(width: [nil, 'px'])- # => nil- #- # @param declarations [Hash]- # @return [String, nil]- #- def style_value(declarations)- decls = []-- declarations.each do |prop, value|- next if value.nil?-- if value.is_a? Array- value, unit = value- next if value.nil?- value = value.to_s + unit unless value.end_with? unit- end- prop = prop.to_s.gsub('_', '-')- decls << "#{prop}: #{value}"- end-- decls.empty? ? nil : decls.join('; ') + ';'- end-- def urlize(*segments)- path = segments * '/'- if path.start_with? '//'- @_html5s_uri_scheme ||= document.attr('asset-uri-scheme', 'https')- path = "#{@_html5s_uri_scheme}:#{path}" unless @_html5s_uri_scheme.empty?- end- normalize_web_path path- end--- ##- # Gets the value of the specified attribute in this node.- #- # This is just an alias for +attr+ method with disabled _inherit_ to make it- # more clear.- #- # @param name [String, Symbol] the name of the attribute to lookup.- # @param default_val the value to return if the attribute is not found.- # @return value of the attribute or +default_val+ if not found.- #- def local_attr(name, default_val = nil)- attr(name, default_val, false)- end-- ##- # Checks if the attribute is defined on this node, optionally performing- # a comparison of its value if +expect_val+ is not nil.- #- # This is just an alias for +attr?+ method with disabled _inherit_ to make it- # more clear.- #- # @param name [String, Symbol] the name of the attribute to lookup.- # @param default_val the expected value of the attribute.- # @return [Boolean] whether the attribute exists and, if +expect_val+ is- # specified, whether the value of the attribute matches the +expect_val+.- #- def local_attr?(name, expect_val = nil)- attr?(name, expect_val, false)- end-- ##- # @param index [Integer] the footnote's index.- # @return [String] footnote id to be used in a link.- def footnote_id(index = local_attr(:index))- "_footnote_#{index}"- end-- ##- # @param index (see #footnote_id)- # @return [String] footnoteref id to be used in a link.- def footnoteref_id(index = local_attr(:index))- "_footnoteref_#{index}"- end-- def nowrap?- 'nowrap' if !document.attr?(:prewrap) || option?('nowrap')- end-- def print_item_content(item)- wrap = item.blocks? && !item.blocks.all? { |b| b.is_a? ::Asciidoctor::List }- [ (html_tag_if(wrap, :p) { item.text } if item.text?), item.content ].join- end-- ##- # Returns corrected section level.- #- # @param sec [Asciidoctor::Section] the section node (default: self).- # @return [Integer]- #- def section_level(sec = self)- (sec.level == 0 && sec.special) ? 1 : sec.level- end-- ##- # Returns the captioned section's title, optionally numbered.- #- # @param sec [Asciidoctor::Section] the section node (default: self).- # @return [String]- #- def section_title(sec = self)- sectnumlevels = document.attr(:sectnumlevels, DEFAULT_SECTNUMLEVELS).to_i-- if sec.numbered && !sec.caption && sec.level <= sectnumlevels- [sec.sectnum, sec.captioned_title].join(' ')- else- sec.captioned_title- end- end-- ##- # @return [String] language of STEM block or inline node (tex or asciimath).- def stem_lang- value = (inline? ? type : style).to_s- value == 'latexmath' ? 'tex' : value- end-- def link_rel- 'noopener' if option?('noopener') || attr(:window) == '_blank'- end-- #--------------------------------------------------------- # block_admonition- #-- ##- # @return [Boolean] should be this admonition wrapped in aside element?- def admonition_aside?- %w[note tip].include? attr(:name)- end-- ##- # @return [String, nil] WAI-ARIA role of this admonition.- def admonition_aria- case attr(:name)- when 'note'- 'note' # https://www.w3.org/TR/wai-aria/roles#note- when 'tip'- 'doc-tip' # https://www.w3.org/TR/dpub-aria-1.0/#doc-tip- when 'caution', 'important', 'warning'- 'doc-notice' # https://www.w3.org/TR/dpub-aria-1.0/#doc-notice- end- end-- #--------------------------------------------------------- # block_listing- #-- ##- # @return [String] a canonical name of the source-highlighter to be used as- # a style class.- def highlighter- @_html5s_highlighter ||=- case (highlighter = document.attr('source-highlighter'))- when 'coderay'; 'CodeRay'- when 'highlight.js'; 'highlightjs'- else highlighter- end- end-- ##- # Returns the callout list attached to this listing node, or +nil+ if none.- #- # Note: This variable is set by extension- # {Asciidoctor::Html5s::AttachedColistTreeprocessor}.- #- # @return [Asciidoctor::List, nil]- def callout_list- @html5s_colist- end-- def source_lang- local_attr :language, false- end-- #--------------------------------------------------------- # block_open- #-- ##- # Returns +true+ if an abstract block is allowed in this document type,- # otherwise prints warning and returns +false+.- def abstract_allowed?- if result = (parent == document && document.doctype == 'book')- log.warn 'asciidoctor: WARNING: abstract block cannot be used in a document-without a title when doctype is book. Excluding block content.'- end- !result- end-- ##- # Returns +true+ if a partintro block is allowed in this context, otherwise- # prints warning and returns +false+.- def partintro_allowed?- if result = (level != 0 || parent.context != :section || document.doctype != 'book')- log.warn "asciidoctor: ERROR: partintro block can only be used when doctype-is book and it's a child of a book part. Excluding block content."- end- !result- end-- #--------------------------------------------------------- # block_table- #-- def autowidth?- option? :autowidth- end-- def stretch?- if !autowidth? || local_attr?('width')- 'stretch' if attr? :tablepcwidth, 100- end- end-- #--------------------------------------------------------- # block_video- #-- # @return [Boolean] +true+ if the video should be embedded in an iframe.- def video_iframe?- ['vimeo', 'youtube'].include? attr(:poster)- end-- def video_uri- case attr(:poster, '').to_sym- when :vimeo- params = {- autoplay: (1 if option? 'autoplay'),- loop: (1 if option? 'loop')- }- start_anchor = "#at=#{attr :start}" if attr? :start- "//player.vimeo.com/video/#{attr :target}#{start_anchor}#{url_query params}"-- when :youtube- video_id, list_id = attr(:target).split('/', 2)- params = {- rel: 0,- start: (attr :start),- end: (attr :end),- list: (attr :list, list_id),- autoplay: (1 if option? 'autoplay'),- loop: (1 if option? 'loop'),- controls: (0 if option? 'nocontrols')- }- "//www.youtube.com/embed/#{video_id}#{url_query params}"- else- anchor = [attr(:start), attr(:end)].join(',').chomp(',')- anchor = '#t=' + anchor unless anchor.empty?- media_uri "#{attr :target}#{anchor}"- end- end-- # Formats URL query parameters.- def url_query(params)- str = params.map { |k, v|- next if v.nil? || v.to_s.empty?- [k, v] * '='- }.compact.join('&')-- '?' + str unless str.empty?- end-- #--------------------------------------------------------- # document- #-- ##- # @return [String, nil] the revision date in ISO 8601, or nil if not- # available or in invalid format.- def revdate_iso- ::Date.parse(revdate).iso8601 if defined? ::Date- rescue ArgumentError- nil- end-- ##- # Returns HTML meta tag if the given +content+ is not +nil+.- #- # @param name [#to_s] the name for the metadata.- # @param content [#to_s, nil] the value of the metadata, or +nil+.- # @return [String, nil] the meta tag, or +nil+ if the +content+ is +nil+.- #- def html_meta_if(name, content)- %(<meta name="#{name}" content="#{content}">) if content- end-- # Returns formatted style/link and script tags for header.- def styles_and_scripts- scripts = []- styles = []- tags = []-- stylesheet = attr :stylesheet- stylesdir = attr :stylesdir, ''- default_style = ::Asciidoctor::DEFAULT_STYLESHEET_KEYS.include? stylesheet- linkcss = attr?(:linkcss) || safe >= ::Asciidoctor::SafeMode::SECURE- ss = ::Asciidoctor::Stylesheets.instance-- if linkcss- path = default_style ? ::Asciidoctor::DEFAULT_STYLESHEET_NAME : stylesheet- styles << { href: [stylesdir, path] }- elsif default_style- styles << { text: ss.primary_stylesheet_data }- else- styles << { text: read_asset(normalize_system_path(stylesheet, stylesdir), true) }- end-- if attr? :icons, 'font'- if attr? 'iconfont-remote'- styles << { href: attr('iconfont-cdn', FONT_AWESOME_URI) }- else- styles << { href: [stylesdir, "#{attr 'iconfont-name', 'font-awesome'}.css"] }- end- end-- if attr? 'stem'- styles << { href: KATEX_CSS_URI }- scripts << { src: KATEX_JS_URI }- scripts << { text: KATEX_RENDER_CODE }- end-- case attr 'source-highlighter'- when 'coderay'- if attr('coderay-css', 'class') == 'class'- if linkcss- styles << { href: [stylesdir, ss.coderay_stylesheet_name] }- else- styles << { text: ss.coderay_stylesheet_data }- end- end-- when 'highlightjs'- hjs_base = attr :highlightjsdir, HIGHLIGHTJS_BASE_URI- hjs_theme = attr 'highlightjs-theme', DEFAULT_HIGHLIGHTJS_THEME-- scripts << { src: [hjs_base, 'highlight.min.js'] }- scripts << { text: 'hljs.initHighlightingOnLoad()' }- styles << { href: [hjs_base, "styles/#{hjs_theme}.min.css"] }- end-- styles.each do |item|- if item.key?(:text)- tags << html_tag(:style) { item[:text] }- else- tags << html_tag(:link, rel: 'stylesheet', href: urlize(*item[:href]))- end- end-- scripts.each do |item|- if item.key? :text- tags << html_tag(:script, type: item[:type]) { item[:text] }- else- tags << html_tag(:script, type: item[:type], src: urlize(*item[:src]))- end- end-- tags.join("\n")- end-- #--------------------------------------------------------- # inline_anchor- #-- # @return [String] text of the xref anchor.- def xref_text- str =- if text- text- elsif (path = local_attr :path)- path- elsif document.respond_to? :catalog # Asciidoctor >=1.5.6- ref = document.catalog[:refs][attr :refid]- if ref.kind_of? Asciidoctor::AbstractNode- ref.xreftext((@_html5s_xrefstyle ||= document.attributes['xrefstyle']))- end- else # Asciidoctor < 1.5.6- document.references[:ids][attr :refid || target]- end- (str || "[#{attr :refid}]").tr_s("\n", ' ')- end-- # @return [String, nil] text of the bibref anchor, or +nil+ if not found.- def bibref_text- if document.respond_to? :catalog # Asciidoctor >=1.5.6- # NOTE: Technically it should be `reftext`, but subs have already been applied to text.- text- else- "[#{target}]"- end- end-- #--------------------------------------------------------- # inline_image- #-- # @return [Array] style classes for a Font Awesome icon.- def icon_fa_classes- [ "fa fa-#{target}",- ("fa-#{attr :size}" if attr? :size),- ("fa-rotate-#{attr :rotate}" if attr? :rotate),- ("fa-flip-#{attr :flip}" if attr? :flip)- ].compact- end-enddiff --git a/solr/solr-ref-guide/src/_templates/image.html.slim b/solr/solr-ref-guide/src/_templates/image.html.slimdeleted file mode 100644index 4b31940d597..00000000000--- a/solr/solr-ref-guide/src/_templates/image.html.slim+++ /dev/null@@ -1,3 +0,0 @@-= block_with_caption(:bottom, :class=>'imageblock', :style=>style_value(text_align: (attr :align), float: (attr :float)))- = html_tag_if(attr?(:link), :a, :class=>'image', :href=>(attr :link), :target=>(attr :window), :rel=>link_rel)- img src=image_uri(attr :target) alt=(attr :alt) width=(attr :width) height=(attr :height)diff --git a/solr/solr-ref-guide/src/_templates/inline_anchor.html.slim b/solr/solr-ref-guide/src/_templates/inline_anchor.html.slimdeleted file mode 100644index 0e9e8c3e0db..00000000000--- a/solr/solr-ref-guide/src/_templates/inline_anchor.html.slim+++ /dev/null@@ -1,12 +0,0 @@-- case type-- when :xref- a href=target =xref_text-- when :ref- / "target" is for backward compat. with Asciidoctor <1.5.6- a id=(id || target) aria-hidden='true'-- when :bibref- / "target" is for backward compat. with Asciidoctor <1.5.6- a id=(id || target) aria-hidden='true'- =bibref_text-- else- a id=id class=role href=target target=(attr :window) rel=link_rel title=(attr :title) =textdiff --git a/solr/solr-ref-guide/src/_templates/inline_break.html.slim b/solr/solr-ref-guide/src/_templates/inline_break.html.slimdeleted file mode 100644index b2bf490f6c2..00000000000--- a/solr/solr-ref-guide/src/_templates/inline_break.html.slim+++ /dev/null@@ -1,2 +0,0 @@-=text-brdiff --git a/solr/solr-ref-guide/src/_templates/inline_button.html.slim b/solr/solr-ref-guide/src/_templates/inline_button.html.slimdeleted file mode 100644index 5ab5b061eea..00000000000--- a/solr/solr-ref-guide/src/_templates/inline_button.html.slim+++ /dev/null@@ -1 +0,0 @@-b.button =textdiff --git a/solr/solr-ref-guide/src/_templates/inline_callout.html.slim b/solr/solr-ref-guide/src/_templates/inline_callout.html.slimdeleted file mode 100644index 23424c6a7b8..00000000000--- a/solr/solr-ref-guide/src/_templates/inline_callout.html.slim+++ /dev/null@@ -1 +0,0 @@-i.conum data-value=textdiff --git a/solr/solr-ref-guide/src/_templates/inline_footnote.html.slim b/solr/solr-ref-guide/src/_templates/inline_footnote.html.slimdeleted file mode 100644index e7bdaffaa46..00000000000--- a/solr/solr-ref-guide/src/_templates/inline_footnote.html.slim+++ /dev/null@@ -1,9 +0,0 @@-- if (index = local_attr :index)- a.footnote-ref [- id=(footnoteref_id unless type == :xref)- href="##{footnote_id}"- title="View footnote #{index}"- role='doc-noteref' ]- | [#{index}]-- else- a.footnote-ref.broken title="Unresolved footnote reference." [#{text}]diff --git a/solr/solr-ref-guide/src/_templates/inline_image.html.slim b/solr/solr-ref-guide/src/_templates/inline_image.html.slimdeleted file mode 100644index 4575cd981f0..00000000000--- a/solr/solr-ref-guide/src/_templates/inline_image.html.slim+++ /dev/null@@ -1,10 +0,0 @@-= html_tag_if((attr? :link), :a, :class=>'image', :href=>(attr :link), :target=>(attr :window), :rel=>link_rel)- - if type == 'icon' && (document.attr? :icons, 'font')- i class=[*icon_fa_classes, role] title=(attr :title)- - elsif type == 'icon' && !(document.attr? :icons)- b class=['icon', role] title=(attr :title)- | [#{attr :alt}]- - else- img (src=(type == 'icon' ? (icon_uri target) : (image_uri target))- alt=(attr :alt) width=(attr :width) height=(attr :height) title=(attr :title)- class=[(type if type != 'image'), role] style=style_value(float: (attr :float)))diff --git a/solr/solr-ref-guide/src/_templates/inline_indexterm.html.slim b/solr/solr-ref-guide/src/_templates/inline_indexterm.html.slimdeleted file mode 100644index a9a3902c5d1..00000000000--- a/solr/solr-ref-guide/src/_templates/inline_indexterm.html.slim+++ /dev/null@@ -1,2 +0,0 @@-- if type == :visible- =textdiff --git a/solr/solr-ref-guide/src/_templates/inline_kbd.html.slim b/solr/solr-ref-guide/src/_templates/inline_kbd.html.slimdeleted file mode 100644index bf05e4656c1..00000000000--- a/solr/solr-ref-guide/src/_templates/inline_kbd.html.slim+++ /dev/null@@ -1,7 +0,0 @@-- if (keys = attr 'keys').size == 1- kbd =keys.first-- else- kbd.keyseq- - keys.each_with_index do |key, idx|- ="+" unless idx.zero?- kbd =keydiff --git a/solr/solr-ref-guide/src/_templates/inline_menu.html.slim b/solr/solr-ref-guide/src/_templates/inline_menu.html.slimdeleted file mode 100644index ba98b610239..00000000000--- a/solr/solr-ref-guide/src/_templates/inline_menu.html.slim+++ /dev/null@@ -1,15 +0,0 @@-- if local_attr :menuitem- - capture- |  - b.caret ›- span.menuseq- b.menu- =(attr :menu)- - yield_capture- - (attr 'submenus').each do |submenu|- b.submenu- =submenu- - yield_capture- b.menuitem =(local_attr :menuitem)-- else- b.menuref =(attr :menu)diff --git a/solr/solr-ref-guide/src/_templates/inline_quoted.html.slim b/solr/solr-ref-guide/src/_templates/inline_quoted.html.slimdeleted file mode 100644index aecb877b946..00000000000--- a/solr/solr-ref-guide/src/_templates/inline_quoted.html.slim+++ /dev/null@@ -1,29 +0,0 @@-- unless id.nil?- a id=id aria-hidden='true'-- case type-- when :emphasis- em class=role =text-- when :strong- strong class=role =text-- when :monospaced- code class=role =text-- when :superscript- sup class=role =text-- when :subscript- sub class=role =text-- when :mark- mark class=role =text-- when :double- = html_tag_if role?, :span, :class=>role- | “#{text}”-- when :single- = html_tag_if role?, :span, :class=>role- | ‘#{text}’-- when :asciimath, :latexmath- span.math data-lang=stem_lang =(delimit_stem text, type)-- else- - if role == 'line-through' || role == 'del'- del =text- - else- = html_tag_if role?, :span, :class=>role- =textdiff --git a/solr/solr-ref-guide/src/_templates/listing.html.slim b/solr/solr-ref-guide/src/_templates/listing.html.slimdeleted file mode 100644index 47eb4cdf579..00000000000--- a/solr/solr-ref-guide/src/_templates/listing.html.slim+++ /dev/null@@ -1,15 +0,0 @@-= block_with_caption :top, :class=>'listingblock'- - if style == 'source'- - if highlighter == 'html-pipeline'- pre: code data-lang=source_lang =content- - else- - unless highlighter == 'CodeRay'- - code_class = "language-#{source_lang}" if source_lang- pre class=[highlighter, 'highlight', ('linenums' if attr? :linenums), nowrap?]- code class=code_class data-lang=source_lang =content- - else- pre class=nowrap? =content- / Note: This is a hack to embed callout list into the listing element.- / See asciidoctor/html5s/attached_colist_treeprocessor.rb.- - if callout_list- = converter.convert callout_list, 'colist'diff --git a/solr/solr-ref-guide/src/_templates/literal.html.slim b/solr/solr-ref-guide/src/_templates/literal.html.slimdeleted file mode 100644index 3ef27b99244..00000000000--- a/solr/solr-ref-guide/src/_templates/literal.html.slim+++ /dev/null@@ -1,2 +0,0 @@-= block_with_title :class=>'literalblock'- pre class=nowrap? =contentdiff --git a/solr/solr-ref-guide/src/_templates/olist.html.slim b/solr/solr-ref-guide/src/_templates/olist.html.slimdeleted file mode 100644index 15bbfbaaeea..00000000000--- a/solr/solr-ref-guide/src/_templates/olist.html.slim+++ /dev/null@@ -1,4 +0,0 @@-= block_with_title :class=>['olist', style]- ol class=style start=(attr :start) type=list_marker_keyword reversed=(option? 'reversed')- - items.each do |item|- li =(print_item_content item)diff --git a/solr/solr-ref-guide/src/_templates/open.html.slim b/solr/solr-ref-guide/src/_templates/open.html.slimdeleted file mode 100644index 4eefd71d5a9..00000000000--- a/solr/solr-ref-guide/src/_templates/open.html.slim+++ /dev/null@@ -1,7 +0,0 @@-- if style == 'abstract'- - if abstract_allowed?- = block_with_title :class=>'quoteblock abstract'- blockquote =content-- elsif style != 'partintro' || partintro_allowed?- = block_with_title :class=>['openblock', (style if style != 'open')]- .content.d-flex.flex-row =contentdiff --git a/solr/solr-ref-guide/src/_templates/paragraph.html.slim b/solr/solr-ref-guide/src/_templates/paragraph.html.slimdeleted file mode 100644index b4a1700fd8c..00000000000--- a/solr/solr-ref-guide/src/_templates/paragraph.html.slim+++ /dev/null@@ -1,6 +0,0 @@-- if title?- section.paragraph id=id- h6.block-title =title- p class=role =content-- else- p id=id class=role =contentdiff --git a/solr/solr-ref-guide/src/_templates/preamble.html.slim b/solr/solr-ref-guide/src/_templates/preamble.html.slimdeleted file mode 100644index 7746c0a43c7..00000000000--- a/solr/solr-ref-guide/src/_templates/preamble.html.slim+++ /dev/null@@ -1,4 +0,0 @@-section#preamble aria-label='Preamble'- =content-- if (attr? :toc) && (attr? 'toc-placement', 'preamble')- include _toc.htmldiff --git a/solr/solr-ref-guide/src/_templates/quote.html.slim b/solr/solr-ref-guide/src/_templates/quote.html.slimdeleted file mode 100644index 631b4fabf52..00000000000--- a/solr/solr-ref-guide/src/_templates/quote.html.slim+++ /dev/null@@ -1,6 +0,0 @@-= block_with_title :class=>'quoteblock'- blockquote- = html_tag_if !blocks?, :p- =content- - if attr?(:attribution) || attr?(:citetitle)- include _attribution.htmldiff --git a/solr/solr-ref-guide/src/_templates/sidebar.html.slim b/solr/solr-ref-guide/src/_templates/sidebar.html.slimdeleted file mode 100644index 9c2d66b30df..00000000000--- a/solr/solr-ref-guide/src/_templates/sidebar.html.slim+++ /dev/null@@ -1,4 +0,0 @@-aside.sidebarblock id=id class=role- - if title?- h6.block-title =title- =contentdiff --git a/solr/solr-ref-guide/src/_templates/table.html.slim b/solr/solr-ref-guide/src/_templates/table.html.slimdeleted file mode 100644index 7f0f8e46275..00000000000--- a/solr/solr-ref-guide/src/_templates/table.html.slim+++ /dev/null@@ -1,39 +0,0 @@-= block_with_caption :top, :class=>'tableblock'- table [- class=["tableblock", "frame-#{attr :frame, 'all'}", "grid-#{attr :grid, 'all'}", "stripes-#{attr :stripes, 'even'}", stretch?]- style=style_value(width: ("#{attr :tablepcwidth}%" if !autowidth? && !stretch? || (local_attr :width)),- float: (attr :float)) ]- - unless (attr :rowcount).zero?- colgroup- - if autowidth?- - columns.each do- col- - else- - columns.each do |col|- col style="width: #{col.attr :colpcwidth}%;"- - [:head, :foot, :body].reject { |tblsec| rows[tblsec].empty? }.each do |tblsec|- <t#{tblsec}>- - rows[tblsec].each do |row|- tr- - row.each do |cell|- = html_tag(tblsec == :head || cell.style == :header ? 'th' : 'td',- :class=>["tableblock", "halign-#{cell.attr :halign}", "valign-#{cell.attr :valign}"],- :colspan=>cell.colspan,- :rowspan=>cell.rowspan,- :style=>style_value(background_color: (document.attr :cellbgcolor)))- - if tblsec == :head- =cell.text- - else- - case cell.style- - when :asciidoc- =cell.content- - when :verse- .verse: pre =cell.text- - when :literal- .literal: pre =cell.text- - else- - if cell.content.one?- =cell.content.first- - else- - cell.content.each do |text|- p =textdiff --git a/solr/solr-ref-guide/src/_templates/toc.html.slim b/solr/solr-ref-guide/src/_templates/toc.html.slimdeleted file mode 100644index ec17b271bb4..00000000000--- a/solr/solr-ref-guide/src/_templates/toc.html.slim+++ /dev/null@@ -1,11 +0,0 @@-/ This template is used only for toc::[] macro; for document and preamble TOC-/ see document.html, preamble.html and _toc.html.-- if document.attr?(:toc) && document.sections?- - toc_id = id || ('toc' if document.embedded? || !document.attr?('toc-placement'))- nav id=toc_id class=(attr :role, (document.attr 'toc-class', 'toc')) role='doc-toc'- h level=(level + 2) id=("#{toc_id}-title" if toc_id)- =(title || (document.attr 'toc-title'))- / Renders outline.html.- = converter.convert document, 'outline', :toclevels=>((attr :levels).to_i if attr? :levels)-- else- /! toc disableddiff --git a/solr/solr-ref-guide/src/_templates/ulist.html.slim b/solr/solr-ref-guide/src/_templates/ulist.html.slimdeleted file mode 100644index 5ffce013e39..00000000000--- a/solr/solr-ref-guide/src/_templates/ulist.html.slim+++ /dev/null@@ -1,11 +0,0 @@-- checklist = 'task-list' if option? 'checklist'-= block_with_title :class=>['ulist', style]- ul class=(checklist || style)- - items.each do |item|- - if checklist && (item.attr? :checkbox)- li.task-list-item- input.task-list-item-checkbox type='checkbox' disabled=true checked=(item.attr? :checked)- =<item.text- - else- li: p- =(print_item_content item)diff --git a/solr/solr-ref-guide/src/css/decoration.css b/solr/solr-ref-guide/src/css/decoration.cssdeleted file mode 100644index b9bc1947e2d..00000000000--- a/solr/solr-ref-guide/src/css/decoration.css+++ /dev/null@@ -1,288 +0,0 @@-/** This CSS defines decoration elements, such as buttons, input boxes,- bootstrap-based components (pills, jumbotrons), horizontal lines, leads **/--/** === BUTTONS & FORM ELEMENTS === **/--/* Used for bottom scrollnav buttons */-.btn-primary {- color: #D9411E;- background-color: transparent;- border-color: #CDCECF;- font-weight: bold;-}--/* Used for bottom scrollnav buttons */-.btn-primary:hover,-.btn-primary:focus,-.btn-primary:active,-.btn-primary.active,-.open .dropdown-toggle.btn-primary {- background-color: #D9411E;- border-color: #CDCECF;-}--/* used for query parser labels in query-parameters.adoc */--.badge-lucene {- background-color: #6F8061;- color: white;-}--.badge-dismax {- background-color: #305CB3;- color: white;-}--.badge-edismax {- background-color: #FF833D;- color: white;-}--input-{- margin: 0;- font-size: 100%;- font-family: inherit;- line-height: normal;-}--input::-moz-focus-inner-{- padding: 0;- border: 0;-}--.keyseq-{- color: rgba(51,51,51,.8);-}--kbd-{- display: inline-block;- margin: -.15em .15em 0 .15em;- padding: .2em .6em .2em .5em;- border: 1px solid #ccc;- -webkit-border-radius: 3px;- border-radius: 3px;- background-color: #f7f7f7;- -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.2),- 0 0 0 .1em white inset;- box-shadow: 0 1px 0 rgba(0,0,0,.2),- 0 0 0 .1em #fff inset;- color: rgba(0,0,0,.8);- vertical-align: middle;- white-space: nowrap;- font-size: .75em;- line-height: 1.4;-}--.keyseq kbd:first-child-{- margin-left: 0;-}--.keyseq kbd:last-child-{- margin-right: 0;-}--.menu,-.menuseq-{- color: rgba(0,0,0,.8);-}--b.button:after,-b.button:before-{- position: relative;- top: -1px;- font-weight: 400;-}--b.button:before-{- padding: 0 3px 0 2px;- content: '[';-}--b.button:after-{- padding: 0 2px 0 3px;- content: ']';-}-/** === END BUTTONS & FORM ELEMENTS === **/--/** === BOOTSTRAP TABS/PILLS === **/--.nav-tabs .nav-link.active,-.nav-tabs .nav-link.active:hover,-.nav-tabs .nav-link.active:focus,-.nav-pills .nav-link.active,-.nav-pills .nav-link.active:hover,-.nav-pills .nav-link.active:focus- {- background-color: #D9411E;- color: white;-}--ul.nav.nav-pills li {- margin-left: 5px;-}--.nav-pills > li {- float: left;-}--.nav-pills > li > a {- border-radius: 5px;- background-color: #f1f1f1-}--.nav-pills > li > a {- line-height: 30px;-}--.nav-pills > li + li {- margin-left: 2px;-}--.tab-content {- padding: 0px;-}--.tab-content > .tab-pane,-.tab-content > .content > .tab-pane,-.pill-content > .pill-pane,-.tab-content > .content > .tab-pane {- display: none;-}--.tab-content > .active,-.tab-content > .content > .active,-.pill-content > .active {- display: block;-}--/* CT 16 jan 2020: think these are not used */-a.list-group-item.active > .badge,-.nav-pills > .nav-link.active > .badge {- color: #74ab50;- background-color: #ffffff;-}-.nav-pills > .nav-link > .badge {- margin-left: 3px;-}--/** === END BOOTSTRAP TABS/PILLS === **/--/** === LEAD PARAGRAPHS === **/--/* Defines size and line height for "lead" type sections, the first sentence of a page. */-#preamble > .sectionbody > .paragraph:first-of-type p,-.paragraph.lead > p,-p.lead,-#preamble > p:first-of-type-{- font-size: 1.21875em;- line-height: 1.6;-}--/* Defines color for "lead" type sections, the first text on a page. */-#preamble > .sectionbody > .paragraph:first-of-type p,-.paragraph.lead > p,-#preamble > p:first-of-type-{- color: rgba(0,0,0,.85);-}---/** === BOOTSTRAP JUMBOTRONS === **/--/* Changes styling for Bootstrap "jumbotron" component used on index.html- Will be inherited by all jumbotron segments used anywhere */-aside.sidebarblock.jumbotron {- background-color: #FAFAFA;- border: solid 2px;- border-color: #D9411E;- border-radius: 6px;- margin-top: 20px;- padding-left: 60px;- padding-right: 60px;-}--.jumbotron p {- line-height: 1.4;- font-size: 1.0625rem;-}--/* Bootstrap 4 CSS sets jumbotron padding really high on larger screens;- we don't need it */-@media (min-width: 576px) {- .jumbotron {- padding: 2rem 1rem;- }-}--/* Custom headline style for use in index.html jumbotron box */-aside > .lead-homepage {- font-size: 1.21875em;- text-align: center;- font-weight: bold;-}---/** === HORIZONTAL RULES === **/--hr {- border: 0;- border-bottom: 1px dashed #ccc;- background: #999;- margin: 1.25em 0 1.1875em;- width: 90%;- height: 0;- clear: both;- border: solid #ddddd8;- border-width: 1px 0 0;- -moz-box-sizing: content-box;- box-sizing: content-box;-}-/** === END HORIZONTAL RULES === **/--/** === SECTION ANCHOR LINKS === **/--h1 .anchor::before,-h2 .anchor::before,-h3 .anchor::before,-h4 .anchor::before,-h5 .anchor::before,-h6 .anchor::before {- content: "\00a7";-}--h1 .anchor,-h2 .anchor,-h3 .anchor,-h4 .anchor,-h5 .anchor,-h6 .anchor {- position: absolute;- text-decoration: none;- width: 1.75ex;- margin-left: -1ex;- visibility: hidden;- font-size: .8em;- font-weight: 400;- padding-top: .15em;-}--h1:hover .anchor,-h2:hover .anchor,-h3:hover .anchor,-h4:hover .anchor,-h5:hover .anchor,-h6:hover .anchor {- visibility: visible;-}-/** === SECTION ANCHOR LINKS === **/diff --git a/solr/solr-ref-guide/src/css/navs.css b/solr/solr-ref-guide/src/css/navs.cssdeleted file mode 100644index 13262451c55..00000000000--- a/solr/solr-ref-guide/src/css/navs.css+++ /dev/null@@ -1,366 +0,0 @@-/** This CSS covers all navigation: sidebar, topnav,- bottom scrollnav, footer, and in-page TOCs.- Everything except the footer should be in a <nav> element. **/--/** === GENERAL NAV ELEMENTS === **/--a.dropdown-toggle,-.navbar-inverse .navbar-nav > li > a {- margin-left: 10px;-}--div.navbar-collapse .dropdown-menu > li > a:hover {- background-color: #E6E7E8;- color: #D9411E;-}-/** === END GENERAL NAV ELEMENTS === **/--/** === LEFT SIDEBAR === **/--/* The #sidebar ID is used for the sidebar as a whole */-#sidebar {- position: sticky;- top: 0;- left: 0;- height: 100vh;- z-index: 999;- background: #E6E7E8;- transition: all 0.3s;-}--.sidebar-header {- padding-left: 5px;-}--.sidebarTitle {- font-weight: bold;- font-size: 1.5em;- margin-top: 30px;- margin-bottom: 10px;- line-height: 30px;-}--/*The #mysidebar ID is only used for the Ref Guide sections part of the sidebar */--#mysidebar.nav {- width: 100%;-}--#mysidebar.nav > li {- width: 275px;-}--#mysidebar.nav ul {- background-color: white;-}--#mysidebar.nav ul li a {- background-color: white;- color: #D9411E;- border: none;-}--#mysidebar ul li a:hover {- background-color: #D9411E;- color: white;-}---@media (max-width: 990px) {- #sidebar {- position: relative;- }-}--@media (max-width: 900px) {-- ul#sidebar {- max-width: 100%;- }-}--/* These rules cover the individual items in the sidebar */--ul.nav li ul {- font-size: 10pt;-}--.nav {- margin-bottom: 0;- padding-left: 0;- list-style: none;-}-.nav {- /* padding: 4px;*/- padding:0;- margin: 0;-}--.nav:before,-.nav:after {- content: " ";- /* 1 */-- display: table;- /* 2 */--}-.nav:after {- clear: both;-}--.nav ul {- padding: 0;- margin: 0;-}--.nav,-.nav ul,-.nav li {- list-style: none;-}--.nav > li {- margin: 1px 0;-}--.nav > li li {- margin: 2px 0;-}--.nav > li.active > a {- background-color: #262130;-}---.nav a {- color: #333;- display: block;- outline: none;- text-decoration: none;-}--.nav a:hover,-.nav a:focus,-.nav li.active > a {- background-color: #D9411E;- color: white;-}--.nav ul li a {- border-top:1px solid whitesmoke;- padding-left:10px;- background-color: #FAFAFA;-}--.nav li a {- line-height: 18px;- padding: 2px 10px;-}--.nav li a {- padding-right:10px;-}--.nav > li > a {- line-height: 20px;- padding: 4px 10px;-}---.nav li > a > span {- float: right;- font-size: 19px;- font-weight: bolder;-}--.nav li > a > span:after {- content: '\002b';-}-.nav li.active > a > span:after {- content: '\2212';-}---/* end navgoco sidebar */--/* When 'solr-guide-draft-status: DRAFT' is in _config.yml, the Guide is- considered a Draft and includes a notice in the sidebar to that effect */--.sidebar-header p.draft-notice {- padding: 0px 0px 10px 0px;- margin-bottom: 10px;-}--.sidebar-header p.draft-notice a,-.sidebar-header p.draft-notice a:hover,-.sidebar-header p.draft-notice a:active .nav p.draft-notice a:focus {- display: inline;- text-decoration: underline;- position: inherit;- line-height: inherit;- padding: inherit;- background-color: inherit;-}---/* indent extra nav levels- TODO: is there any easy way to do this that just incrementally applies to anything below sb-level2?- ...w/o assuming sb-level4 is as deep as we go?-*/-ul#mysidebar li.sb-level3 a {- padding-left: 20px;-}-ul#mysidebar li.sb-level4 a {- padding-left: 40px;-}--/* Highlight currently selected page */-ul#mysidebar li.current.active > a {- background-color: #D9411E;- color: white;-}--/** === END LEFT SIDEBAR === **/---/** === TOP NAVBAR === **/--/* The <span> tag with id="projectTitle" is used in the top navbar */-span.projectTitle-{- font-weight: bold;- font-family: 'Noto Sans', sans-serif;- font-size: 14pt;- padding-left: 2px;-}--nav#topnav {- margin-left: 17%;-}--.navbar .container-fluid {- border: solid;- border-color: whitesmoke;- background-color: white;-}--/** === END TOP NAVBAR === **/--/** === TOCs === **/--nav.toc {- padding-left: 10px;- max-width: 350px;-}--nav.toc ul li {- margin: 8px 0 8px 22px;- list-style: disc;- line-height: 1.25;-}--nav.toc ul {- background-color: #f1f1f1;;- padding: 5px;- border-radius: 5px;- color: gray;-}--nav.toc ul li ul {- padding-left: 8px;-}--nav.toc ul li ul li {- list-style: circle;- margin: 5px 0 0 0;-}--nav.toc ul li ul li ul li {- list-style: square;-}--nav.toc >ul::before {- content: "On this Page";- font-weight: bold;- color: #555;- text-align:center;- margin-left:auto;- margin-right:auto;- width:70px;- padding-top:20px;- padding-bottom:20px;- padding-left:10px;-}--.toc > ul-{- margin-left: .125em;-}--.toc ul-{- list-style-type: none;- font-family: 'Noto Sans', sans-serif;-}--.toc a-{- text-decoration: none;-}--.toc a:hover-{- text-decoration: underline;-}--#content .toc > :first-child-{- margin-top: 0;-}--#content .toc > :last-child-{- margin-bottom: 0;-}--/** === END TOCs === **/--/** === BOTTOM PAGE NAV (scrollnav) === **/--.scrollnav {- margin-bottom: 1em;-}-.scrollnav .prev {- text-align: left;- float: left;- font-size: inherit;-}-.scrollnav .prev:before {- padding-right: 0.5em;- content: "\25C0";- display: inline-block; /* text-decoration: none doesn't work, but this does */-}-.scrollnav .next {- text-align: right;- float: right;- font-size: inherit;-}-.scrollnav .next:after {- padding-left: 0.5em;- content: " \25B6";- display: inline-block; /* text-decoration: none doesn't work, but this does */-}--/** === END BOTTOM PAGE NAV === **/--/** === FOOTER === **/-footer {- font-size: smaller;- padding-top: 10px;-}--.footer {- text-align: right;-}-/** === END FOOTER === **/diff --git a/solr/solr-ref-guide/src/css/ref-guide.css b/solr/solr-ref-guide/src/css/ref-guide.cssdeleted file mode 100644index 7d7530c21db..00000000000--- a/solr/solr-ref-guide/src/css/ref-guide.css+++ /dev/null@@ -1,2378 +0,0 @@-/** This CSS is used for styling general textual elements in the content- It is organized by general styles that affect most content and then- styles for specific sections like blocks, tables, code samples, etc. **/--/** IF YOU EDIT THIS CSS please take care to place changes in the correct- section and include comments as appropriate. **/---/** === OVERALL CONTENT === **/-/* General rules that impact most content and general-use classes */--/* Load Noto Sans for body and header text */-@font-face {- font-family: 'Noto Sans';- src: url(../fonts/Noto_Sans/NotoSans-Regular.ttf);-}--@font-face {- font-weight: bold;- font-family: 'Noto Sans';- src: url(../fonts/Noto_Sans/NotoSans-Bold.ttf);-}--/* Load Inconsolata for monospace */-@font-face {- font-family: 'Inconsolata';- src: url(../fonts/Inconsolata/Inconsolata-Regular.ttf);-}--@font-face {- font-weight: bold;- font-family: 'Inconsolata';- src: url(../fonts/Inconsolata/Inconsolata-Bold.ttf);-}--html,-body,-p {- font-family: 'Noto Sans', sans-serif;- -ms-text-size-adjust: 100%;- -webkit-text-size-adjust: 100%;-}--body,-html-{- font-size: 100%;-}--.antialiased,-body-{- -webkit-font-smoothing: antialiased;-}--article,-aside,-details,-figcaption,-figure,-footer,-header,-hgroup,-main,-nav,-section,-summary {- display: block;-}--body-{- position: relative;- margin: 0;- padding: 0;- background: #fff;- color: rgba(0,0,0,.8);- font-weight: 400;- font-style: normal;- line-height: 1;- cursor: auto;-}--body.DRAFT {- background-image: url("../images/draft-background.png");-}--*,-*:after,-*:before-{- -webkit-box-sizing: border-box;- -moz-box-sizing: border-box;- box-sizing: border-box;-}--.print-only-{- display: none!important;-}--b,-strong-{- font-weight: bold;- line-height: inherit;-}--em,-i-{- font-style: italic;- line-height: inherit;-}--/* Ref Guide paragraph content is in a <section> tag with id="content" selector */-#content-{- margin-top: 1.25em;- padding-left: 10px;-}--#content:after,-#content:before-{- display: table;- content: ' ';-}--#content:after,-{- clear: both;-}--#content:before-{- content: none;-}--#content > h1:first-child:not([class])-{- margin-top: 0;- margin-bottom: 1.25rem;- padding-top: 1rem;- padding-bottom: 8px;- border-bottom: 1px solid #ddddd8;- color: rgba(0,0,0,.85);-}--.post-content .homepage {- margin: 50px 10px 20px 10px;-}---/* General text paragraphs */--blockquote,-dd,-div,-dl,-dt,-form,-li,-ol,-p,-pre,-td,-th,-ul-{- margin: 0;- padding: 0;- direction: ltr;-}--p-{- margin-bottom: 1.25em;- font-weight: 400;- font-size: 1em;- font-family: inherit;- line-height: 1.6;-}--p aside-{- font-style: italic;- font-size: .875em;- line-height: 1.35;-}--p,-td.content-{- letter-spacing: -.01em;-}--p strong,-td.content strong-{- letter-spacing: -.005em;-}--blockquote,-dt,-p,-td.content-{- font-size: 1.0625rem;-}---/* Rules for <code> and <pre> tags */-code-{- color: rgba(0,0,0,.9);- font-weight: 400;- font-family: 'Inconsolata', monospace;-}--code,-kbd,-pre,-samp-{- font-size: 1em;- font-family: 'Inconsolata', monospace;-}--pre-{- white-space: pre-wrap;-}--*:not(pre) > code-{- padding: .1em .5ex;- -webkit-border-radius: 4px;- border-radius: 4px;- background-color: #f7f7f8;- word-spacing: -.15em;- letter-spacing: 0;- font-style: normal!important;- font-size: 1em;- line-height: 1.45;-}--p strong code,-td strong code {- font-weight: bold;-}--pre,-pre > code-{- color: rgba(0,0,0,.9);- font-weight: 400;- font-family: 'Inconsolata', monospace;- line-height: 1.45;- white-space: pre-wrap;-}--a code {- color: #2156a5;-}--table th code {- color: white;-}---/* Titles and Headings */--.sidebarblock > .title,-h1,-h2,-h3,-h4,-h5,-h6-{- color: #d9411e;- font-weight: 300;- font-style: normal;- font-family: 'Noto Sans', sans-serif;- margin: 40px 0 0 0;- padding: 0;- direction: ltr;- word-spacing: -.05em;- line-height: 1.2;- letter-spacing: -.01em;- page-break-after: avoid;-}--/* make room for the nav bar */-h1[id],-h2[id],-h3[id],-h4[id],-h5[id],-h6[id],-dt[id]{- padding-top: 60px;- margin-top: -40px-}--/* used on scaling-solr for discrete headings in the sidebar block */-h3[id].discrete,-h4[id].discrete {- padding-top: 20px;- padding-bottom: 10px;- margin-top: -20px;-}--.sidebarblock > .title small,-h1 small,-h2 small,-h3 small,-h4 small,-h5 small,-h6 small-{- color: #e99b8f;- font-size: 60%;- line-height: 0;-}--/* Pad the page title */-h1.title-main {- padding: 20px 0px 10px 10px;-}--h1-{- font-size: 2.125em;-}--h2-{- font-size: 1.6875em;-}--.sidebarblock > .title,-h3-{- font-size: 1.375em;-}--h4,-h5-{- font-size: 1.125em;-}--h6-{- font-size: 1em;-}--h6.block-title-{- margin-top: 0;- text-align: center;- padding-bottom: 10px;- font-size: 1.6875em;-}--.sidebarblock > .title strong,-h1 strong,-h2 strong,-h3 strong,-h4 strong,-h5 strong,-h6 strong-{- font-weight: 400;-}--@media only screen- and (min-width : 768px)-{- .sidebarblock > .title,- h1,- h2,- h3,- h4,- h5,- h6- {- line-height: 1.2;- }-- h1- {- font-size: 2.75em;- }-- h2- {- font-size: 2.3125em;- }-- .sidebarblock > .title,- h3- {- font-size: 1.6875em;- }-- h4- {- font-size: 1.4375em;- }-}--.clearfix:after,-.clearfix:before,-.float-group:after,-.float-group:before-{- display: table;- content: ' ';-}--.clearfix:after,-.float-group:after-{- clear: both;-}--.clearfix {- clear: both;-}--/* === End OVERALL CONTENT === */----/** === GENERAL LINKS (<a href>) === **/-/* See also link styling for nav elements in navs.css and- special content sections throughout this file */--a-{- color: #2156a5;- text-decoration: underline;- line-height: inherit;- background: transparent;-}--a:focus,-a:hover-{- color: #1d4b8f;-}--a:focus {- outline: thin dotted;- outline-offset: -2px;-}--a:active,-a:hover {- outline: 0;-}--a[data-toggle] {- color: #305CB3;-}--a.fa.fa-envelope-o.mailto {- font-weight: 600;-}--/* Adds an icon after external links, using FontAwesome */-a[href^="http://"]:after,-a[href^="https://"]:after {- content: "\f08e";- font-family: FontAwesome;- font-weight: normal;- font-style: normal;- display: inline-block;- text-decoration: none;- padding-left: 3px;- font-size: 12pt;-}--/* Strip the outbound icon when this class is present */-a[href].noCrossRef::after,-a.no_icon:after {- content:"" !important;- padding-left: 0;-}--a:hover-{- cursor: pointer;-}--p a > code:hover-{- color: rgba(0,0,0,.9);-}--#content h1 > a.link,-.sidebarblock > .title > a.link,-h2 > a.link,-h3 > a.link,-h4 > a.link,-h5 > a.link,-h6 > a.link-{- color: #d9411e;- text-decoration: none;-}--#content h1 > a.link:hover,-.sidebarblock > .title > a.link:hover,-h2 > a.link:hover,-h3 > a.link:hover,-h4 > a.link:hover,-h5 > a.link:hover,-h6 > a.link:hover-{- color: #a53221;-}--/** === End GENERAL LINKS === */---/** === LISTS === **/--/* Ordered (<ol>) and Unordered (<ul>) Lists Only */--.post-content ol li,-.post-content ul li {- margin: 10px 0;-}--dl,-ol,-ul-{- margin-bottom: 1.25em;- list-style-position: outside;- font-size: 1em;- font-family: inherit;- line-height: 1.6;-}--ol,-ol.no-bullet,-ul,-ul.no-bullet-{- margin-left: 1.5em;-}--ol-{- margin-left: 1.75em;-}--ol li ol,-ol li ul-{- margin-bottom: 0;- margin-left: 1.25em;-}--ul li ol,-ul li ul-{- margin-bottom: 0;- margin-left: .25em;- font-size: 1em;- padding-left: 10px;-}--ol li ol li {- list-style-type: lower-alpha;-}--ol li ul li {- list-style-type: disc;-}--ol li ul li ol li {- list-style: decimal;-}--ol li ul li ol li ul li {- list-style: disc;-}--.olist .olist,-.olist .ulist,-.ulist .olist,-.ulist .ulist,-ol > li p,-ol dd,-ul > li p,-ul dd-{- margin-bottom: .625em;-}--ol.unnumbered,-ul.checklist,-ul.none,-ul.unstyled-{- list-style-type: none;-}--ol.unnumbered,-ul.checklist,-ul.unstyled-{- margin-left: .625em;-}--ul.checklist li > p:first-child > .fa-check-square-o:first-child,-ul.checklist li > p:first-child > input[type='checkbox']:first-child-{- margin-right: .25em;-}--ul.checklist li > p:first-child > input[type='checkbox']:first-child-{- position: relative;- top: 1px;-}--ul.inline-{- margin: 0 auto .625em auto;- margin-right: 0;- margin-left: -1.375em;- padding: 0;-}--ul.inline > li-{- display: block;- float: left;- margin-left: 1.375em;- list-style: none;-}--ul.inline > li > *-{- display: block;-}--ul.circle li ul,-ul.disc li ul,-ul.square li ul-{- list-style: inherit;-}--ul.square-{- list-style-type: square;-}--ul.circle-{- list-style-type: circle;-}--ul.disc-{- list-style-type: disc;-}--ul.no-bullet-{- list-style: none;-}--ol.arabic-{- list-style-type: decimal;-}--ol.decimal-{- list-style-type: decimal-leading-zero;-}--ol.loweralpha-{- list-style-type: lower-alpha;-}--ol.upperalpha-{- list-style-type: upper-alpha;-}--ol.lowerroman-{- list-style-type: lower-roman;-}--ol.upperroman-{- list-style-type: upper-roman;-}--ol.lowergreek-{- list-style-type: lower-greek;-}--/* Description Lists (<dl>) Only */--dl dd-{- margin-left: 20px;-}--dl dd dl {- margin-left: 30px;-}--dl dd:last-child,-dl dd:last-child > :last-child-{- margin-bottom: 0;-}--dl dt p {- margin-left:20px;-}--dl dt,-dl dt code-{- margin-bottom: .3125em;- font-weight: bold;-}--dl dd {- margin-top:10px;- margin-bottom:10px;-}--dl dd-{- margin-bottom: 1.25em;-}--dl.dl-horizontal dd {- padding-top: 20px;-}--dd {- margin-left:20px;-}--.unstyled dl dt-{- font-weight: 400;- font-style: normal;-}---/* Callout lists (class="colist" - the items that correspond to a callout- number) and Horiztonal-format description lists (class="hdlist") */--.colist > table,-.hdlist > table-{- border: 0;- background: none;-}--.colist > table > tbody>tr,-.hdlist > table > tbody > tr,-th.hdlist1-{- background: none;-}--td.hdlist1,-td.hdlist1 > code-{- padding-right: .75em;- font-weight: bold;-}--td.hdlist1,-th.hdlist1,-td.hdlist2-{- vertical-align: top;-}--.listingblock + .colist,-.literalblock + .colist-{- margin-top: -.5em;-}--.colist > table tr > td:first-of-type-{- padding: 0 .75em;- line-height: 1;-}--.colist > table tr > td:last-of-type-{- padding: .25em 0;-}--/** === End LISTS === **/----/** === IMAGES - FIGURES - CAPTIONS === **/--img-{- display: inline-block;- vertical-align: middle;- -ms-interpolation-mode: bicubic;-}--.post-content img {- margin: 12px 0 3px 0;- width: auto;- height: auto;- max-width: 100%;- max-height: 100%;- border-width: .1em;- border-style: solid;- border-color: #E6E7E8;-}--.post-content img.inline {- margin:0;- margin-bottom:6px;-}--li img {- clear:both;-}--a img-{- border: none;-}--svg:not(:root)-{- overflow: hidden;-}--figure-{- margin: 0;-}--embed,-img,-object-{- max-width: 100%;- height: auto;-}--figcaption {- padding-bottom:12px;- padding-top:6px;- max-width: 90%;- margin-bottom:20px;- font-style: italic;- color: gray;-}--.th,-.thumb-{- display: inline-block;- border: solid 4px #fff;- -webkit-box-shadow: 0 0 0 1px #ddd;- box-shadow: 0 0 0 1px #ddd;- line-height: 0;-}--.imageblock.left,-.imageblock[style*='float: left']-{- margin: .25em .625em 1.25em 0;-}--.imageblock.right,-.imageblock[style*='float: right']-{- margin: .25em 0 1.25em .625em;-}--.imageblock > .title-{- margin-bottom: 0;-}--.imageblock.th,-.imageblock.thumb-{- border-width: 6px;-}--.imageblock.th > .title,-.imageblock.thumb > .title-{- padding: 0 .125em;-}--.image.left,-.image.right-{- display: inline-block;- margin-top: .25em;- margin-bottom: .25em;- line-height: 0;-}--.image.left-{- margin-right: .625em;-}--.image.right-{- margin-left: .625em;-}--a.image-{- text-decoration: none;-}--/** End === IMAGES - FIGURES - CAPTIONS === **/---/** === TABLES === **/--table-{- margin-bottom: 1.25em;- border: solid 1px #dedede;- background: #fff;- border-spacing: 0;- border-collapse: collapse;-}--table tfoot,-table thead-{- background: #f7f8f7;- font-weight: bold;-}--table tfoot tr td,-table tfoot tr th,-table thead tr td,-table thead tr th-{- padding: .5em .625em .625em;- color: rgba(0,0,0,.8);- text-align: left;- font-size: inherit;-}--table tr td,-table tr th-{- padding: 9px 10px;- color: rgba(0,0,0,.8);- font-size: inherit;-}--/** Used on some tables to tighten up space between cells- Add [.lowpadding] as a role to the table to use this **/-.tableblock.lowpadding table tr td,-.tableblock.lowpadding table tr th-{- padding: 2px 3px;- color: rgba(0,0,0,.8);- font-size: inherit;-}--/** table tr.alt,-table tr.even,-table tr:nth-of-type(even)-{- background: #f8f8f7;-} **/--table.stripes-all tr,-table.stripes-odd tr:nth-of-type(odd),-table.stripes-even tr:nth-of-type(even),-table.stripes-hover tr:hover {- background:#f8f8f7-}--table tbody tr td,-table tfoot tr td,-table tfoot tr th,-table thead tr th,-table tr td-{- display: table-cell;- line-height: 1.6;-}--table.tableblock > caption.title-{- overflow: visible;- max-width: 0;- white-space: nowrap;-}--table.dataTable thead {- background-color: #444;-}--section table tr.success {- background-color: #dff0d8 !important;-}--table tr.info {- background-color: #d9edf7 !important;-}--section table tr.warning, table tr.testing, table tr.testing > td.sorting_1 {- background-color: #fcf8e3 !important;-}-section table tr.danger, table tr.preference, table tr.preference > td.sorting_1 {- background-color: #f2dede !important;-}--table.profile thead tr th {- background-color: #248ec2;-}--table.request thead tr th {- background-color: #ED1951;-}--table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p-{- font-size: inherit;-}--table.tableblock-{- max-width: 100%;- border-collapse: separate;-}--table.tableblock td > .paragraph:last-child p > p:last-child,-table.tableblock td > p:last-child,-table.tableblock th > p:last-child-{- margin-bottom: 0;-}--.stretch table.tableblock-{- width: 100%;-}--table.tableblock,-td.tableblock,-th.tableblock-{- border: 0 solid #dedede;-}--table.grid-all td.tableblock,-table.grid-all th.tableblock-{- border-width: 0 1px 1px 0;-}--table.grid-all tfoot > tr > td.tableblock,-table.grid-all tfoot > tr > th.tableblock-{- border-width: 1px 1px 0 0;-}--table.grid-cols td.tableblock,-table.grid-cols th.tableblock-{- border-width: 0 1px 0 0;-}--table.grid-all * > tr > .tableblock:last-child,-table.grid-cols * > tr > .tableblock:last-child-{- border-right-width: 0;-}--table.grid-rows td.tableblock,-table.grid-rows th.tableblock-{- border-width: 0 0 1px 0;-}--table.grid-all tbody > tr:last-child > td.tableblock,-table.grid-all tbody > tr:last-child > th.tableblock,-table.grid-all thead:last-child > tr > th.tableblock,-table.grid-rows tbody > tr:last-child > td.tableblock,-table.grid-rows tbody > tr:last-child > th.tableblock,-table.grid-rows thead:last-child > tr > th.tableblock-{- border-bottom-width: 0;-}--table.grid-rows tfoot > tr > td.tableblock,-table.grid-rows tfoot > tr > th.tableblock-{- border-width: 1px 0 0 0;-}--table.frame-all-{- border-width: 1px;-}--table.frame-sides-{- border-width: 0 1px;-}--table.frame-topbot-{- border-width: 1px 0;-}--td.halign-left,-th.halign-left-{- text-align: left;-}--td.halign-right,-th.halign-right-{- text-align: right;-}--td.halign-center,-th.halign-center-{- text-align: center;-}--td.valign-top,-th.valign-top-{- vertical-align: top;-}--td.valign-bottom,-th.valign-bottom-{- vertical-align: bottom;-}--td.valign-middle,-th.valign-middle-{- vertical-align: middle;-}--table tfoot th,-table thead th-{- font-weight: bold;-}--/* Special formatting for tables on index.adoc home page */-.home-table table th,-.home-table table th a {- color: #D9411E;- font-size: 1.125em;-}--.home-table table thead {- background-color: #fff;-}--tbody tr th-{- display: table-cell;- background: #f7f8f7;- line-height: 1.6;-}--tbody tr th,-tbody tr th p,-tfoot tr th,-tfoot tr th p-{- color: rgba(0,0,0,.8);- font-weight: bold;-}--p.tableblock > code:only-child-{- padding: 0;-}--td > div.verse-{- white-space: pre;-}--/** End === TABLES === **/---/** === CODE CALLOUTS === **/-/* Callout Numbers are displayed inline in code examples with explanations- underneath. See Callout lists above for styles of the explanations. */--.conum[data-value]-{- display: inline-block;- width: 1.67em;- height: 1.67em;- -webkit-border-radius: 100px;- border-radius: 100px;- background-color: rgba(0,0,0,.8);- color: #fff!important;- text-align: center;- font-weight: bold;- font-style: normal;- font-size: .75em;- font-family: 'Noto Sans', sans-serif;- line-height: 1.67em;-}--.conum[data-value] *-{- color: #fff!important;-}--.conum[data-value] + b-{- display: none;-}--.conum[data-value]:after-{- content: attr(data-value);-}--pre .conum[data-value]-{- position: relative;- top: -.125em;-}--b.conum *-{- color: inherit!important;-}--.conum:not([data-value]):empty-{- display: none;-}--/** End === CODE CALLOUTS === **/---/** === BLOCKS === **/-/* Asciidoctor blocks for Notes, warnings, code samples, etc. */--.admonitionblock td.icon [class^='fa icon-']-{- text-shadow: 1px 1px 2px rgba(0,0,0,.5);- font-size: 2.5em;- cursor: default;-}--/* font awesome icon info-circle: http://fontawesome.io/icon/info-circle/ */-.admonitionblock td.icon .icon-note:before-{- color: #19407c;- content: '\f05a';-}--/* font awesome icon lightbulb-o: http://fontawesome.io/icon/lightbulb-o/ */-.admonitionblock td.icon .icon-tip:before-{- color: #428b30;- content: '\f0eb';- text-shadow: 1px 1px 2px rgba(155,155,0,.8);-}--/* font awesome icon exclamation-triangle: http://fontawesome.io/icon/exclamation-triangle/ */-.admonitionblock td.icon .icon-warning:before-{- color: #bf0000;- content: '\f071';-}--/* font awesome icon fire: http://fontawesome.io/icon/fire/ */-.admonitionblock td.icon .icon-caution:before-{- color: #bf6900;- content: '\f06d';-}--/* font awesome icon bolt: http://fontawesome.io/icon/bolt/ */-.admonitionblock td.icon .icon-important:before-{- color: #eeea74;- content: '\f0e7';-}--.admonitionblock td.content > .title,-.audioblock > .title,-.dlist > .title,-.exampleblock > .title,-.hdlist > .title,-.imageblock > .title,-.listingblock > .title,-.literalblock > .title,-.olist > .title,-.openblock > .title,-.paragraph > .title,-.qlist > .title,-.quoteblock > .title,-.stemblock > .title,-.subheader,-.ulist > .title,-.verseblock > .title,-.videoblock > .title,-table.tableblock > .title,-figcaption-{- margin-top: 0;- margin-bottom: .25em;- color: #7a2518;- font-weight: 400;- line-height: 1.45;-}--.admonitionblock > table-{- width: auto;- border: 0;- border-collapse: separate;- background: none;-}--.admonitionblock > table td.icon-{- width: 80px;- text-align: center;-}--.admonitionblock > table td.icon img-{- max-width: none;-}--.admonitionblock > table td.icon .title-{- text-transform: uppercase;- font-weight: bold;- font-family: 'Noto Sans', sans-serif;-}--.admonitionblock > table td.content-{- padding-right: 1.25em;- padding-left: 1.125em;- border-left: 1px solid #ddddd8;- color: rgba(0,0,0,.6);-}--.admonitionblock > table td.content > :last-child > :last-child-{- margin-bottom: 0;-}--blockquote-{- margin: 0 0 1.25em;- padding: .5625em 1.25em 0 1.1875em;- border-left: 1px solid #ddd;-}--blockquote,-blockquote p-{- color: rgba(0,0,0,.85);- line-height: 1.6;-}--blockquote cite-{- display: block;- color: rgba(0,0,0,.6);- font-size: .9375em;-}--blockquote cite:before-{- content: '\2014 \0020';-}--blockquote cite a,-blockquote cite a:visited-{- color: rgba(0,0,0,.6);-}--.audioblock,-.imageblock,-.listingblock,-.literalblock,-.stemblock,-.videoblock-{- margin-bottom: 1.25em;- overflow: auto;-}--.exampleblock-{- margin-bottom: 1.25em;- padding: 0 1em 1em 1em;- border-width: 1px;- border-style: solid;- border-color: #e6e6e6;- background-color: transparent;- -webkit-box-shadow: 0 1px 4px #e0e0dc;- box-shadow: 0 1px 4px #e0e0dc;- background: #fff;- width: 100%;-}--.exampleblock > :first-child-{- margin-top: 0;-}--.exampleblock > :last-child-{- margin-bottom: 0;-}--/** Not navigation sidebar; asciidoc concept of "sidebar" in text **/-.sidebarblock-{- margin-bottom: 1.25em;- padding: 1.25em;- border-width: 1px;- border-style: solid;- border-color: #e0e0dc;- -webkit-border-radius: 4px;- border-radius: 4px;- background: #f8f8f7;-}--.sidebarblock > :first-child-{- margin-top: 0;-}--.sidebarblock > :last-child-{- margin-bottom: 0;-}--.sidebarblock dt,-.sidebarblock p,-.sidebarblock td.content,-p.tableblock-{- font-size: 1em;-}--.exampleblock > :last-child>:last-child,-.exampleblock > .olist > ol > li:last-child>:last-child,-.exampleblock > .qlist > ol > li:last-child>:last-child,-.exampleblock > .ulist > ul > li:last-child>:last-child,-.sidebarblock > :last-child>:last-child,-.sidebarblock > .olist > ol > li:last-child>:last-child,-.sidebarblock > .qlist > ol > li:last-child>:last-child,-.sidebarblock > .ulist > ul > li:last-child>:last-child-{- margin-bottom: 0;-}--.listingblock pre,-.listingblock pre.CodeRay,-.listingblock pre.prettyprint,-.listingblock pre:not(.highlight),-.listingblock pre[class='highlight'],-.listingblock pre[class^='highlight '],-.literalblock pre-{- background: #f7f7f8;-}--.sidebarblock .listingblock pre.CodeRay,-.sidebarblock .listingblock pre.prettyprint,-.sidebarblock .listingblock pre:not(.highlight),-.sidebarblock .listingblock pre[class='highlight'],-.sidebarblock .listingblock pre[class^='highlight '],-.sidebarblock .literalblock pre-{- background: #f7f7f8;-}--.listingblock pre,-.listingblock pre[class],-.literalblock pre,-.literalblock pre[class]-{- padding: 1em;- -webkit-border-radius: 4px;- border-radius: 4px;- word-wrap: break-word;- font-size: .8125em;-}--.listingblock pre.nowrap,-.listingblock pre[class].nowrap,-.literalblock pre.nowrap,-.literalblock pre[class].nowrap-{- overflow-x: auto;- white-space: pre;- word-wrap: normal;-}--@media only screen- and (min-width : 768px)-{- .listingblock pre,- .listingblock pre[class],- .literalblock pre,- .literalblock pre[class]- {- font-size: .90625em;- }-}--@media only screen- and (min-width : 1280px)-{- .listingblock pre,- .listingblock pre[class],- .literalblock pre,- .literalblock pre[class]- {- font-size: 1em;- }-}--.literalblock.output pre-{- background-color: rgba(0,0,0,.9);- color: #f7f7f8;-}--.listingblock pre.highlightjs-{- padding: 0;-}--.listingblock pre.highlightjs > code-{- padding: 1em;- -webkit-border-radius: 4px;- border-radius: 4px;-}--.listingblock pre.prettyprint-{- border-width: 0;-}--.listingblock-{- position: relative;-}--.listingblock code[data-lang]:before-{- position: absolute;- top: .425rem;- right: .5rem;- display: none;- color: #999;- content: attr(data-lang);- text-transform: uppercase;- font-size: .75em;- line-height: 1;-}--.listingblock:hover code[data-lang]:before-{- display: block;-}--.listingblock.terminal pre .command:before-{- padding-right: .5em;- color: #999;- content: attr(data-prompt);-}--.listingblock.terminal pre .command:not([data-prompt]):before-{- content: '$';-}--.quoteblock-{- display: table;- margin: 0 1em 1.25em 1.5em;-}--.quoteblock > .title-{- margin-bottom: .75em;- margin-left: -1.5em;-}--.quoteblock blockquote,-.quoteblock blockquote p-{- color: rgba(0,0,0,.85);- text-align: justify;- word-spacing: .1em;- letter-spacing: 0;- font-style: italic;- font-size: inherit;- line-height: 1.75;-}--.quoteblock blockquote-{- margin: 0;- padding: 0;- border: 0;-}--.quoteblock blockquote:before-{- float: left;- margin-left: -.6em;- color: #7a2518;- content: '\201c';- text-shadow: 0 1px 2px rgba(0,0,0,.1);- font-weight: bold;- font-size: 2.75em;- line-height: .6em;-}--.quoteblock blockquote > .paragraph:last-child p-{- margin-bottom: 0;-}--.quoteblock .attribution-{- margin-top: .5em;- margin-right: .5ex;- text-align: right;-}--.quoteblock .quoteblock-{- margin-right: 0;- margin-left: 0;- padding: .5em 0;- border-left: 3px solid rgba(0,0,0,.6);-}--.quoteblock .quoteblock blockquote-{- padding: 0 0 0 .75em;-}--.quoteblock .quoteblock blockquote:before-{- display: none;-}--.verseblock-{- margin: 0 1em 1.25em 1em;-}--.verseblock pre-{- color: rgba(0,0,0,.85);- font-weight: 300;- font-size: 1.15rem;- font-family: 'Noto Sans', sans-serif;-}--.verseblock pre strong-{- font-weight: 400;-}--.verseblock .attribution-{- margin-top: 1.25rem;- margin-left: .5ex;-}--.quoteblock .attribution,-.verseblock .attribution-{- font-style: italic;- font-size: .9375em;- line-height: 1.45;-}--.quoteblock .attribution br,-.verseblock .attribution br-{- display: none;-}--.quoteblock .attribution cite,-.verseblock .attribution cite-{- display: block;- color: rgba(0,0,0,.6);- letter-spacing: -.05em;-}--.quoteblock.abstract-{- display: block;- margin: 0 0 1.25em 0;-}--.quoteblock.abstract blockquote,-.quoteblock.abstract blockquote p-{- text-align: left;- word-spacing: 0;-}--.quoteblock.abstract blockquote:before,-.quoteblock.abstract blockquote p:first-of-type:before-{- display: none;-}---/** ASCIIDOCTOR ROLES **/-/* These classes are defined in Asciidoctor docs as available so keeping- in case someone decides to use them */--.left-{- float: left!important;-}--.right-{- float: right!important;-}--.text-left-{- text-align: left!important;-}--.text-right-{- text-align: right!important;-}--.text-center-{- text-align: center!important;-}--.text-justify-{- text-align: justify!important;-}--.hide-{- display: none;-}--div.unbreakable-{- page-break-inside: avoid;-}--.big-{- font-size: larger;-}--.small-{- font-size: smaller;-}--.underline-{- text-decoration: underline;-}--.overline-{- text-decoration: overline;-}--.line-through-{- text-decoration: line-through;-}--.aqua-{- color: #00bfbf;-}--.aqua-background-{- background-color: #00fafa;-}--.black-{- color: #000;-}--.black-background-{- background-color: #000;-}--.blue-{- color: #0000bf;-}--.blue-background-{- background-color: #0000fa;-}--.fuchsia-{- color: #bf00bf;-}--.fuchsia-background-{- background-color: #fa00fa;-}--.gray-{- color: #606060;-}--.gray-background-{- background-color: #7d7d7d;-}--.green-{- color: #006000;-}--.green-background-{- background-color: #007d00;-}--.lime-{- color: #00bf00;-}--.lime-background-{- background-color: #00fa00;-}--.maroon-{- color: #600000;-}--.maroon-background-{- background-color: #7d0000;-}--.navy-{- color: #000060;-}--.navy-background-{- background-color: #00007d;-}--.olive-{- color: #606000;-}--.olive-background-{- background-color: #7d7d00;-}--.purple-{- color: #600060;-}--.purple-background-{- background-color: #7d007d;-}--.red-{- color: #bf0000;-}--.red-background-{- background-color: #fa0000;-}--.silver-{- color: #909090;-}--.silver-background-{- background-color: #bcbcbc;-}--.teal-{- color: #006060;-}--.teal-background-{- background-color: #007d7d;-}--.white-{- color: #bfbfbf;-}--.white-background-{- background-color: #fafafa;-}--.yellow-{- color: #bfbf00;-}--.yellow-background-{- background-color: #fafa00;-}--/** End === ASCIIDOCTOR ROLES === **/---/** === SPECIAL CONTENT TYPES === **/-/* These are rarely used as of 1 Jan 2020 */--abbr,-acronym-{- border-bottom: 1px dotted #ddd;- color: rgba(0,0,0,.8);- text-transform: uppercase;- font-size: 90%;- cursor: help;-}--abbr-{- text-transform: none;-}--audio,-canvas,-video {- display: inline-block;-}--audio:not([controls]) {- display: none;- height: 0;-}--[hidden],-template {- display: none;-}--script {- display: none!important;-}--abbr[title] {- border-bottom: 1px dotted;-}--dfn-{- font-style: italic;-}--mark-{- background: #ff0;- color: #000;-}--q-{- quotes: '\201C' '\201D' '\2018' '\2019';-}--small-{- font-size: 80%;- line-height: inherit;-}--sub,-sup-{- position: relative;- vertical-align: baseline;- font-size: 75%;- line-height: 0;-}--sup-{- top: -.5em;-}--sub-{- bottom: -.25em;-}--fieldset-{- margin: 0 2px;- padding: .35em .625em .75em;- border: 1px solid silver;-}--legend-{- padding: 0;- border: 0;-}--video {- display: block;- margin: 30px 0;- border: 1px solid #c0c0c0;-}--embed,-object-{- height: 100%;-}--#map_canvas embed,-#map_canvas img,-#map_canvas object,-.map_canvas embed,-.map_canvas img,-.map_canvas object-{- max-width: none!important;-}--span.footnote,-span.footnoteref-{- vertical-align: super;- font-size: .875em;-}--span.footnote a,-span.footnoteref a-{- text-decoration: none;-}--span.footnote a:active,-span.footnoteref a:active-{- text-decoration: underline;-}--#footnotes-{- margin-bottom: .625em;- padding-top: .75em;- padding-bottom: .75em;-}--#footnotes hr-{- margin: -.25em 0 .75em 0;- min-width: 6.25em;- width: 20%;- border-width: 1px 0 0 0;-}--#footnotes .footnote-{- margin-bottom: .2em;- margin-left: 1.2em;- padding: 0 .375em;- text-indent: -1.2em;- font-size: .875em;- line-height: 1.3;-}--#footnotes .footnote a:first-of-type-{- text-decoration: none;- font-weight: bold;-}--#footnotes .footnote:last-of-type-{- margin-bottom: 0;-}--#content #footnotes-{- margin-top: -.625em;- margin-bottom: 0;- padding: .75em 0;-}--.gist .file-data > table-{- margin-bottom: 0;- width: 100%;- border: 0;- background: #fff;-}--.gist .file-data > table td.line-data-{- width: 99%;-}--/** End === SPECIAL CONTENT TYPES === **/--@media print-{- @page- {- margin: 1.25cm .75cm;- }-- *- {- -webkit-box-shadow: none!important;- box-shadow: none!important;- text-shadow: none!important;- }-- a- {- color: inherit!important;- text-decoration: underline!important;- }-- a.bare,- a[href^='#'],- a[href^='mailto:']- {- text-decoration: none!important;- }-- a[href^='http:']:not(.bare):after,- a[href^='https:']:not(.bare):after- {- display: inline-block;- padding-left: .25em;- content: '(' attr(href) ')';- font-size: .875em;- }-- abbr[title]:after- {- content: ' (' attr(title) ')';- }-- blockquote,- img,- pre,- tr- {- page-break-inside: avoid;- }-- thead- {- display: table-header-group;- }-- img- {- max-width: 100%!important;- }-- blockquote,- dt,- p,- td.content- {- font-size: 1em;- orphans: 3;- widows: 3;- }-- #toc,- .exampleblock,- .sidebarblock- {- background: none!important;- }-- #toc- {- padding-bottom: 0!important;- border-bottom: 1px solid #ddddd8!important;- }-- .sect1- {- padding-bottom: 0!important;- }-- .sect1 + .sect1- {- border: 0!important;- }-- #header > h1:first-child- {- margin-top: 1.25rem;- }-- body.book #header- {- text-align: center;- }-- body.book #header > h1:first-child- {- margin: 2.5em 0 1em 0;- border: 0!important;- }-- body.book #header .details- {- display: block;- padding: 0!important;- border: 0!important;- }-- body.book #header .details span:first-child- {- margin-left: 0!important;- }-- body.book #header .details br- {- display: block;- }-- body.book #header .details br + span:before- {- content: none!important;- }-- body.book #toc- {- margin: 0!important;- padding: 0!important;- border: 0!important;- text-align: left!important;- }-- body.book #preamble,- body.book #toc,- body.book .sect1 > h2,- body.book h1.sect0- {- page-break-before: always;- }-- .listingblock code[data-lang]:before- {- display: block;- }-- #footer- {- padding: 0 .9375em;- background: none!important;- }-- #footer-text- {- color: rgba(0,0,0,.6)!important;- font-size: .9em;- }-- .hide-on-print- {- display: none!important;- }-- .print-only- {- display: block!important;- }-- .hide-for-print- {- display: none!important;- }-- .show-for-print- {- display: inherit!important;- }-}diff --git a/solr/solr-ref-guide/src/css/search.css b/solr/solr-ref-guide/src/css/search.cssdeleted file mode 100644index c61cec772a7..00000000000--- a/solr/solr-ref-guide/src/css/search.css+++ /dev/null@@ -1,47 +0,0 @@-/** This CSS controls search box and results **/--.form-row {- padding-bottom: 15px;-}---/* search area */-#search-demo-container ul#results-container {- list-style: none;- font-size: 12px;- background-color: white;- z-index: -1;- border-left: 1px solid #dedede;- box-shadow: 2px 3px 2px #dedede;- margin-left: 0px;-}--ul#results-container a {- background-color: transparent;- color: #2156a5;- text-indent: -6px;- padding-left: 8px;- display: block;-}--ul#results-container a:hover,-ul#results-container a:focus {- background-color: #D9411E;- color: white;-}--#search-input {- font-size: 0.8em;- -webkit-box-sizing: border-box;- -moz-box-sizing: border-box;- box-sizing: border-box;- float: right;-}--/*Pad the left and bottom of the results container to give a little more space to the nav*/-ul#results-container {- padding-bottom: 30px;- padding-left: 2px;-}--/* end search */diff --git a/solr/solr-ref-guide/src/fonts/fontawesome/FontAwesome.otf b/solr/solr-ref-guide/src/fonts/fontawesome/FontAwesome.otfdeleted file mode 100755index 81c9ad949b4..00000000000Binary files a/solr/solr-ref-guide/src/fonts/fontawesome/FontAwesome.otf and /dev/null differdiff --git a/solr/solr-ref-guide/src/fonts/fontawesome/fontawesome-webfont.eot b/solr/solr-ref-guide/src/fonts/fontawesome/fontawesome-webfont.eotdeleted file mode 100755index 84677bc0c5f..00000000000Binary files a/solr/solr-ref-guide/src/fonts/fontawesome/fontawesome-webfont.eot and /dev/null differdiff --git a/solr/solr-ref-guide/src/fonts/fontawesome/fontawesome-webfont.svg b/solr/solr-ref-guide/src/fonts/fontawesome/fontawesome-webfont.svgdeleted file mode 100755index d907b25ae60..00000000000--- a/solr/solr-ref-guide/src/fonts/fontawesome/fontawesome-webfont.svg+++ /dev/null@@ -1,520 +0,0 @@-<?xml version="1.0" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >-<svg xmlns="http://www.w3.org/2000/svg">-<metadata></metadata>-<defs>-<font id="fontawesomeregular" horiz-adv-x="1536" >-<font-face units-per-em="1792" ascent="1536" descent="-256" />-<missing-glyph horiz-adv-x="448" />-<glyph unicode=" " horiz-adv-x="448" />-<glyph unicode="	" horiz-adv-x="448" />-<glyph unicode=" " horiz-adv-x="448" />-<glyph unicode="¨" horiz-adv-x="1792" />-<glyph unicode="©" horiz-adv-x="1792" />-<glyph unicode="®" horiz-adv-x="1792" />-<glyph unicode="´" horiz-adv-x="1792" />-<glyph unicode="Æ" horiz-adv-x="1792" />-<glyph unicode="Ø" horiz-adv-x="1792" />-<glyph unicode=" " horiz-adv-x="768" />-<glyph unicode=" " horiz-adv-x="1537" />-<glyph unicode=" " horiz-adv-x="768" />-<glyph unicode=" " horiz-adv-x="1537" />-<glyph unicode=" " horiz-adv-x="512" />-<glyph unicode=" " horiz-adv-x="384" />-<glyph unicode=" " horiz-adv-x="256" />-<glyph unicode=" " horiz-adv-x="256" />-<glyph unicode=" " horiz-adv-x="192" />-<glyph unicode=" " horiz-adv-x="307" />-<glyph unicode=" " horiz-adv-x="85" />-<glyph unicode=" " horiz-adv-x="307" />-<glyph unicode=" " horiz-adv-x="384" />-<glyph unicode="™" horiz-adv-x="1792" />-<glyph unicode="∞" horiz-adv-x="1792" />-<glyph unicode="≠" horiz-adv-x="1792" />-<glyph unicode="◼" horiz-adv-x="500" d="M0 0z" />-<glyph unicode="" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />-<glyph unicode="" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />-<glyph unicode="" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />-<glyph unicode="" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />-<glyph unicode="" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />-<glyph unicode="" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />-<glyph unicode="" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />-<glyph unicode="" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />-<glyph unicode="" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />-<glyph unicode="" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />-<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />-<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />-<glyph unicode="" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />-<glyph unicode="" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />-<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />-<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />-<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />-<glyph unicode="" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />-<glyph unicode="" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />-<glyph unicode="" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />-<glyph unicode="" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z " />-<glyph unicode="" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />-<glyph unicode="" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />-<glyph unicode="" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />-<glyph unicode="" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />-<glyph unicode="" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />-<glyph unicode="" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />-<glyph unicode="" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />-<glyph unicode="" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />-<glyph unicode="" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />-<glyph unicode="" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />-<glyph unicode="" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />-<glyph unicode="" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />-<glyph unicode="" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />-<glyph unicode="" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />-<glyph unicode="" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />-<glyph unicode="" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />-<glyph unicode="" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />-<glyph unicode="" horiz-adv-x="1664" d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57 q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -4 -0.5 -13t-0.5 -13q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5 q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />-<glyph unicode="" horiz-adv-x="1408" d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142 q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5 t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68.5 -0.5t67.5 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5 t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />-<glyph unicode="" horiz-adv-x="1024" d="M0 -126l17 85q6 2 81.5 21.5t111.5 37.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5 q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />-<glyph unicode="" horiz-adv-x="1792" d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2 t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5 q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />-<glyph unicode="" d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1 t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5 t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49 t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />-<glyph unicode="" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />-<glyph unicode="" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />-<glyph unicode="" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />-<glyph unicode="" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />-<glyph unicode="" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />-<glyph unicode="" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />-<glyph unicode="" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />-<glyph unicode="" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />-<glyph unicode="" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />-<glyph unicode="" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />-<glyph unicode="" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />-<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />-<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />-<glyph unicode="" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />-<glyph unicode="" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />-<glyph unicode="" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />-<glyph unicode="" horiz-adv-x="1280" d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />-<glyph unicode="" horiz-adv-x="1280" d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />-<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />-<glyph unicode="" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />-<glyph unicode="" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />-<glyph unicode="" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />-<glyph unicode="" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />-<glyph unicode="" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />-<glyph unicode="" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />-<glyph unicode="" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />-<glyph unicode="" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />-<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />-<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />-<glyph unicode="" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />-<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />-<glyph unicode="" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />-<glyph unicode="" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />-<glyph unicode="" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />-<glyph unicode="" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />-<glyph unicode="" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />-<glyph unicode="" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />-<glyph unicode="" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />-<glyph unicode="" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />-<glyph unicode="" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />-<glyph unicode="" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1792" d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />-<glyph unicode="" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />-<glyph unicode="" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />-<glyph unicode="" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />-<glyph unicode="" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />-<glyph unicode="" horiz-adv-x="2048" d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />-<glyph unicode="" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" d="M1536 160q0 -119 -84.5 -203.5t-203.5 -84.5h-192v608h203l30 224h-233v143q0 54 28 83t96 29l132 1v207q-96 9 -180 9q-136 0 -218 -80.5t-82 -225.5v-166h-224v-224h224v-608h-544q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5v-960z" />-<glyph unicode="" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />-<glyph unicode="" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />-<glyph unicode="" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />-<glyph unicode="" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />-<glyph unicode="" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />-<glyph unicode="" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />-<glyph unicode="" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />-<glyph unicode="" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />-<glyph unicode="" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />-<glyph unicode="" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />-<glyph unicode="" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />-<glyph unicode="" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />-<glyph unicode="" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />-<glyph unicode="" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />-<glyph unicode="" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />-<glyph unicode="" horiz-adv-x="1024" d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />-<glyph unicode="" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />-<glyph unicode="" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />-<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />-<glyph unicode="" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />-<glyph unicode="" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />-<glyph unicode="" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5 t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />-<glyph unicode="" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />-<glyph unicode="" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />-<glyph unicode="" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />-<glyph unicode="" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />-<glyph unicode="" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />-<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />-<glyph unicode="" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />-<glyph unicode="" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />-<glyph unicode="" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />-<glyph unicode="" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />-<glyph unicode="" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />-<glyph unicode="" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />-<glyph unicode="" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />-<glyph unicode="" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />-<glyph unicode="" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />-<glyph unicode="" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />-<glyph unicode="" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />-<glyph unicode="" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />-<glyph unicode="" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />-<glyph unicode="" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />-<glyph unicode="" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />-<glyph unicode="" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />-<glyph unicode="" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />-<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />-<glyph unicode="" d="M829 318q0 -76 -58.5 -112.5t-139.5 -36.5q-41 0 -80.5 9.5t-75.5 28.5t-58 53t-22 78q0 46 25 80t65.5 51.5t82 25t84.5 7.5q20 0 31 -2q2 -1 23 -16.5t26 -19t23 -18t24.5 -22t19 -22.5t17 -26t9 -26.5t4.5 -31.5zM755 863q0 -60 -33 -99.5t-92 -39.5q-53 0 -93 42.5 t-57.5 96.5t-17.5 106q0 61 32 104t92 43q53 0 93.5 -45t58 -101t17.5 -107zM861 1120l88 64h-265q-85 0 -161 -32t-127.5 -98t-51.5 -153q0 -93 64.5 -154.5t158.5 -61.5q22 0 43 3q-13 -29 -13 -54q0 -44 40 -94q-175 -12 -257 -63q-47 -29 -75.5 -73t-28.5 -95 q0 -43 18.5 -77.5t48.5 -56.5t69 -37t77.5 -21t76.5 -6q60 0 120.5 15.5t113.5 46t86 82.5t33 117q0 49 -20 89.5t-49 66.5t-58 47.5t-49 44t-20 44.5t15.5 42.5t37.5 39.5t44 42t37.5 59.5t15.5 82.5q0 60 -22.5 99.5t-72.5 90.5h83zM1152 672h128v64h-128v128h-64v-128 h-128v-64h128v-160h64v160zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1664" d="M735 740q0 -36 32 -70.5t77.5 -68t90.5 -73.5t77 -104t32 -142q0 -90 -48 -173q-72 -122 -211 -179.5t-298 -57.5q-132 0 -246.5 41.5t-171.5 137.5q-37 60 -37 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 42 -47.5 74t-15.5 73q0 36 21 85q-46 -4 -68 -4 q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q77 66 182.5 98t217.5 32h418l-138 -88h-131q74 -63 112 -133t38 -160q0 -72 -24.5 -129.5t-59 -93t-69.5 -65t-59.5 -61.5t-24.5 -66zM589 836q38 0 78 16.5t66 43.5q53 57 53 159q0 58 -17 125t-48.5 129.5 t-84.5 103.5t-117 41q-42 0 -82.5 -19.5t-65.5 -52.5q-47 -59 -47 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26zM591 -37q58 0 111.5 13t99 39t73 73t27.5 109q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -48 2 q-53 0 -105 -7t-107.5 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -70 35 -123.5t91.5 -83t119 -44t127.5 -14.5zM1401 839h213v-108h-213v-219h-105v219h-212v108h212v217h105v-217z" />-<glyph unicode="" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />-<glyph unicode="" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />-<glyph unicode="" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />-<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />-<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />-<glyph unicode="" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />-<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />-<glyph unicode="" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />-<glyph unicode="" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />-<glyph unicode="" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />-<glyph unicode="" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />-<glyph unicode="" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />-<glyph unicode="" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />-<glyph unicode="" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />-<glyph unicode="" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />-<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />-<glyph unicode="" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />-<glyph unicode="" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />-<glyph unicode="" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5 t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />-<glyph unicode="" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />-<glyph unicode="" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704 q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />-<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />-<glyph unicode="" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />-<glyph unicode="" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />-<glyph unicode="" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />-<glyph unicode="" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />-<glyph unicode="" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />-<glyph unicode="" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />-<glyph unicode="" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />-<glyph unicode="" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />-<glyph unicode="" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />-<glyph unicode="" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />-<glyph unicode="" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />-<glyph unicode="" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />-<glyph unicode="" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />-<glyph unicode="" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />-<glyph unicode="" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />-<glyph unicode="" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />-<glyph unicode="" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />-<glyph unicode="" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />-<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />-<glyph unicode="" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />-<glyph unicode="" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />-<glyph unicode="" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />-<glyph unicode="" horiz-adv-x="1792" />-<glyph unicode="" horiz-adv-x="1792" />-<glyph unicode="" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />-<glyph unicode="" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />-<glyph unicode="" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />-<glyph unicode="" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />-<glyph unicode="" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />-<glyph unicode="" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />-<glyph unicode="" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />-<glyph unicode="" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />-<glyph unicode="" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />-<glyph unicode="" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />-<glyph unicode="" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />-<glyph unicode="" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />-<glyph unicode="" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />-<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />-<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />-<glyph unicode="" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />-<glyph unicode="" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />-<glyph unicode="" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />-<glyph unicode="" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />-<glyph unicode="" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />-<glyph unicode="" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />-<glyph unicode="" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />-<glyph unicode="" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />-<glyph unicode="" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />-<glyph unicode="" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />-<glyph unicode="" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />-<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />-<glyph unicode="" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />-<glyph unicode="" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />-<glyph unicode="" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />-<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />-<glyph unicode="" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />-<glyph unicode="" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />-<glyph unicode="" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />-<glyph unicode="" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />-<glyph unicode="" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />-<glyph unicode="" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />-<glyph unicode="" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />-<glyph unicode="" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />-<glyph unicode="" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />-<glyph unicode="" d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />-<glyph unicode="" d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />-<glyph unicode="" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />-<glyph unicode="" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />-<glyph unicode="" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />-<glyph unicode="" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />-<glyph unicode="" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />-<glyph unicode="" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />-<glyph unicode="" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />-<glyph unicode="" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />-<glyph unicode="" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />-<glyph unicode="" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />-<glyph unicode="" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />-<glyph unicode="" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />-<glyph unicode="" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />-<glyph unicode="" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />-<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />-<glyph unicode="" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />-<glyph unicode="" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1024" d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14 q78 2 134 29z" />-<glyph unicode="" d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />-<glyph unicode="" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />-<glyph unicode="" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />-<glyph unicode="" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />-<glyph unicode="" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />-<glyph unicode="" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />-<glyph unicode="" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />-<glyph unicode="" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />-<glyph unicode="" horiz-adv-x="1280" d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324 l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />-<glyph unicode="" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />-<glyph unicode="" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />-<glyph unicode="" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />-<glyph unicode="" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />-<glyph unicode="" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />-<glyph unicode="" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />-<glyph unicode="" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />-<glyph unicode="" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />-<glyph unicode="" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />-<glyph unicode="" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />-<glyph unicode="" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />-<glyph unicode="" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />-<glyph unicode="" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="2176" d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40 t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29 q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />-<glyph unicode="" horiz-adv-x="1664" d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9 q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102 t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />-<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69 q-46 32 -141.5 92.5t-142.5 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13 t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5 t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21 t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286 t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273 t273 -182.5t331.5 -68z" />-<glyph unicode="" horiz-adv-x="1792" d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />-<glyph unicode="" horiz-adv-x="2048" d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64 q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />-<glyph unicode="" horiz-adv-x="2304" d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433 q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />-<glyph unicode="" d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q43 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0 q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />-<glyph unicode="" horiz-adv-x="1280" d="M981 197q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -49 2q-53 0 -104.5 -7t-107 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -56 23.5 -102t61 -75.5t87 -50t100 -29t101.5 -8.5q58 0 111.5 13t99 39t73 73t27.5 109zM864 1055 q0 59 -17 125.5t-48 129t-84 103.5t-117 41q-42 0 -82.5 -19.5t-66.5 -52.5q-46 -59 -46 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26q37 0 77.5 16.5t65.5 43.5q53 56 53 159zM752 1536h417l-137 -88h-132q75 -63 113 -133t38 -160q0 -72 -24.5 -129.5 t-59.5 -93t-69.5 -65t-59 -61.5t-24.5 -66q0 -36 32 -70.5t77 -68t90.5 -73.5t77.5 -104t32 -142q0 -91 -49 -173q-71 -122 -209.5 -179.5t-298.5 -57.5q-132 0 -246.5 41.5t-172.5 137.5q-36 59 -36 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 41 -47.5 73.5 t-15.5 73.5q0 40 21 85q-46 -4 -68 -4q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q76 66 182 98t218 32z" />-<glyph unicode="" horiz-adv-x="1984" d="M831 572q0 -56 -40.5 -96t-96.5 -40q-57 0 -98 40t-41 96q0 57 41.5 98t97.5 41t96.5 -41t40.5 -98zM1292 711q56 0 96.5 -41t40.5 -98q0 -56 -40.5 -96t-96.5 -40q-57 0 -98 40t-41 96q0 57 41.5 98t97.5 41zM1984 722q0 -62 -31 -114t-83 -82q5 -33 5 -61 q0 -121 -68.5 -230.5t-197.5 -193.5q-125 -82 -285.5 -125.5t-335.5 -43.5q-176 0 -336.5 43.5t-284.5 125.5q-129 84 -197.5 193t-68.5 231q0 29 5 66q-48 31 -77 81.5t-29 109.5q0 94 66 160t160 66q83 0 148 -55q248 158 592 164l134 423q4 14 17.5 21.5t28.5 4.5 l347 -82q22 50 68.5 81t102.5 31q77 0 131.5 -54.5t54.5 -131.5t-54.5 -132t-131.5 -55q-76 0 -130.5 54t-55.5 131l-315 74l-116 -366q327 -14 560 -166q64 58 151 58q94 0 160 -66t66 -160zM1664 1459q-45 0 -77 -32t-32 -77t32 -77t77 -32t77 32t32 77t-32 77t-77 32z M77 722q0 -67 51 -111q49 131 180 235q-36 25 -82 25q-62 0 -105.5 -43.5t-43.5 -105.5zM1567 105q112 73 171.5 166t59.5 194t-59.5 193.5t-171.5 165.5q-116 75 -265.5 115.5t-313.5 40.5t-313.5 -40.5t-265.5 -115.5q-112 -73 -171.5 -165.5t-59.5 -193.5t59.5 -194 t171.5 -166q116 -75 265.5 -115.5t313.5 -40.5t313.5 40.5t265.5 115.5zM1850 605q57 46 57 117q0 62 -43.5 105.5t-105.5 43.5q-49 0 -86 -28q131 -105 178 -238zM1258 237q11 11 27 11t27 -11t11 -27.5t-11 -27.5q-99 -99 -319 -99h-2q-220 0 -319 99q-11 11 -11 27.5 t11 27.5t27 11t27 -11q77 -77 265 -77h2q188 0 265 77z" />-<glyph unicode="" d="M950 393q7 7 17.5 7t17.5 -7t7 -18t-7 -18q-65 -64 -208 -64h-1h-1q-143 0 -207 64q-8 7 -8 18t8 18q7 7 17.5 7t17.5 -7q49 -51 172 -51h1h1q122 0 173 51zM671 613q0 -37 -26 -64t-63 -27t-63 27t-26 64t26 63t63 26t63 -26t26 -63zM1214 1049q-29 0 -50 21t-21 50 q0 30 21 51t50 21q30 0 51 -21t21 -51q0 -29 -21 -50t-51 -21zM1216 1408q132 0 226 -94t94 -227v-894q0 -133 -94 -227t-226 -94h-896q-132 0 -226 94t-94 227v894q0 133 94 227t226 94h896zM1321 596q35 14 57 45.5t22 70.5q0 51 -36 87.5t-87 36.5q-60 0 -98 -48 q-151 107 -375 115l83 265l206 -49q1 -50 36.5 -85t84.5 -35q50 0 86 35.5t36 85.5t-36 86t-86 36q-36 0 -66 -20.5t-45 -53.5l-227 54q-9 2 -17.5 -2.5t-11.5 -14.5l-95 -302q-224 -4 -381 -113q-36 43 -93 43q-51 0 -87 -36.5t-36 -87.5q0 -37 19.5 -67.5t52.5 -45.5 q-7 -25 -7 -54q0 -98 74 -181.5t201.5 -132t278.5 -48.5q150 0 277.5 48.5t201.5 132t74 181.5q0 27 -6 54zM971 702q37 0 63 -26t26 -63t-26 -64t-63 -27t-63 27t-26 64t26 63t63 26z" />-<glyph unicode="" d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150 v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103 t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" horiz-adv-x="1920" d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328 v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />-<glyph unicode="" d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="2048" d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123 v-369h123z" />-<glyph unicode="" d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101 v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="2038" d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14 q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24 q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33 q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5 t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43 q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5 t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13 t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />-<glyph unicode="" d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10 q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14 q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14 t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44 q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />-<glyph unicode="" d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5 t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5 q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126 t135.5 51q85 0 145 -60.5t60 -145.5z" />-<glyph unicode="" d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5 q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28 q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11 q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q106 35 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5 q20 0 20 -21v-418z" />-<glyph unicode="" horiz-adv-x="1792" d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48 l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23 t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128 q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128 q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />-<glyph unicode="" d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9 t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9 t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9 t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />-<glyph unicode="" horiz-adv-x="1280" d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68t68 28t68 -28l228 -228h368l228 228q28 28 68 28t68 -28t28 -68t-28 -68zM864 1152q0 -93 -65.5 -158.5 t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />-<glyph unicode="" horiz-adv-x="1664" d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5 q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819 q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5 t100.5 134t141.5 55.5z" />-<glyph unicode="" horiz-adv-x="768" d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z " />-<glyph unicode="" horiz-adv-x="2304" d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67 t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-5 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70 v-400l434 -186q36 -16 57 -48t21 -70z" />-<glyph unicode="" horiz-adv-x="2048" d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658 q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204 q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />-<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5 t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217 t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />-<glyph unicode="" horiz-adv-x="1792" d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5 q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89 q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />-<glyph unicode="" d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5 q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5 q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z " />-<glyph unicode="" horiz-adv-x="1792" d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188 l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5 t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1 q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />-<glyph unicode="" horiz-adv-x="2048" d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384 q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5 l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />-<glyph unicode="" horiz-adv-x="2048" d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5 t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />-<glyph unicode="" d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384 q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />-<glyph unicode="" d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64 q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37 q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M1397 1408q58 0 98.5 -40.5t40.5 -98.5v-1258q0 -58 -40.5 -98.5t-98.5 -40.5h-1258q-58 0 -98.5 40.5t-40.5 98.5v1258q0 58 40.5 98.5t98.5 40.5h1258zM1465 11v1258q0 28 -20 48t-48 20h-1258q-28 0 -48 -20t-20 -48v-1258q0 -28 20 -48t48 -20h1258q28 0 48 20t20 48 zM694 749l188 -387l533 145v-496q0 -7 -5.5 -12.5t-12.5 -5.5h-1258q-7 0 -12.5 5.5t-5.5 12.5v141l711 195l-212 439q4 1 12 2.5t12 1.5q170 32 303.5 21.5t221 -46t143.5 -94.5q27 -28 -25 -42q-64 -16 -256 -62l-97 198q-111 7 -240 -16zM1397 1287q7 0 12.5 -5.5 t5.5 -12.5v-428q-85 30 -188 52q-294 64 -645 12l-18 -3l-65 134h-233l85 -190q-132 -51 -230 -137v560q0 7 5.5 12.5t12.5 5.5h1258zM286 387q-14 -3 -26 4.5t-14 21.5q-24 203 166 305l129 -270z" />-<glyph unicode="" horiz-adv-x="2304" d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11 q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245 q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785 l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242 q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236q0 -11 -8 -19 t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786q-13 2 -22 11t-9 22v899 q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />-<glyph unicode="" d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127 t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5 t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197 q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8 q-1 1 -1 2t-0.5 1.5t-0.5 1.5q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4l-3 21q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5t-3.5 -21.5l-4 -21h-4l-2 21 q-2 26 -7 46l-99 438h90v107h-300z" />-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107 h-290v-107h68l189 -272l-194 -283h-68z" />-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />-<glyph unicode="" d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400 v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79 q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5 q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243 l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />-<glyph unicode="" d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406 q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />-<glyph unicode="" horiz-adv-x="1792" d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546 q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />-<glyph unicode="" horiz-adv-x="2048" d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94 q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55 t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97q14 -16 29.5 -34t34.5 -40t29 -34q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5 t-85 -189.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194 q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5 t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348q0 222 101 414.5t276.5 317t390.5 155.5v-260q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 q0 230 -145.5 406t-366.5 221v260q215 -31 390.5 -155.5t276.5 -317t101 -414.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41 t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170 t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136 q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />-<glyph unicode="" horiz-adv-x="1792" d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251 l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162 q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33 q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5 t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71 t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />-<glyph unicode="" d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85 q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392 q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072 q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58 q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47 q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171 v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />-<glyph unicode="" d="M825 547l343 588h-150q-21 -39 -63.5 -118.5t-68 -128.5t-59.5 -118.5t-60 -128.5h-3q-21 48 -44.5 97t-52 105.5t-46.5 92t-54 104.5t-49 95h-150l323 -589v-435h134v436zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1280" d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5 t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153 t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5 q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20 t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5 t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />-<glyph unicode="" horiz-adv-x="2048" d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25 q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5 q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109 q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />-<glyph unicode="" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137 l863 639l-478 -797z" />-<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23 t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />-<glyph unicode="" d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15 t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2 t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160 q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5 q0 -26 -12 -48t-36 -22z" />-<glyph unicode="" horiz-adv-x="1280" d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179 q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />-<glyph unicode="" d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256 q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />-<glyph unicode="" d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5 t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />-<glyph unicode="" d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5 t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5 t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91 q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9 t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />-<glyph unicode="" horiz-adv-x="1792" d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323 l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />-<glyph unicode="" horiz-adv-x="1792" d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23 zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5 t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />-<glyph unicode="" horiz-adv-x="1792" d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />-<glyph unicode="" horiz-adv-x="1792" d="M1755 1083q37 -37 37 -90t-37 -91l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234l401 400 q38 37 91 37t90 -37z" />-<glyph unicode="" horiz-adv-x="1792" d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5 t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q3 -2 11 -7 t11 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />-<glyph unicode="" horiz-adv-x="1792" d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />-<glyph unicode="" d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36 q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q70 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5 t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87 q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />-<glyph unicode="" horiz-adv-x="2048" d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19 t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />-<glyph unicode="" horiz-adv-x="2048" d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121 q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />-<glyph unicode="" horiz-adv-x="1792" d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5 t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38 h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />-<glyph unicode="" horiz-adv-x="1792" d="M1112 1090q0 159 -237 159h-70q-32 0 -59.5 -21.5t-34.5 -52.5l-63 -276q-2 -5 -2 -16q0 -24 17 -39.5t41 -15.5h53q69 0 128.5 13t112.5 41t83.5 81.5t30.5 126.5zM1716 938q0 -265 -220 -428q-219 -161 -612 -161h-61q-32 0 -59 -21.5t-34 -52.5l-73 -316 q-8 -36 -40.5 -61.5t-69.5 -25.5h-213q-31 0 -53 20t-22 51q0 10 13 65h151q34 0 64 23.5t38 56.5l73 316q8 33 37.5 57t63.5 24h61q390 0 607 160t217 421q0 129 -51 207q183 -92 183 -335zM1533 1123q0 -264 -221 -428q-218 -161 -612 -161h-60q-32 0 -59.5 -22t-34.5 -53 l-73 -315q-8 -36 -40 -61.5t-69 -25.5h-214q-31 0 -52.5 19.5t-21.5 51.5q0 8 2 20l300 1301q8 36 40.5 61.5t69.5 25.5h444q68 0 125 -4t120.5 -15t113.5 -30t96.5 -50.5t77.5 -74t49.5 -103.5t18.5 -136z" />-<glyph unicode="" horiz-adv-x="1792" d="M602 949q19 -61 31 -123.5t17 -141.5t-14 -159t-62 -145q-21 81 -67 157t-95.5 127t-99 90.5t-78.5 57.5t-33 19q-62 34 -81.5 100t14.5 128t101 81.5t129 -14.5q138 -83 238 -177zM927 1236q11 -25 20.5 -46t36.5 -100.5t42.5 -150.5t25.5 -179.5t0 -205.5t-47.5 -209.5 t-105.5 -208.5q-51 -72 -138 -72q-54 0 -98 31q-57 40 -69 109t28 127q60 85 81 195t13 199.5t-32 180.5t-39 128t-22 52q-31 63 -8.5 129.5t85.5 97.5q34 17 75 17q47 0 88.5 -25t63.5 -69zM1248 567q-17 -160 -72 -311q-17 131 -63 246q25 174 -5 361q-27 178 -94 342 q114 -90 212 -211q9 -37 15 -80q26 -179 7 -347zM1520 1440q9 -17 23.5 -49.5t43.5 -117.5t50.5 -178t34 -227.5t5 -269t-47 -300t-112.5 -323.5q-22 -48 -66 -75.5t-95 -27.5q-39 0 -74 16q-67 31 -92.5 100t4.5 136q58 126 90 257.5t37.5 239.5t-3.5 213.5t-26.5 180.5 t-38.5 138.5t-32.5 90t-15.5 32.5q-34 65 -11.5 135.5t87.5 104.5q37 20 81 20q49 0 91.5 -25.5t66.5 -70.5z" />-<glyph unicode="" horiz-adv-x="2304" d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27 q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128 q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />-<glyph unicode="" horiz-adv-x="2304" d="M671 603h-13q-47 0 -47 -32q0 -22 20 -22q17 0 28 15t12 39zM1066 639h62v3q1 4 0.5 6.5t-1 7t-2 8t-4.5 6.5t-7.5 5t-11.5 2q-28 0 -36 -38zM1606 603h-12q-48 0 -48 -32q0 -22 20 -22q17 0 28 15t12 39zM1925 629q0 41 -30 41q-19 0 -31 -20t-12 -51q0 -42 28 -42 q20 0 32.5 20t12.5 52zM480 770h87l-44 -262h-56l32 201l-71 -201h-39l-4 200l-34 -200h-53l44 262h81l2 -163zM733 663q0 -6 -4 -42q-16 -101 -17 -113h-47l1 22q-20 -26 -58 -26q-23 0 -37.5 16t-14.5 42q0 39 26 60.5t73 21.5q14 0 23 -1q0 3 0.5 5.5t1 4.5t0.5 3 q0 20 -36 20q-29 0 -59 -10q0 4 7 48q38 11 67 11q74 0 74 -62zM889 721l-8 -49q-22 3 -41 3q-27 0 -27 -17q0 -8 4.5 -12t21.5 -11q40 -19 40 -60q0 -72 -87 -71q-34 0 -58 6q0 2 7 49q29 -8 51 -8q32 0 32 19q0 7 -4.5 11.5t-21.5 12.5q-43 20 -43 59q0 72 84 72 q30 0 50 -4zM977 721h28l-7 -52h-29q-2 -17 -6.5 -40.5t-7 -38.5t-2.5 -18q0 -16 19 -16q8 0 16 2l-8 -47q-21 -7 -40 -7q-43 0 -45 47q0 12 8 56q3 20 25 146h55zM1180 648q0 -23 -7 -52h-111q-3 -22 10 -33t38 -11q30 0 58 14l-9 -54q-30 -8 -57 -8q-95 0 -95 95 q0 55 27.5 90.5t69.5 35.5q35 0 55.5 -21t20.5 -56zM1319 722q-13 -23 -22 -62q-22 2 -31 -24t-25 -128h-56l3 14q22 130 29 199h51l-3 -33q14 21 25.5 29.5t28.5 4.5zM1506 763l-9 -57q-28 14 -50 14q-31 0 -51 -27.5t-20 -70.5q0 -30 13.5 -47t38.5 -17q21 0 48 13 l-10 -59q-28 -8 -50 -8q-45 0 -71.5 30.5t-26.5 82.5q0 70 35.5 114.5t91.5 44.5q26 0 61 -13zM1668 663q0 -18 -4 -42q-13 -79 -17 -113h-46l1 22q-20 -26 -59 -26q-23 0 -37 16t-14 42q0 39 25.5 60.5t72.5 21.5q15 0 23 -1q2 7 2 13q0 20 -36 20q-29 0 -59 -10q0 4 8 48 q38 11 67 11q73 0 73 -62zM1809 722q-14 -24 -21 -62q-23 2 -31.5 -23t-25.5 -129h-56l3 14q19 104 29 199h52q0 -11 -4 -33q15 21 26.5 29.5t27.5 4.5zM1950 770h56l-43 -262h-53l3 19q-23 -23 -52 -23q-31 0 -49.5 24t-18.5 64q0 53 27.5 92t64.5 39q31 0 53 -29z M2061 640q0 148 -72.5 273t-198 198t-273.5 73q-181 0 -328 -110q127 -116 171 -284h-50q-44 150 -158 253q-114 -103 -158 -253h-50q44 168 171 284q-147 110 -328 110q-148 0 -273.5 -73t-198 -198t-72.5 -273t72.5 -273t198 -198t273.5 -73q181 0 328 110 q-120 111 -165 264h50q46 -138 152 -233q106 95 152 233h50q-45 -153 -165 -264q147 -110 328 -110q148 0 273.5 73t198 198t72.5 273zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />-<glyph unicode="" horiz-adv-x="2304" d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42 q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604 v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569 q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73 t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />-<glyph unicode="" horiz-adv-x="2304" d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260 l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279 v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040 q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168 q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5 t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21 h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5 t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />-<glyph unicode="" horiz-adv-x="2304" d="M322 689h-15q-19 0 -19 18q0 28 19 85q5 15 15 19.5t28 4.5q77 0 77 -49q0 -41 -30.5 -59.5t-74.5 -18.5zM664 528q-47 0 -47 29q0 62 123 62l3 -3q-5 -88 -79 -88zM1438 687h-15q-19 0 -19 19q0 28 19 85q5 15 14.5 19t28.5 4q77 0 77 -49q0 -41 -30.5 -59.5 t-74.5 -18.5zM1780 527q-47 0 -47 30q0 62 123 62l3 -3q-5 -89 -79 -89zM373 894h-128q-8 0 -14.5 -4t-8.5 -7.5t-7 -12.5q-3 -7 -45 -190t-42 -192q0 -7 5.5 -12.5t13.5 -5.5h62q25 0 32.5 34.5l15 69t32.5 34.5q47 0 87.5 7.5t80.5 24.5t63.5 52.5t23.5 84.5 q0 36 -14.5 61t-41 36.5t-53.5 15.5t-62 4zM719 798q-38 0 -74 -6q-2 0 -8.5 -1t-9 -1.5l-7.5 -1.5t-7.5 -2t-6.5 -3t-6.5 -4t-5 -5t-4.5 -7t-4 -9q-9 -29 -9 -39t9 -10q5 0 21.5 5t19.5 6q30 8 58 8q74 0 74 -36q0 -11 -10 -14q-8 -2 -18 -3t-21.5 -1.5t-17.5 -1.5 q-38 -4 -64.5 -10t-56.5 -19.5t-45.5 -39t-15.5 -62.5q0 -38 26 -59.5t64 -21.5q24 0 45.5 6.5t33 13t38.5 23.5q-3 -7 -3 -15t5.5 -13.5t12.5 -5.5h56q1 1 7 3.5t7.5 3.5t5 3.5t5 5.5t2.5 8l45 194q4 13 4 30q0 81 -145 81zM1247 793h-74q-22 0 -39 -23q-5 -7 -29.5 -51 t-46.5 -81.5t-26 -38.5l-5 4q0 77 -27 166q-1 5 -3.5 8.5t-6 6.5t-6.5 5t-8.5 3t-8.5 1.5t-9.5 1t-9 0.5h-10h-8.5q-38 0 -38 -21l1 -5q5 -53 25 -151t25 -143q2 -16 2 -24q0 -19 -30.5 -61.5t-30.5 -58.5q0 -13 40 -13q61 0 76 25l245 415q10 20 10 26q0 9 -8 9zM1489 892 h-129q-18 0 -29 -23q-6 -13 -46.5 -191.5t-40.5 -190.5q0 -20 43 -20h7.5h9h9t9.5 1t8.5 2t8.5 3t6.5 4.5t5.5 6t3 8.5l21 91q2 10 10.5 17t19.5 7q47 0 87.5 7t80.5 24.5t63.5 52.5t23.5 84q0 36 -14.5 61t-41 36.5t-53.5 15.5t-62 4zM1835 798q-26 0 -74 -6 q-38 -6 -48 -16q-7 -8 -11 -19q-8 -24 -8 -39q0 -10 8 -10q1 0 41 12q30 8 58 8q74 0 74 -36q0 -12 -10 -14q-4 -1 -57 -7q-38 -4 -64.5 -10t-56.5 -19.5t-45.5 -39t-15.5 -62.5t26 -58.5t64 -21.5q24 0 45 6t34 13t38 24q-3 -15 -3 -16q0 -5 2 -8.5t6.5 -5.5t8 -3.5 t10.5 -2t9.5 -0.5h9.5h8q42 0 48 25l45 194q3 15 3 31q0 81 -145 81zM2157 889h-55q-25 0 -33 -40q-10 -44 -36.5 -167t-42.5 -190v-5q0 -16 16 -18h1h57q10 0 18.5 6.5t10.5 16.5l83 374h-1l1 5q0 7 -5.5 12.5t-13.5 5.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048 q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />-<glyph unicode="" horiz-adv-x="2304" d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109 q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118 q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151 q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31 q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />-<glyph unicode="" horiz-adv-x="2048" d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5 l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5 l418 363q10 8 23.5 7t21.5 -11z" />-<glyph unicode="" horiz-adv-x="2048" d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128 q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161 q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />-<glyph unicode="" horiz-adv-x="1408" d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167 q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />-<glyph unicode="" d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5 t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53 q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24 t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61 t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />-<glyph unicode="" horiz-adv-x="1792" d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10 t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />-<glyph unicode="" horiz-adv-x="1792" d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5 t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />-<glyph unicode="" horiz-adv-x="1792" d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11t55.5 -11t52.5 -38q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5t47 37.5 q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-35 0 -55.5 11t-52.5 38q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38t-58 27 t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448h256v448 h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51 t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />-<glyph unicode="" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />-<glyph unicode="" horiz-adv-x="1792" d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />-<glyph unicode="" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9 t9 -23z" />-<glyph unicode="" horiz-adv-x="1792" d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20 q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50 t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1 q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />-<glyph unicode="" d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73 q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110 q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />-<glyph unicode="" horiz-adv-x="2048" d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5 t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5 t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />-<glyph unicode="" horiz-adv-x="2048" d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5 t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />-<glyph unicode="" horiz-adv-x="2304" d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94 q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469 q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400 q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />-<glyph unicode="" d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5 h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />-<glyph unicode="" horiz-adv-x="2048" d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327 q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5 q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />-<glyph unicode="" horiz-adv-x="1280" d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q18 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119 t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5 t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14 q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88 q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5 t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />-<glyph unicode="" horiz-adv-x="2048" d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206 q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307 t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14 t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />-<glyph unicode="" d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5 t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />-<glyph unicode="" d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55 q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410 q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />-<glyph unicode="" horiz-adv-x="1792" />-<glyph unicode="" horiz-adv-x="1792" />-<glyph unicode="" horiz-adv-x="1792" />-</font>-</defs></svg>\ No newline at end of filediff --git a/solr/solr-ref-guide/src/fonts/fontawesome/fontawesome-webfont.ttf b/solr/solr-ref-guide/src/fonts/fontawesome/fontawesome-webfont.ttfdeleted file mode 100755index 96a3639cdde..00000000000Binary files a/solr/solr-ref-guide/src/fonts/fontawesome/fontawesome-webfont.ttf and /dev/null differdiff --git a/solr/solr-ref-guide/src/fonts/fontawesome/fontawesome-webfont.woff b/solr/solr-ref-guide/src/fonts/fontawesome/fontawesome-webfont.woffdeleted file mode 100755index 628b6a52a87..00000000000Binary files a/solr/solr-ref-guide/src/fonts/fontawesome/fontawesome-webfont.woff and /dev/null differdiff --git a/solr/solr-ref-guide/src/js/customscripts.js b/solr/solr-ref-guide/src/js/customscripts.jsdeleted file mode 100755index 45e89d1e94c..00000000000--- a/solr/solr-ref-guide/src/js/customscripts.js+++ /dev/null@@ -1,79 +0,0 @@--//$('#sidebar').height($(".nav").height());---$( document ).ready(function() {-- // "Bootstrap Bootstrap"- // NOTE: by default, we use "dynamic-tabs" in our wrapper instead of "tab-content"- // so that if javascript is disabled, bootstrap's CSS doesn't hide all non-active "tab-pane" divs- $(".dynamic-tabs").each(function(ignored) {- $(this).addClass("tab-content");- var nav_ul = $("<ul>", { "class": "nav nav-pills" });- $(".tab-pane", this).each(function(tab_index) {- var pill_li = $("<li>", { "class": "nav-item" });- var pill_a = $("<a>", { "class": "nav-link", "role": "tab", "data-toggle": "pill" } );-- if ($(this)[0].hasAttribute("id")) {- pill_a.attr("href", "#" + $(this).attr("id"));- } else {- // our validator will complain if a tab-pane has no id, but if the user- // views the resultin HTML, draw attention to it...- pill_a.append( " BAD TAB-PANE HAS NO ID ");- }-- var label = $(".tab-label", this);- if (0==label.length) {- // our validator will complain if a tab-pane has no tab-label, but if the user- // views the resultin HTML, draw attention to it...- pill_a.append( " BAD TAB-PANE HAS NO TAB-LABEL ");- } else {- // NOTE: using the "inner" HTML of the label...- // so by default we can use "bold" (or whatever) in our asciidoc and have that- // be what people see when javascript is disabled,- // but when the pills+tabs get active, the pills won't all be bold (or whatever)- pill_a.append( label.html() );- // NOTE: Removing the label isn't strictly neccessary, but makes the pills/tabs less redundent- label.remove();- }-- // force the first tab to always be the active tab- if (0 == tab_index) {- $(this).addClass("active");- pill_a.addClass("active");- } else {- // our validator should have prevented this, but remove them just in case- $(this).removeClass("active");- }-- pill_li.append(pill_a);- nav_ul.append(pill_li);- });- $(this).before(nav_ul);- });--});--// Adds scrollbar for the sidebar nav-$(document).ready(function () {-- $("#sidebar").mCustomScrollbar({- theme: "minimal"- });--});--// Forces all non-solr.apache.org links to open in new tab-$(document).ready(function () {- $("a[href^=http]").each(function(){- var all_links = document.querySelectorAll('a');- for (var i = 0; i < all_links.length; i++){- var a = all_links[i];- if(a.hostname != location.hostname) {- a.rel = 'noopener';- a.target = '_blank';- }-}- }-)-})diff --git a/solr/solr-ref-guide/src/js/jekyll-search.js b/solr/solr-ref-guide/src/js/jekyll-search.jsdeleted file mode 100755index 04d6a0d3a48..00000000000--- a/solr/solr-ref-guide/src/js/jekyll-search.js+++ /dev/null@@ -1 +0,0 @@-!function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a="function"==typeof require&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}for(var i="function"==typeof require&&require,o=0;o<r.length;o++)s(r[o]);return s}({1:[function(require,module){module.exports=function(){function receivedResponse(xhr){return 200==xhr.status&&4==xhr.readyState}function handleResponse(xhr,callback){xhr.onreadystatechange=function(){if(receivedResponse(xhr))try{callback(null,JSON.parse(xhr.responseText))}catch(err){callback(err,null)}}}var self=this;self.load=function(location,callback){var xhr=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP");xhr.open("GET",location,!0),handleResponse(xhr,callback),xhr.send()}}},{}],2:[function(require,module){function FuzzySearchStrategy(){function createFuzzyRegExpFromString(string){return new RegExp(string.split("").join(".*?"),"gi")}var self=this;self.matches=function(string,crit){return"string"!=typeof string?!1:(string=string.trim(),!!string.match(createFuzzyRegExpFromString(crit)))}}module.exports=new FuzzySearchStrategy},{}],3:[function(require,module){function LiteralSearchStrategy(){function doMatch(string,crit){return string.toLowerCase().indexOf(crit.toLowerCase())>=0}var self=this;self.matches=function(string,crit){return"string"!=typeof string?!1:(string=string.trim(),doMatch(string,crit))}}module.exports=new LiteralSearchStrategy},{}],4:[function(require,module){module.exports=function(){function findMatches(store,crit,strategy){for(var data=store.get(),i=0;i<data.length&&matches.length<limit;i++)findMatchesInObject(data[i],crit,strategy);return matches}function findMatchesInObject(obj,crit,strategy){for(var key in obj)if(strategy.matches(obj[key],crit)){matches.push(obj);break}}function getSearchStrategy(){return fuzzy?fuzzySearchStrategy:literalSearchStrategy}var self=this,matches=[],fuzzy=!1,limit=10,fuzzySearchStrategy=require("./SearchStrategies/fuzzy"),literalSearchStrategy=require("./SearchStrategies/literal");self.setFuzzy=function(_fuzzy){fuzzy=!!_fuzzy},self.setLimit=function(_limit){limit=parseInt(_limit,10)||limit},self.search=function(data,crit){return crit?(matches.length=0,findMatches(data,crit,getSearchStrategy())):[]}}},{"./SearchStrategies/fuzzy":2,"./SearchStrategies/literal":3}],5:[function(require,module){module.exports=function(_store){function isObject(obj){return!!obj&&"[object Object]"==Object.prototype.toString.call(obj)}function isArray(obj){return!!obj&&"[object Array]"==Object.prototype.toString.call(obj)}function addObject(data){return store.push(data),data}function addArray(data){for(var added=[],i=0;i<data.length;i++)isObject(data[i])&&added.push(addObject(data[i]));return added}var self=this,store=[];isArray(_store)&&addArray(_store),self.clear=function(){return store.length=0,store},self.get=function(){return store},self.put=function(data){return isObject(data)?addObject(data):isArray(data)?addArray(data):void 0}}},{}],6:[function(require,module){module.exports=function(){var self=this,templatePattern=/\{(.*?)\}/g;self.setTemplatePattern=function(newTemplatePattern){templatePattern=newTemplatePattern},self.render=function(t,data){return t.replace(templatePattern,function(match,prop){return data[prop]||match})}}},{}],7:[function(require){!function(window){"use strict";function SimpleJekyllSearch(){function initWithJSON(){store.put(opt.dataSource),registerInput()}function initWithURL(url){jsonLoader.load(url,function(err,json){err?throwError("failed to get JSON ("+url+")"):(store.put(json),registerInput())})}function throwError(message){throw new Error("SimpleJekyllSearch --- "+message)}function validateOptions(_opt){for(var i=0;i<requiredOptions.length;i++){var req=requiredOptions[i];_opt[req]||throwError("You must specify a "+req)}}function assignOptions(_opt){for(var option in opt)opt[option]=_opt[option]||opt[option]}function isJSON(json){try{return json instanceof Object&&JSON.parse(JSON.stringify(json))}catch(e){return!1}}function emptyResultsContainer(){opt.resultsContainer.innerHTML=""}function appendToResultsContainer(text){opt.resultsContainer.innerHTML+=text}function registerInput(){opt.searchInput.addEventListener("keyup",function(e){return 0==e.target.value.length?void emptyResultsContainer():void render(searcher.search(store,e.target.value))})}function render(results){if(emptyResultsContainer(),0==results.length)return appendToResultsContainer(opt.noResultsText);for(var i=0;i<results.length;i++)appendToResultsContainer(templater.render(opt.searchResultTemplate,results[i]))}var self=this,requiredOptions=["searchInput","resultsContainer","dataSource"],opt={searchInput:null,resultsContainer:null,dataSource:[],searchResultTemplate:'<li><a href="{url}" title="{desc}">{title}</a></li>',noResultsText:"No results found",limit:10,fuzzy:!1};self.init=function(_opt){validateOptions(_opt),assignOptions(_opt),isJSON(opt.dataSource)?initWithJSON(opt.dataSource):initWithURL(opt.dataSource)}}var Searcher=require("./Searcher"),Templater=require("./Templater"),Store=require("./Store"),JSONLoader=require("./JSONLoader"),searcher=new Searcher,templater=new Templater,store=new Store,jsonLoader=new JSONLoader;window.SimpleJekyllSearch=new SimpleJekyllSearch}(window,document)},{"./JSONLoader":1,"./Searcher":4,"./Store":5,"./Templater":6}]},{},[7]);\ No newline at end of filediff --git a/solr/solr-ref-guide/src/js/jquery.navgoco.min.js b/solr/solr-ref-guide/src/js/jquery.navgoco.min.jsdeleted file mode 100755index 4ba44753323..00000000000--- a/solr/solr-ref-guide/src/js/jquery.navgoco.min.js+++ /dev/null@@ -1,8 +0,0 @@-/*- * jQuery Navgoco Menus Plugin v0.2.1 (2014-04-11)- * https://github.com/tefra/navgoco- *- * Copyright (c) 2014 Chris T (@tefra)- * BSD - https://github.com/tefra/navgoco/blob/master/LICENSE-BSD- */-!function(a){"use strict";var b=function(b,c,d){return this.el=b,this.$el=a(b),this.options=c,this.uuid=this.$el.attr("id")?this.$el.attr("id"):d,this.state={},this.init(),this};b.prototype={init:function(){var b=this;b._load(),b.$el.find("ul").each(function(c){var d=a(this);d.attr("data-index",c),b.options.save&&b.state.hasOwnProperty(c)?(d.parent().addClass(b.options.openClass),d.show()):d.parent().hasClass(b.options.openClass)?(d.show(),b.state[c]=1):d.hide()});var c=a("<span></span>").prepend(b.options.caretHtml),d=b.$el.find("li > a");b._trigger(c,!1),b._trigger(d,!0),b.$el.find("li:has(ul) > a").prepend(c)},_trigger:function(b,c){var d=this;b.on("click",function(b){b.stopPropagation();var e=c?a(this).next():a(this).parent().next(),f=!1;if(c){var g=a(this).attr("href");f=void 0===g||""===g||"#"===g}if(e=e.length>0?e:!1,d.options.onClickBefore.call(this,b,e),!c||e&&f)b.preventDefault(),d._toggle(e,e.is(":hidden")),d._save();else if(d.options.accordion){var h=d.state=d._parents(a(this));d.$el.find("ul").filter(":visible").each(function(){var b=a(this),c=b.attr("data-index");h.hasOwnProperty(c)||d._toggle(b,!1)}),d._save()}d.options.onClickAfter.call(this,b,e)})},_toggle:function(b,c){var d=this,e=b.attr("data-index"),f=b.parent();if(d.options.onToggleBefore.call(this,b,c),c){if(f.addClass(d.options.openClass),b.slideDown(d.options.slide),d.state[e]=1,d.options.accordion){var g=d.state=d._parents(b);g[e]=d.state[e]=1,d.$el.find("ul").filter(":visible").each(function(){var b=a(this),c=b.attr("data-index");g.hasOwnProperty(c)||d._toggle(b,!1)})}}else f.removeClass(d.options.openClass),b.slideUp(d.options.slide),d.state[e]=0;d.options.onToggleAfter.call(this,b,c)},_parents:function(b,c){var d={},e=b.parent(),f=e.parents("ul");return f.each(function(){var b=a(this),e=b.attr("data-index");return e?void(d[e]=c?b:1):!1}),d},_save:function(){if(this.options.save){var b={};for(var d in this.state)1===this.state[d]&&(b[d]=1);c[this.uuid]=this.state=b,a.cookie(this.options.cookie.name,JSON.stringify(c),this.options.cookie)}},_load:function(){if(this.options.save){if(null===c){var b=a.cookie(this.options.cookie.name);c=b?JSON.parse(b):{}}this.state=c.hasOwnProperty(this.uuid)?c[this.uuid]:{}}},toggle:function(b){var c=this,d=arguments.length;if(1>=d)c.$el.find("ul").each(function(){var d=a(this);c._toggle(d,b)});else{var e,f={},g=Array.prototype.slice.call(arguments,1);d--;for(var h=0;d>h;h++){e=g[h];var i=c.$el.find('ul[data-index="'+e+'"]').first();if(i&&(f[e]=i,b)){var j=c._parents(i,!0);for(var k in j)f.hasOwnProperty(k)||(f[k]=j[k])}}for(e in f)c._toggle(f[e],b)}c._save()},destroy:function(){a.removeData(this.$el),this.$el.find("li:has(ul) > a").unbind("click"),this.$el.find("li:has(ul) > a > span").unbind("click")}},a.fn.navgoco=function(c){if("string"==typeof c&&"_"!==c.charAt(0)&&"init"!==c)var d=!0,e=Array.prototype.slice.call(arguments,1);else c=a.extend({},a.fn.navgoco.defaults,c||{}),a.cookie||(c.save=!1);return this.each(function(f){var g=a(this),h=g.data("navgoco");h||(h=new b(this,d?a.fn.navgoco.defaults:c,f),g.data("navgoco",h)),d&&h[c].apply(h,e)})};var c=null;a.fn.navgoco.defaults={caretHtml:"",accordion:!1,openClass:"open",save:!0,cookie:{name:"navgoco",expires:!1,path:"/"},slide:{duration:400,easing:"swing"},onClickBefore:a.noop,onClickAfter:a.noop,onToggleBefore:a.noop,onToggleAfter:a.noop}}(jQuery);\ No newline at end of filediff --git a/solr/solr-ref-guide/src/math-expressions.adoc b/solr/solr-ref-guide/src/math-expressions.adocdeleted file mode 100644index f78f15fe931..00000000000--- a/solr/solr-ref-guide/src/math-expressions.adoc+++ /dev/null@@ -1,90 +0,0 @@-= Streaming Expressions and Math Expressions-:page-children: visualization, \- math-start, \- loading, \- search-sample, \- transform, \- scalar-math, \- vector-math, \- variables, \- matrix-math, \- term-vectors, \- probability-distributions, \- statistics, \- regression, \- curve-fitting, \- time-series, \- numerical-analysis, \- dsp, \- simulations, \- machine-learning, \- graph, \- computational-geometry, \- logs-: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-// regarding copyright ownership. The ASF licenses this file-// to you under the Apache License, Version 2.0 (the-// "License"); you may not use this file except in compliance-// with the License. You may obtain a copy of the License at-//-// http://www.apache.org/licenses/LICENSE-2.0-//-// Unless required by applicable law or agreed to in writing,-// software distributed under the License is distributed on an-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY-// KIND, either express or implied. See the License for the-// specific language governing permissions and limitations-// under the License.--== A Visual Guide--image::images/math-expressions/searchiris.png[]--== Table of Contents--*<<visualization.adoc#,Visualizations>>*: Gallery of streaming expression and math expression visualizations.--*<<math-start.adoc#,Getting Started>>*: Getting started with streaming expressions, math expressions, and visualization.--*<<loading.adoc#,Data Loading>>*: Visualizing, transforming and loading CSV files.--*<<search-sample.adoc#,Searching, Sampling and Aggregation>>*: Searching, sampling, aggregation and visualization of result sets.--*<<transform.adoc#,Transforming Data>>*: Transforming and filtering result sets.--*<<scalar-math.adoc#,Scalar Math>>*: Math functions and visualization applied to numbers.--*<<vector-math.adoc#,Vector Math>>*: Vector math, manipulation and visualization.--*<<variables.adoc#, Variables and Vectorization>>*: Vectorizing result sets and assigning and visualizing variables.--*<<matrix-math.adoc#,Matrix Math>>*: Matrix math, manipulation and visualization.--*<<term-vectors.adoc#,Text Analysis and Term Vectors>>*: Text analysis and TF-IDF term vectors.--*<<probability-distributions.adoc#,Probability>>*: Continuous and discrete probability distribution functions.--*<<statistics.adoc#,Statistics>>*: Descriptive statistics, histograms, percentiles, correlation, inference tests and other stats functions.--*<<regression.adoc#,Linear Regression>>*: Simple and multivariate linear regression.--*<<curve-fitting.adoc#,Curve Fitting>>*: Polynomial, harmonic and Gaussian curve fitting.--*<<time-series.adoc#,Time Series>>*: Time series aggregation, visualization, smoothing, differencing, anomaly detection and forecasting.--*<<numerical-analysis.adoc#,Interpolation and Numerical Calculus>>*: Interpolation, derivatives and integrals.--*<<dsp.adoc#,Signal Processing>>*: Convolution, cross-correlation, autocorrelation and fast Fourier transforms.--*<<simulations.adoc#,Simulations>>*: Monte Carlo simulations and random walks.--*<<machine-learning.adoc#,Machine Learning>>*: Distance, KNN, DBSCAN, K-means, fuzzy K-means and other ML functions.--*<<graph.adoc#,Graph>>*: Bipartite graphs, in-degree centrality, graph recommenders, temporal graphs and event correlation.--*<<computational-geometry.adoc#,Computational Geometry>>*: Convex Hulls and Enclosing Disks.--*<<logs.adoc#,Appendix A>>*: Solr log analytics and visualization.diff --git a/solr/solr-ref-guide/src/configuration-apis.adoc b/solr/solr-ref-guide/src/old-pages/configuration-apis.adocsimilarity index 100%rename from solr/solr-ref-guide/src/configuration-apis.adocrename to solr/solr-ref-guide/src/old-pages/configuration-apis.adocdiff --git a/solr/solr-ref-guide/src/configuration-guide.adoc b/solr/solr-ref-guide/src/old-pages/configuration-guide.adocsimilarity index 100%rename from solr/solr-ref-guide/src/configuration-guide.adocrename to solr/solr-ref-guide/src/old-pages/configuration-guide.adocdiff --git a/solr/solr-ref-guide/src/controlling-results.adoc b/solr/solr-ref-guide/src/old-pages/controlling-results.adocsimilarity index 100%rename from solr/solr-ref-guide/src/controlling-results.adocrename to solr/solr-ref-guide/src/old-pages/controlling-results.adocdiff --git a/solr/solr-ref-guide/src/deployment-guide.adoc b/solr/solr-ref-guide/src/old-pages/deployment-guide.adocsimilarity index 100%rename from solr/solr-ref-guide/src/deployment-guide.adocrename to solr/solr-ref-guide/src/old-pages/deployment-guide.adocdiff --git a/solr/solr-ref-guide/src/enhancing-queries.adoc b/solr/solr-ref-guide/src/old-pages/enhancing-queries.adocsimilarity index 100%rename from solr/solr-ref-guide/src/enhancing-queries.adocrename to solr/solr-ref-guide/src/old-pages/enhancing-queries.adocdiff --git a/solr/solr-ref-guide/src/field-types.adoc b/solr/solr-ref-guide/src/old-pages/field-types.adocsimilarity index 100%rename from solr/solr-ref-guide/src/field-types.adocrename to solr/solr-ref-guide/src/old-pages/field-types.adocdiff --git a/solr/solr-ref-guide/src/fields-and-schema-design.adoc b/solr/solr-ref-guide/src/old-pages/fields-and-schema-design.adocsimilarity index 100%rename from solr/solr-ref-guide/src/fields-and-schema-design.adocrename to solr/solr-ref-guide/src/old-pages/fields-and-schema-design.adocdiff --git a/solr/solr-ref-guide/src/getting-started.adoc b/solr/solr-ref-guide/src/old-pages/getting-started.adocsimilarity index 100%rename from solr/solr-ref-guide/src/getting-started.adocrename to solr/solr-ref-guide/src/old-pages/getting-started.adocdiff --git a/solr/solr-ref-guide/src/indexing-data-operations.adoc b/solr/solr-ref-guide/src/old-pages/indexing-data-operations.adocsimilarity index 100%rename from solr/solr-ref-guide/src/indexing-data-operations.adocrename to solr/solr-ref-guide/src/old-pages/indexing-data-operations.adocdiff --git a/solr/solr-ref-guide/src/installation-deployment.adoc b/solr/solr-ref-guide/src/old-pages/installation-deployment.adocsimilarity index 100%rename from solr/solr-ref-guide/src/installation-deployment.adocrename to solr/solr-ref-guide/src/old-pages/installation-deployment.adocdiff --git a/solr/solr-ref-guide/src/monitoring-solr.adoc b/solr/solr-ref-guide/src/old-pages/monitoring-solr.adocsimilarity index 100%rename from solr/solr-ref-guide/src/monitoring-solr.adocrename to solr/solr-ref-guide/src/old-pages/monitoring-solr.adocdiff --git a/solr/solr-ref-guide/src/query-guide.adoc b/solr/solr-ref-guide/src/old-pages/query-guide.adocsimilarity index 100%rename from solr/solr-ref-guide/src/query-guide.adocrename to solr/solr-ref-guide/src/old-pages/query-guide.adocdiff --git a/solr/solr-ref-guide/src/scaling-solr.adoc b/solr/solr-ref-guide/src/old-pages/scaling-solr.adocsimilarity index 100%rename from solr/solr-ref-guide/src/scaling-solr.adocrename to solr/solr-ref-guide/src/old-pages/scaling-solr.adocdiff --git a/solr/solr-ref-guide/src/schema-indexing-guide.adoc b/solr/solr-ref-guide/src/old-pages/schema-indexing-guide.adocsimilarity index 100%rename from solr/solr-ref-guide/src/schema-indexing-guide.adocrename to solr/solr-ref-guide/src/old-pages/schema-indexing-guide.adocdiff --git a/solr/solr-ref-guide/src/solr-concepts.adoc b/solr/solr-ref-guide/src/old-pages/solr-concepts.adocsimilarity index 100%rename from solr/solr-ref-guide/src/solr-concepts.adocrename to solr/solr-ref-guide/src/old-pages/solr-concepts.adocdiff --git a/solr/solr-ref-guide/src/solr-schema.adoc b/solr/solr-ref-guide/src/old-pages/solr-schema.adocsimilarity index 100%rename from solr/solr-ref-guide/src/solr-schema.adocrename to solr/solr-ref-guide/src/old-pages/solr-schema.adocdiff --git a/solr/solr-ref-guide/src/solrcloud-clusters.adoc b/solr/solr-ref-guide/src/old-pages/solrcloud-clusters.adocsimilarity index 100%rename from solr/solr-ref-guide/src/solrcloud-clusters.adocrename to solr/solr-ref-guide/src/old-pages/solrcloud-clusters.adocdiff --git a/solr/solr-ref-guide/src/user-managed-clusters.adoc b/solr/solr-ref-guide/src/old-pages/user-managed-clusters.adocsimilarity index 100%rename from solr/solr-ref-guide/src/user-managed-clusters.adocrename to solr/solr-ref-guide/src/old-pages/user-managed-clusters.adocdiff --git a/solr/solr-ref-guide/src/search.json b/solr/solr-ref-guide/src/search.jsondeleted file mode 100755index 186ed77e78e..00000000000--- a/solr/solr-ref-guide/src/search.json+++ /dev/null@@ -1,21 +0,0 @@-----title: search-layout: none-search: exclude------[-{% for page in site.pages %}-{% unless page.search == "exclude" %}-{-"title": "{{ page.title | escape }}",-"tags": "{{ page.tags }}",-"keywords": "{{page.keywords}}",-"url": "{{ page.url | remove: "/"}}",-"summary": "{{page.summary | strip }}"-}-{% unless forloop.last %},{% endunless %}-{% endunless %}-{% endfor %}--]diff --git a/solr/solr-ref-guide/src/sitemap.xml b/solr/solr-ref-guide/src/sitemap.xmldeleted file mode 100755index ba2032d4027..00000000000--- a/solr/solr-ref-guide/src/sitemap.xml+++ /dev/null@@ -1,17 +0,0 @@-----layout: none-search: exclude------<?xml version="1.0" encoding="UTF-8"?>-<urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"- xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"- xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">- {% for page in site.pages %}- {% unless page.search == "exclude" %}- <url>- <loc>{{site.url}}{{site.solr-attributes.solr-guide-version-path}}{{page.url}}</loc>- </url>- {% endunless %}- {% endfor %}-</urlset>diff --git a/solr/solr-ref-guide/tools/org/apache/solr/guide/BuildNavDataFiles.java b/solr/solr-ref-guide/tools/org/apache/solr/guide/BuildNavDataFiles.javadeleted file mode 100644index 9a4d3987fdb..00000000000--- a/solr/solr-ref-guide/tools/org/apache/solr/guide/BuildNavDataFiles.java+++ /dev/null@@ -1,298 +0,0 @@-/*- * 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 regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package org.apache.solr.guide;--import java.io.*;-import java.io.FilenameFilter;-import java.util.*;-import java.util.concurrent.atomic.AtomicReference;--import org.json.*;--import org.asciidoctor.Asciidoctor.Factory;-import org.asciidoctor.Asciidoctor;-import org.asciidoctor.ast.DocumentHeader;---public class BuildNavDataFiles {-- public static void main(String[] args) throws Exception {- if (args.length != 2) {- throw new RuntimeException("Wrong # of args: " + args.length);- }-- final File adocDir = new File(args[0]);- final String mainPageShortname = args[1];- if (! adocDir.exists()) {- throw new RuntimeException("asciidoc directory does not exist: " + adocDir.toString());- }-- // build up a quick mapping of every known page- System.out.println("Building up tree of all known pages");- final Map<String,Page> allPages = new LinkedHashMap<String,Page>();- Asciidoctor doctor = null;- try {- doctor = Factory.create();- final File[] adocFiles = adocDir.listFiles(ADOC_FILE_NAMES);- for (File file : adocFiles) {- Page page = new Page(file, doctor.readDocumentHeader(file));- if (allPages.containsKey(page.shortname)) {- throw new RuntimeException("multiple pages with same shortname: " + page.file.toString() + " and " + allPages.get(page.shortname));- }- allPages.put(page.shortname, page);- }- } finally {- if (null != doctor) {- doctor.shutdown();- doctor = null;- }- }-- // build up a hierarchical structure rooted at our mainPage- final Page mainPage = allPages.get(mainPageShortname);- if (null == mainPage) {- throw new RuntimeException("no main-page found with shortname: " + mainPageShortname);- }- // NOTE: mainPage claims to be its own parent to prevent anyone descendant from introducing a loop- mainPage.buildPageTreeRecursive(mainPage, allPages);-- { // validate that there are no orphan pages- int orphans = 0;- for (Page p : allPages.values()) {- if (null == p.getParent()) {- orphans++;- System.err.println("ERROR: Orphan page: " + p.file);- }- }- if (0 != orphans) {- throw new RuntimeException("Found " + orphans + " orphan pages (which are not in the 'page-children' attribute of any other pages)");- }- }-- // Loop over all files "in order" to build up next/prev maps for use in building the scrollnav- final Map<String,Page> nextPage = new HashMap<String,Page>();- final Map<String,Page> prevPage = new HashMap<String,Page>();- System.out.println("Looping over pages to build nav data");-- { // the previous page seen during our walk- AtomicReference<Page> previous = new AtomicReference<Page>();-- mainPage.depthFirstWalk(new Page.RecursiveAction() {- public boolean act(Page page) {- if (null != previous.get()) {- // add previous as our 'prev' page, and ourselves as the 'next' of previous- prevPage.put(page.shortname, previous.get());- nextPage.put(previous.get().shortname, page);- }- previous.set(page);- return true;- }- });- }-- // Build up the scrollnav file for jekyll's footer- File scrollnavFile = new File(new File(adocDir, "_data"), "scrollnav.json");- if (scrollnavFile.exists()) {- throw new RuntimeException(scrollnavFile.toString() + " already exists");- }- System.out.println("Creating " + scrollnavFile.toString());- try (Writer w = new OutputStreamWriter(new FileOutputStream(scrollnavFile), "UTF-8")) {- JSONObject scrollnav = new JSONObject();- for (Page p : allPages.values()) {- JSONObject current = new JSONObject();- Page prev = prevPage.get(p.shortname);- Page next = nextPage.get(p.shortname);- if (null != prev) {- current.put("prev",- new JSONObject()- .put("url", prev.permalink)- .put("title", prev.title));- }- if (null != next) {- current.put("next",- new JSONObject()- .put("url", next.permalink)- .put("title", next.title));- }- scrollnav.put(p.shortname, current);- }- // HACK: jekyll doesn't like escaped forward slashes in it's JSON?- w.write(scrollnav.toString(2).replaceAll("\\\\/","/"));- }-- // Build up the sidebar file for jekyll- File sidebarFile = new File(new File(adocDir, "_data"), "sidebar.json");- if (sidebarFile.exists()) {- throw new RuntimeException(sidebarFile.toString() + " already exists");- }- System.out.println("Creating " + sidebarFile.toString());- try (Writer w = new OutputStreamWriter(new FileOutputStream(sidebarFile), "UTF-8")) {- // A stack for tracking what we're working on as we recurse- final Stack<JSONObject> stack = new Stack<JSONObject>();-- mainPage.depthFirstWalk(new Page.RecursiveAction() {- public boolean act(Page page) {- final int depth = stack.size();- if (4 < depth) {- System.err.println("ERROR: depth==" + depth + " for " + page.permalink);- System.err.println("sidebar.html template can not support pages this deep");- System.exit(-1);- }- try {- final JSONObject current = new JSONObject()- .put("title",page.title)- .put("url", page.permalink)- .put("depth", depth)- .put("kids", new JSONArray());-- if (0 < depth) {- JSONObject parent = stack.peek();- ((JSONArray)parent.get("kids")).put(current);- }-- stack.push(current);- } catch (JSONException e) {- throw new RuntimeException(e);- }- return true;- }- public void postKids(Page page) {- final JSONObject current = stack.pop();- if (0 == stack.size()) {- assert page == mainPage;- try {- // HACK: jekyll doesn't like escaped forward slashes in it's JSON?- w.write(current.toString(2).replaceAll("\\\\/","/"));- } catch (IOException | JSONException e) {- throw new RuntimeException(e);- }- }- }- });- }-- }-- /** Simple struct for modeling the key metadata for dealing with page navigation */- public static final class Page {- public final File file;- public final String title; // NOTE: has html escape codes in it- public final String shortname;- public final String permalink;- public final List<String> kidShortnames;- /** NOTE: not populated on construction- * @see #buildPageTreeRecursive- */- private Page parent;- public Page getParent() {- return parent;- }- /** NOTE: not populated on construction- * @see #buildPageTreeRecursive- */- public final List<Page> kids;- private final List<Page> mutableKids;- public Page(File file, DocumentHeader header) {- if (! file.getName().endsWith(".adoc")) {- throw new RuntimeException(file + " has does not end in '.adoc' - this code can't be used");- }-- this.file = file;- this.title = header.getDocumentTitle().getMain();-- this.shortname = file.getName().replaceAll("\\.adoc$","");- this.permalink = this.shortname + ".html";-- // TODO: do error checking if attribute metadata we care about is missing- Map<String,Object> attrs = header.getAttributes();-- // See SOLR-11541: Fail if a user adds new docs with older missleading attributes we don't use/want- for (String attr : Arrays.asList("page-shortname", "page-permalink")) {- if (attrs.containsKey(attr)) {- throw new RuntimeException(file + ": remove the " + attr + " attribute, it's no longer needed, and may confuse readers/editors");- }- }-- if (attrs.containsKey("page-children")) {- String kidsString = ((String) attrs.get("page-children")).trim();- this.kidShortnames = Collections.<String>unmodifiableList- (Arrays.asList(kidsString.split(",\\s+")));- this.mutableKids = new ArrayList<Page>(kidShortnames.size());- } else {- this.kidShortnames = Collections.<String>emptyList();- this.mutableKids = Collections.<Page>emptyList();- }- this.kids = Collections.<Page>unmodifiableList(mutableKids);- }-- /**- * Recursively sets {@link #getParent} and populates {@link #kids} from {@link #kidShortnames}- * via the <code>allPages</code> Map- */- public void buildPageTreeRecursive(Page parent, Map<String,Page> allPages) {- if (null != parent) {- if (null != this.parent) {- // as long as we also check (later) that every page has a parent, this check (prior to recusion)- // also ensures we never have any loops- throw new RuntimeException(file.getName() + " is listed as the child of (at least) 2 pages: '" + parent.shortname + "' and '" + this.parent.shortname + "'");- }- this.parent = parent;- }- for (String kidShortname : kidShortnames) {- Page kid = allPages.get(kidShortname);- if (null == kid) {- throw new RuntimeException("Unable to locate " + kidShortname + "; child of " + shortname + "("+file.toString());- }- mutableKids.add(kid);- kid.buildPageTreeRecursive(this, allPages);- }- }-- /**- * Do a depth first recursive action on this node and it's {@link #kids}- * @see RecursiveAction- */- public void depthFirstWalk(RecursiveAction action) {- if (action.act(this)) {- for (Page kid : kids) {- kid.depthFirstWalk(action);- }- action.postKids(this);- }- }-- /** @see #depthFirstWalk */- public static interface RecursiveAction {- /** return true if kids should also be visited */- public boolean act(Page page);- /**- * called after recusion to each kid (if any) of specified node,- * never called if {@link #act} returned false- */- public default void postKids(Page page) { /* No-op */ };- }- }--- /** Trivial filter for only "*.adoc" files */- public static final FilenameFilter ADOC_FILE_NAMES = new FilenameFilter() {- public boolean accept(File dir, String name) {- return name.endsWith(".adoc");- }- };-}diff --git a/solr/solr-ref-guide/tools/org/apache/solr/guide/CheckLinksAndAnchors.java b/solr/solr-ref-guide/tools/org/apache/solr/guide/CheckLinksAndAnchors.javadeleted file mode 100644index 3d330d5cca8..00000000000--- a/solr/solr-ref-guide/tools/org/apache/solr/guide/CheckLinksAndAnchors.java+++ /dev/null@@ -1,411 +0,0 @@-/*- * 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 regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package org.apache.solr.guide;--import java.io.*;-import java.net.URI;-import java.net.URISyntaxException;-import java.net.URL;-import java.net.MalformedURLException;-import java.util.ArrayList;-import java.util.List;-import java.util.Locale;-import java.util.HashMap;-import java.util.LinkedHashSet;-import java.util.Map;-import java.util.Set;--import org.jsoup.Jsoup;-import org.jsoup.nodes.Document;-import org.jsoup.nodes.Element;-import org.jsoup.parser.Tag;-import org.jsoup.select.Elements;--/**- * Check various things regarding anchors, links & general doc structure in the generated HTML site.- *- * <p>- * Usage: <code>java org.apache.solr.guide.CheckLinksAndAnchors some-html-dir-name/ [-check-all-relative-links] [-bare-bones]</code>-- * </p>- * <p>- * Problems this tool checks for...- * </p>- *- * <ul>- * <li>- * Validates that no file contains the same anchor more then once.- * </li>- * <li>- * Validates that relative links point to a file that actually exists, and if it's part of the ref-guide that any '#fragment' in the link refers to an ID that exists in that file.- * </li>- * <li>- * Our use of "<a href="https://getbootstrap.com/">Bootstrap</a>" features leverage some custom javascript- * for manipulating the DOM to keep the markup needed in the source <code>*.adoc</code> files simple, but it's- * still possible users may create asciidctor "blocks" that break conventions (either in Bootstrap or in our- * custom javascript)- * </li>- * </ul>- *- * <p>- * This tool parses the generated HTML site, looking for these situations in order to fail the build, since- * (depending on the type of check) these situations will result in inconsistent/broken HTML.- * </p>- * <p>- * This tool supports 2 command line options:- * </p>- * <ul>- * <li><b>-check-all-relative-links</b>- * <p>By default, only relative links to files in the same directory (ie: not startin with- * <code>"../"</code> are checked for existence. This means that we can do a "quick" validatation of- * links to other ref-guide files, but ignore relative links to things outside of the ref-guide --- * such as javadocs that we may not currently have built. If this option is specified then we- * <em>also</em> check relative links where the path starts with <code>"../"</code>- * </p>- * </li>- * <li><b>-bare-bones</b>- * <p>By default, this tool assumes it is analyzing Jekyll generated files. If this option is specified,- * then it instead assumes it's checking "bare bones" HTML files...- * </p>- * <ul>- * <li>Jekyll Mode:- * <ul>- * <li>Requires all html pages have a "content" div; ignores all DOM Nodes that are- * <em>not</em> descendants of this div (to exclude redundant template based header, footer,- * & sidebar links)- * </li>- * <li>Expects that the <code><body/></code> tag will have an <code>id</code> matching- * the page shortname.</li>- * </ul>- * </li>- * <li>Bare Bones Mode:- * <ul>- * <li>Checks all links & anchors in the page.</li>- * <li>"Fakes" the existence of a <code><body id="..."></code> tag containing the- * page shortname.</li>- * </ul>- * </li>- * </ul>- * </li>- * </ul>- *- * TODO: build a list of all known external links so that some other tool could (optionally) ping them all for 200 status?- *- * @see "https://github.com/asciidoctor/asciidoctor/issues/1865"- * @see "https://github.com/asciidoctor/asciidoctor/issues/1866"- */-public class CheckLinksAndAnchors { // TODO: rename this class now that it does more then just links & anchors-- public static final class HtmlFileFilter implements FileFilter {- public boolean accept(File pathname) {- return pathname.getName().toLowerCase(Locale.ROOT).endsWith("html");- }- }-- public static void main(String[] args) throws Exception {- int problems = 0;-- if (args.length < 1) {- System.err.println("usage: org.apache.solr.guide.CheckLinksAndAnchors <htmldir> [-check-all-relative-links] [-bare-bones]");- System.exit(-1);- }- final File htmlDir = new File(args[0]);- final Set<String> options = new LinkedHashSet<>();- for (int i = 1; i < args.length; i++) {- if (! args[i].trim().isEmpty()) { // ignore blank options - maybe an ant sysprop blanked on purpose- options.add(args[i]);- }- }- final boolean bareBones = options.remove("-bare-bones");- final boolean checkAllRelativeLinks = options.remove("-check-all-relative-links");- if (! options.isEmpty()) {- for (String brokenOpt : options) {- System.err.println("org.apache.solr.guide.CheckLinksAndAnchors: Unrecognized option: " + brokenOpt);- }- System.exit(-1);- }-- final File[] pages = htmlDir.listFiles(new HtmlFileFilter());- if (0 == pages.length) {- System.err.println("org.apache.solr.guide.CheckLinksAndAnchors: No HTML Files found, wrong htmlDir? forgot to built the site?");- System.exit(-1);- }-- final Map<File,List<URI>> filesToRelativeLinks = new HashMap<>();- final Map<String,Set<String>> filesToIds = new HashMap<>();-- int totalLinks = 0;- int totalRelativeLinks = 0;- int totalIds = 0;-- for (File file : pages) {- //System.out.println("input File URI: " + file.toURI().toString());-- assert ! filesToRelativeLinks.containsKey(file);- final List<URI> linksInThisFile = new ArrayList<URI>(17);- filesToRelativeLinks.put(file, linksInThisFile);- final Set<String> idsInThisFile = new LinkedHashSet<String>(17);- filesToIds.put(file.getName(), idsInThisFile);-- // use this for error reporting if an ID exists multiple times in a single document- final Map<String,List<Element>> idsToNodes = new HashMap<>();-- final String fileContents = readFile(file.getPath());- final Document doc = Jsoup.parse(fileContents);-- // For Jekyll, we only care about class='content' -- we don't want to worry- // about ids/links duplicated in the header/footer of every page,- final String mainContentSelector = bareBones ? "body" : ".link-check-root";- final Elements mainContents = doc.select(mainContentSelector);- if (1 != mainContents.size()) {- throw new RuntimeException(file.getName() + " has " + mainContents.size() + " main content elements: " + mainContentSelector);- }- final Element mainContent = mainContents.first();-- // All of the ID (nodes) in (the content of) this doc- final Elements nodesWithIds = mainContent.select("[id]");- if (bareBones) {- // It's a pain in the ass to customize the HTML output structure asciidoctor's bare-bones html5 backend- // so instead we "fake" that the body tag contains the attribute we use in jekyll- nodesWithIds.add(new Element(Tag.valueOf("body"), "").attr("id", file.getName().replaceAll("\\.html$","")));- } else {- // We have to add Jekyll's <body> to the nodesWithIds so we check the main section anchor as well- // since we've already drilled down below it- nodesWithIds.addAll(doc.select("body[id]"));- }-- boolean foundPreamble = false;- for (Element node : nodesWithIds) {- final String id = node.id();- assert null != id;- assert 0 != id.length();-- // special case id: we ignore the first 'preamble' because- // it's part of the core markup that asciidoctor always uses- // if we find it a second time in a single page, fail with a special error...- if (id.equals("preamble")) {- if (foundPreamble) {- problems++;- System.err.println(file.toURI().toString() +- " contains 'preamble' anchor, this is special in jekyll and must not be used in content.");- } else {- foundPreamble = true;- continue; // Note: we specifically don't count this in totalIds- }- }-- if (idsInThisFile.contains(id)) {- problems++;- System.err.println(file.toURI().toString() + " contains ID multiple times: " + id);- }- idsInThisFile.add(id);- totalIds++; // Note: we specifically don't count 'preamble'- }-- // build up the list of (relative) linksInThisFile- final Elements links = mainContent.select("a[href]");- for (Element link : links) {- totalLinks++;- final String href = link.attr("href");- if (0 == href.length()) {- problems++;- System.err.println(file.toURI().toString() + " contains link with empty href");- }- try {- final URI uri = new URI(href);- if (! uri.isAbsolute()) {- totalRelativeLinks++;- // track the link to (later) validate the target doc exists and contains the linked anchor (if any)- linksInThisFile.add(uri);- }- } catch (URISyntaxException uri_ex) {- // before reporting a problem, see if it can be parsed as a valid (absolute) URL- // some solr examples URLs have characters that aren't legal URI characters- // Example: "ipod^3.0", "foo:[*+TO+*]", etc...- boolean href_is_valid_absolute_url = false;- try {- // if this isn't absolute, it will fail- final URL ignored = new URL(href);- href_is_valid_absolute_url = true;- } catch (MalformedURLException url_ex) {- problems++;- System.err.println(file.toURI().toString() + " contains link w/ invalid syntax: " + href);- System.err.println(" ... as URI: " + uri_ex.toString());- System.err.println(" ... as URL: " + url_ex.toString());- }- }- }-- problems += validateHtmlStructure(file, mainContent);- }-- // check every (relative) link in every file to ensure the target page exists, and contains the linked anchor (if any)- for (Map.Entry<File,List<URI>> entry : filesToRelativeLinks.entrySet()) {- final File source = entry.getKey();- for (URI link : entry.getValue()) {- final String path = (null == link.getPath() || "".equals(link.getPath())) ? source.getName() : link.getPath();- final File dest = new File(htmlDir, path);- if ( ! dest.exists() ) {- // this is only a problem if it's in our dir, or checkAllRelativeLinks is set...- if (checkAllRelativeLinks || ! path.startsWith("../")) {- problems++;- System.err.println("Relative link points at dest file that doesn't exist: " + link);- System.err.println(" ... source: " + source.toURI().toString());- }- } else {- if ( ! path.startsWith("../") ) {- // if the dest file is part of the ref guide (ie: not an "up and out" link to javadocs)- // then we validate the fragment (if any) is known and exists in that file...- final String frag = link.getFragment();- if ( ! (null == frag || frag.isEmpty()) ) {- final Set<String> knownIdsInDest = filesToIds.get(dest.getName());- assert null != knownIdsInDest : dest.getName();- if (! knownIdsInDest.contains(frag) ) {- problems++;- System.err.println("Relative link points at id that doesn't exist in dest: " + link);- System.err.println(" ... source: " + source.toURI().toString());- }- }- }- }- }- }-- System.err.println("Processed " + totalLinks + " links (" + totalRelativeLinks + " relative) to " +- totalIds + " anchors in " + pages.length + " files");- if (0 < problems) {- System.err.println("Total of " + problems + " problems found");- System.exit(-1);- }- }-- static String readFile(String fileName) throws IOException {- InputStream in = new FileInputStream(fileName);- Reader reader = new InputStreamReader(in,"UTF-8");- BufferedReader br = new BufferedReader(reader);- try {- StringBuilder sb = new StringBuilder();- String line = br.readLine();- while (line != null) {- sb.append(line);- sb.append("\n");- line = br.readLine();- }- return sb.toString();- } finally {- br.close();- }- }-- /**- * returns the number of problems found with this file- */- private static int validateHtmlStructure(final File f, final Element mainContent) {- final String file = f.toURI().toString();- int problems = 0;-- for (Element tab : mainContent.select(".dynamic-tabs")) {- // must be at least two tab-pane descendants of each dynamic-tabs- final Elements panes = tab.select(".tab-pane");- final int numPanes = panes.size();- if (numPanes < 2) {- System.err.println(file + " contains a 'dynamic-tabs' with "+ numPanes+" 'tab-pane' descendants -- must be at least 2");- problems++;- }-- // must not have any descendants of a dynamic-tabs that are not part of tab-pane- //- // this is kind of tricky, because asciidoctor creates wrapper divs around the tab-panes- // so we can't make assumptions about direct children- //- final Elements elementsToIgnore = panes.parents();- for (Element pane : panes) {- elementsToIgnore.addAll(pane.select("*"));- }- final Elements nonPaneDescendants = tab.select("*");- nonPaneDescendants.removeAll(elementsToIgnore);- if (0 != nonPaneDescendants.size()) {- System.err.println(file + " contains a 'dynamic-tabs' with content outside of a 'tab-pane': " +- shortStr(nonPaneDescendants.text()));- problems++;- }- }-- // Now fetch all tab-panes, even if they aren't in a dynamic-tabs instance- // (that's a type of error we want to check for)- final Elements validPanes = mainContent.select(".dynamic-tabs .tab-pane");- final Elements allPanes = mainContent.select(".tab-pane");-- for (Element pane : allPanes) {- // every tab-pane must have an id- if (pane.id().trim().isEmpty()) {- System.err.println(file + " contains a 'tab-pane' that does not have a (unique) '#id'");- problems++;- }- final String debug = "'tab-pane" + (pane.id().isEmpty() ? "" : "#" + pane.id()) + "'";-- // no 'active' class on any tab-pane- if (pane.classNames().contains("active")) {- System.err.println(file + " contains " + debug + " with 'active' defined -- this must be removed");- problems++;- }-- // every tab-pane must be a descendant of a dynamic-tabs- if (! validPanes.contains(pane)) {- System.err.println(file + " contains " + debug + " that is not a dependent of a 'dynamic-tabs'");- problems++;- }-- // every tab-pane must have exactly 1 tab-label which is <strong>- Elements labels = pane.select(".tab-label");- if (1 != labels.size()) {- System.err.println(file + " contains " + debug + " with " + labels.size() + " 'tab-label' descendants -- must be exactly 1");- problems++;- } else {- Element label = labels.first();- if (! label.tagName().equals("strong")) {- System.err.println(file + " contains " + debug + " with a 'tab-label' using <"- + labels.first().tagName() + "> -- each 'tab-label' must be <strong> (example: '[.tab-label]*Text*')");- problems++;- }- final String labelText = label.text().trim();- // if the tab-label is the empty string, asciidoctor should optimize it away -- but let's check for it anyway- if (labelText.isEmpty()) {- System.err.println(file + " contains " + debug + " with a blank 'tab-label'");- problems++;- }- // validate label must be first paragraph? first text content?- if (! pane.text().trim().startsWith(labelText)) {- System.err.println(file + " contains " + debug + " with text before the 'tab-label' ('" + labelText + "')");- problems++;- }-- }-- }-- return problems;- }-- public static final String shortStr(String s) {- if (s.length() < 20) {- return s;- }- return s.substring(0, 17) + "...";- }-}diff --git a/solr/solr-ref-guide/ui-src/css/base.css b/solr/solr-ref-guide/ui-src/css/base.cssnew file mode 100644index 00000000000..ac75c2a1bd6--- /dev/null+++ b/solr/solr-ref-guide/ui-src/css/base.css@@ -0,0 +1,123 @@+*,+*::before,+*::after {+ box-sizing: inherit;+ /* Solr Changes - Start */+ margin: 0;+ padding: 0;+ /* Solr Changes - End */+}++html {+ box-sizing: border-box;+ font-size: var(--body-font-size);+ height: 100%;+}++@media screen and (min-width: 1024px) {+ html {+ font-size: var(--body-font-size--desktop);+ }+}++body {+ background: var(--body-background);+ color: var(--body-font-color);+ font-family: var(--body-font-family);+ line-height: var(--body-line-height);+ margin: 0;+ word-wrap: anywhere; /* aka overflow-wrap; used when hyphens are disabled or aren't sufficient */+}++a {+ text-decoration: none;+}++a:hover {+ text-decoration: underline;+}++a:active {+ background-color: none;+}++code,+kbd,+pre {+ font-family: var(--monospace-font-family);+}++b,+dt,+strong,+th {+ font-weight: var(--body-font-weight-bold);+}++sub,+sup {+ font-size: 75%;+ line-height: 0;+ position: relative;+ vertical-align: baseline;+}++sub {+ bottom: -0.25em;+}++sup {+ top: -0.5em;+}++em em { /* stylelint-disable-line */+ font-style: normal;+}++strong strong { /* stylelint-disable-line */+ font-weight: normal;+}++button {+ cursor: pointer;+ font-family: inherit;+ font-size: 1em;+ line-height: var(--body-line-height);+ margin: 0;+}++button::-moz-focus-inner {+ border: none;+ padding: 0;+}++summary {+ cursor: pointer;+ -webkit-tap-highlight-color: transparent;+ outline: none;+}++table {+ border-collapse: collapse;+ word-wrap: normal; /* table widths aren't computed as expected when word-wrap is enabled */+}++object[type="image/svg+xml"]:not([width]) {+ width: fit-content;+}++@supports (scrollbar-width: thin) {+ body * {+ scrollbar-width: thin;+ scrollbar-color: var(--scrollbar-thumb-color) transparent;+ }+}++body ::-webkit-scrollbar {+ height: 0.25rem;+ width: 0.25rem;+}++body ::-webkit-scrollbar-thumb {+ background-color: var(--scrollbar-thumb-color);+}diff --git a/solr/solr-ref-guide/ui-src/css/doc.css b/solr/solr-ref-guide/ui-src/css/doc.cssnew file mode 100644index 00000000000..a4cbd970752--- /dev/null+++ b/solr/solr-ref-guide/ui-src/css/doc.css@@ -0,0 +1,996 @@+.doc {+ color: var(--doc-font-color);+ font-size: var(--doc-font-size);+ hyphens: auto;+ line-height: var(--doc-line-height);+ margin: var(--doc-margin);+ /* Solr Changes - Start */+ max-width: 100%;+ /* Solr Changes - End */+ padding: 0 1rem 4rem;+}++@media screen and (min-width: 1024px) {+ .doc {+ flex: auto;+ font-size: var(--doc-font-size--desktop);+ margin: var(--doc-margin--desktop);+ /* Solr Changes - Start */+ max-width: 100%;+ /* Solr Changes - End */+ min-width: 0;+ }+}++.doc h1,+.doc h2,+.doc h3,+.doc h4,+.doc h5,+.doc h6 {+ color: var(--heading-font-color);+ font-weight: var(--heading-font-weight);+ hyphens: none;+ line-height: 1.3;+ margin: 1rem 0 0;+}++.doc > h1.page:first-child {+ font-size: calc(36 / var(--rem-base) * 1rem);+ margin: 1.5rem 0;+}++@media screen and (min-width: 769px) {+ .doc > h1.page:first-child {+ margin-top: 2.5rem;+ }+}++/* Solr Changes - Start */+.doc > h1.page:first-child + nav.toc.embedded {+ margin-top: -0.5rem;+}+/* Solr Changes - End */++.doc > h2#name + .sectionbody {+ margin-top: 1rem;+}++#preamble + .sect1,+.doc .sect1 + .sect1 {+ margin-top: 2rem;+}++.doc h1.sect0 {+ background: var(--abstract-background);+ font-size: 1.8em;+ margin: 1.5rem -1rem 0;+ padding: 0.5rem 1rem;+}++.doc h2:not(.discrete) {+ border-bottom: 1px solid var(--section-divider-color);+ margin-left: -1rem;+ margin-right: -1rem;+ padding: 0.4rem 1rem 0.1rem;+}++.doc h3:not(.discrete),+.doc h4:not(.discrete) {+ font-weight: var(--alt-heading-font-weight);+}++.doc h1 .anchor,+.doc h2 .anchor,+.doc h3 .anchor,+.doc h4 .anchor,+.doc h5 .anchor,+.doc h6 .anchor {+ position: absolute;+ text-decoration: none;+ width: 1.75ex;+ margin-left: -1.5ex;+ visibility: hidden;+ font-size: 0.8em;+ font-weight: normal;+ padding-top: 0.05em;+}++.doc h1 .anchor::before,+.doc h2 .anchor::before,+.doc h3 .anchor::before,+.doc h4 .anchor::before,+.doc h5 .anchor::before,+.doc h6 .anchor::before {+ content: "\00a7";+}++.doc h1:hover .anchor,+.doc h2:hover .anchor,+.doc h3:hover .anchor,+.doc h4:hover .anchor,+.doc h5:hover .anchor,+.doc h6:hover .anchor {+ visibility: visible;+}++.doc p,+.doc dl {+ margin: 0;+}++.doc a {+ color: var(--link-font-color);+}++.doc a:hover {+ color: var(--link_hover-font-color);+}++.doc a.bare {+ hyphens: none;+}++.doc a.unresolved {+ color: var(--link_unresolved-font-color);+}++.doc i.fa {+ hyphens: none;+ font-style: normal;+}++.doc p code,+.doc thead code,+.doc .colist > table code {+ color: var(--code-font-color);+ background: var(--code-background);+ border-radius: 0.25em;+ font-size: 0.95em;+ padding: 0.125em 0.25em;+}++.doc code,+.doc pre {+ hyphens: none;+}++.doc pre {+ font-size: calc(16 / var(--rem-base) * 1rem);+ line-height: 1.5;+ margin: 0;+}++.doc blockquote {+ margin: 0;+}++.doc .paragraph.lead > p {+ font-size: calc(18 / var(--rem-base) * 1rem);+}++.doc .right {+ float: right;+}++.doc .left {+ float: left;+}++.doc .stretch {+ width: 100%;+}++.doc .underline {+ text-decoration: underline;+}++.doc .line-through {+ text-decoration: line-through;+}++.doc .paragraph,+.doc .dlist,+.doc .hdlist,+.doc .olist,+.doc .ulist,+.doc .exampleblock,+.doc .imageblock,+.doc .listingblock,+.doc .literalblock,+.doc .sidebarblock,+.doc .verseblock,+.doc .quoteblock,+.doc .partintro,+.doc details,+.doc hr {+ margin: 1rem 0 0;+}++.doc table.tableblock {+ /* Solr Changes - Start */+ font-size: calc(16 / var(--rem-base) * 1rem);+ margin: 1.5rem 0 0;+ background-color: var(--color-white);+ /* Solr Changes - End */+}++.doc table.tableblock + * {+ margin-top: 1.5rem;+}++.doc p.tableblock + p.tableblock {+ margin-top: 0.5rem;+}++.doc td.tableblock > .content > :first-child {+ margin-top: 0;+}++.doc table.tableblock th,+.doc table.tableblock td {+ padding: 0.5rem;+}++.doc table.tableblock,+.doc table.tableblock > * > tr > * {+ border: 0 solid var(--table-border-color);+}++/* Solr Additions - Start */+.doc table.tableblock.stripes-none td,+.doc table.tableblock.stripes-none > :not(thead) th {+ border-top: none;+ border-bottom: none;+}+/* Solr Additions - End */++.doc table.grid-all > * > tr > * {+ border-width: 1px;+}++.doc table.grid-cols > * > tr > * {+ border-width: 0 1px;+}++.doc table.grid-rows > * > tr > * {+ border-width: 1px 0;+}++.doc table.grid-all > thead th,+.doc table.grid-rows > thead th {+ border-bottom-width: 2.5px;+}++.doc table.frame-all {+ border-width: 1px;+}++.doc table.frame-ends {+ border-width: 1px 0;+}++.doc table.frame-sides {+ border-width: 0 1px;+}++.doc table.frame-none > colgroup + * > :first-child > *,+.doc table.frame-sides > colgroup + * > :first-child > * {+ border-top-width: 0;+}++/* NOTE let the grid win in case of frame-none */+.doc table.frame-sides > :last-child > :last-child > * {+ border-bottom-width: 0;+}++.doc table.frame-none > * > tr > :first-child,+.doc table.frame-ends > * > tr > :first-child {+ border-left-width: 0;+}++.doc table.frame-none > * > tr > :last-child,+.doc table.frame-ends > * > tr > :last-child {+ border-right-width: 0;+}++.doc table.stripes-all > tbody > tr,+.doc table.stripes-odd > tbody > tr:nth-of-type(odd),+.doc table.stripes-even > tbody > tr:nth-of-type(even),+.doc table.stripes-hover > tbody > tr:hover {+ background: var(--table-stripe-background);+}++.doc table.tableblock > tfoot {+ background: var(--table-footer-background);+}++.doc .halign-left {+ text-align: left;+}++.doc .halign-right {+ text-align: right;+}++.doc .halign-center {+ text-align: center;+}++.doc .valign-top {+ vertical-align: top;+}++.doc .valign-bottom {+ vertical-align: bottom;+}++.doc .valign-middle {+ vertical-align: middle;+}++.doc .admonitionblock {+ margin: 1.4rem 0 0;+}++.doc .admonitionblock p,+.doc .admonitionblock td.content {+ font-size: calc(16 / var(--rem-base) * 1rem);+}++.doc .admonitionblock td.content > :not(.title):first-child,+.doc .admonitionblock td.content > .title + * {+ margin-top: 0;+}++.doc .admonitionblock pre {+ font-size: calc(15 / var(--rem-base) * 1rem);+}++.doc .admonitionblock > table {+ table-layout: fixed;+ position: relative;+ width: 100%;+}++.doc .admonitionblock td.content {+ padding: 1rem 1rem 0.75rem;+ background: var(--admonition-background);+ width: 100%;+ word-wrap: anywhere;+}++.doc .admonitionblock .icon {+ position: absolute;+ top: 0;+ left: 0;+ font-size: calc(15 / var(--rem-base) * 1rem);+ padding: 0 0.5rem;+ height: 1.25rem;+ line-height: 1;+ font-weight: var(--admonition-label-font-weight);+ text-transform: uppercase;+ border-radius: 0.45rem;+ transform: translate(-0.5rem, -50%);+}++.doc .admonitionblock.caution .icon {+ background-color: var(--caution-color);+ color: var(--caution-on-color);+}++.doc .admonitionblock.important .icon {+ background-color: var(--important-color);+ color: var(--important-on-color);+}++.doc .admonitionblock.note .icon {+ background-color: var(--note-color);+ color: var(--note-on-color);+}++.doc .admonitionblock.tip .icon {+ background-color: var(--tip-color);+ color: var(--tip-on-color);+}++.doc .admonitionblock.warning .icon {+ background-color: var(--warning-color);+ color: var(--warning-on-color);+}++.doc .admonitionblock .icon i {+ display: inline-flex;+ align-items: center;+ height: 100%;+}++.doc .admonitionblock .icon i::after {+ content: attr(title);+}++.doc .imageblock {+ display: flex;+ flex-direction: column;+ align-items: center;+}++.doc .imageblock img,+.doc .imageblock object,+.doc .imageblock svg,+.doc .image > img,+.doc .image > object,+.doc .image > svg {+ display: inline-block;+ height: auto;+ max-width: 100%;+ vertical-align: middle;+}++.doc .image:not(.left):not(.right) > img {+ margin-top: -0.2em;+}++#preamble .abstract blockquote {+ background: var(--abstract-background);+ border-left: 5px solid var(--abstract-border-color);+ color: var(--abstract-font-color);+ font-size: calc(16 / var(--rem-base) * 1rem);+ padding: 0.75em 1em;+}++.doc .quoteblock,+.doc .verseblock {+ background: var(--quote-background);+ border-left: 5px solid var(--quote-border-color);+ color: var(--quote-font-color);+}++.doc .quoteblock {+ padding: 0.25rem 2rem 1.25rem;+}++.doc .quoteblock .attribution {+ color: var(--quote-attribution-font-color);+ font-size: calc(15 / var(--rem-base) * 1rem);+ margin-top: 0.75rem;+}++.doc .quoteblock blockquote {+ margin-top: 1rem;+}++.doc .quoteblock .paragraph {+ font-style: italic;+}++.doc .quoteblock cite {+ padding-left: 1em;+}++.doc .verseblock {+ font-size: 1.15em;+ padding: 1rem 2rem;+}++.doc .verseblock pre {+ font-family: inherit;+ font-size: inherit;+}++.doc ol,+.doc ul {+ margin: 0;+ padding: 0 0 0 2rem;+}++.doc ul.checklist,+.doc ul.none,+.doc ol.none,+.doc ul.no-bullet,+.doc ol.unnumbered,+.doc ul.unstyled,+.doc ol.unstyled {+ list-style-type: none;+}++.doc ul.no-bullet,+.doc ol.unnumbered {+ padding-left: 1.25rem;+}++.doc ul.unstyled,+.doc ol.unstyled {+ padding-left: 0;+}++.doc ul.circle {+ list-style-type: square;+}++.doc ul.disc {+ list-style-type: square;+}++.doc ul.square {+ list-style-type: square;+}++.doc ol.arabic {+ list-style-type: decimal;+}++.doc ol.decimal {+ list-style-type: decimal-leading-zero;+}++.doc ol.loweralpha {+ list-style-type: lower-alpha;+}++.doc ol.upperalpha {+ list-style-type: upper-alpha;+}++.doc ol.lowerroman {+ list-style-type: lower-roman;+}++.doc ol.upperroman {+ list-style-type: upper-roman;+}++.doc ol.lowergreek {+ list-style-type: lower-greek;+}++.doc ul.checklist {+ padding-left: 0.5rem;+}++.doc ul.checklist p > i.fa-check-square-o:first-child,+.doc ul.checklist p > i.fa-square-o:first-child {+ display: inline-flex;+ justify-content: center;+ width: 1.25rem;+}++.doc ul.checklist i.fa-check-square-o::before {+ content: "\2713";+}++.doc ul.checklist i.fa-square-o::before {+ content: "\274f";+}++.doc .dlist .dlist,+.doc .dlist .olist,+.doc .dlist .ulist,+.doc .olist .dlist,+.doc .olist .olist,+.doc .olist .ulist,+.doc .ulist .dlist,+.doc .ulist .olist,+.doc .ulist .ulist {+ margin-top: 0.5rem;+}++.doc .olist li + li,+.doc .ulist li + li {+ margin-top: 0.5rem;+}++.doc .ulist .listingblock,+.doc .olist .listingblock,+.doc .admonitionblock .listingblock {+ padding: 0;+}++.doc .admonitionblock .title,+.doc .exampleblock .title,+.doc .imageblock .title,+.doc .literalblock .title,+.doc .listingblock .title,+.doc .openblock .title,+.doc .tableblock caption {+ color: var(--caption-font-color);+ font-size: calc(16 / var(--rem-base) * 1rem);+ font-weight: var(--caption-font-weight);+ font-style: italic;+ hyphens: none;+ letter-spacing: 0.01em;+ padding-bottom: 0.075rem;+ text-align: left;+}++.doc .imageblock .title {+ margin-top: 0.5rem;+ padding-bottom: 0;+}++.doc details {+ margin-left: 1rem;+}++.doc details > summary {+ display: block;+ position: relative;+ line-height: var(--doc-line-height);+ margin-bottom: 0.5rem;+}++.doc details > summary::-webkit-details-marker {+ display: none;+}++.doc details > summary::before {+ content: "";+ border: solid transparent;+ border-left-color: currentColor;+ border-width: 0.3em 0 0.3em 0.5em;+ position: absolute;+ top: calc((var(--doc-line-height) * 0.5 - 0.3) * 1em);+ left: -1rem;+ transform: translateX(15%);+}++.doc details[open] > summary::before {+ border-color: currentColor transparent transparent;+ border-width: 0.5rem 0.3rem 0;+ transform: translateY(15%);+}++.doc details > summary::after {+ content: "";+ width: 1rem;+ height: 1em;+ position: absolute;+ top: calc((var(--doc-line-height) * 0.5 - 0.5) * 1em);+ left: -1rem;+}++.doc details.result {+ margin-top: 0.25rem;+}++.doc details.result > summary {+ color: var(--caption-font-color);+ font-style: italic;+ margin-bottom: 0;+}++.doc details.result > .content {+ margin-left: -1rem;+}++.doc .exampleblock > .content,+.doc details.result > .content {+ background: var(--example-background);+ border: 0.25rem solid var(--example-border-color);+ border-radius: 0.5rem;+ padding: 0.75rem;+}++.doc .exampleblock > .content::after,+.doc details.result > .content::after {+ content: "";+ display: table;+ clear: both;+}++.doc .exampleblock > .content > :first-child,+.doc details > .content > :first-child {+ margin-top: 0;+}++.doc .sidebarblock {+ background: var(--sidebar-background);+ border-radius: 0.75rem;+ padding: 0.75rem 1.5rem;+}++.doc .sidebarblock > .content > .title {+ font-size: calc(22.5 / var(--rem-base) * 1rem);+ font-weight: var(--alt-heading-font-weight);+ line-height: 1.3;+ margin-bottom: -0.3em;+ text-align: center;+}++.doc .sidebarblock > .content > :not(.title):first-child {+ margin-top: 0;+}++/* NEEDS REVIEW prevent pre in table from causing article to exceed bounds */+.doc .tableblock pre,+.doc .listingblock.wrap pre {+ white-space: pre-wrap;+}++.doc pre.highlight code,+.doc .listingblock pre:not(.highlight),+.doc .literalblock pre {+ background: var(--pre-background);+ box-shadow: inset 0 0 1.75px var(--pre-border-color);+ display: block;+ overflow-x: auto;+ padding: 0.75rem;+}++.doc pre.highlight {+ position: relative;+}++.doc .source-toolbox {+ display: flex;+ visibility: hidden;+ position: absolute;+ top: 0.25rem;+ right: 0.5rem;+ color: var(--pre-annotation-font-color);+ font-family: var(--body-font-family);+ font-size: calc(13.5 / var(--rem-base) * 1rem);+ line-height: 1;+}++.doc .listingblock:hover .source-toolbox {+ visibility: visible;+}++.doc .source-toolbox .source-lang {+ text-transform: uppercase;+ letter-spacing: 0.075em;+ font-size: 0.96em;+ line-height: 1.0425;+}++.doc .source-toolbox > :not(:last-child)::after {+ content: "|";+ letter-spacing: 0;+ padding: 0 1ch;+}++.doc .source-toolbox .copy-button {+ display: flex;+ flex-direction: column;+ align-items: center;+ background: transparent;+ border: none;+ color: inherit;+ outline: none;+ padding: 0;+ font-size: inherit;+ line-height: inherit;+ width: 1em;+ height: 1em;+}++.doc .source-toolbox .copy-icon {+ flex: none;+ width: inherit;+ height: inherit;+}++.doc .source-toolbox img.copy-icon {+ filter: invert(50.2%);+}++.doc .source-toolbox svg.copy-icon {+ fill: currentColor;+}++.doc .source-toolbox .copy-toast {+ flex: none;+ position: relative;+ display: inline-flex;+ justify-content: center;+ margin-top: 1em;+ background-color: var(--doc-font-color);+ border-radius: 0.25em;+ padding: 0.5em;+ color: var(--color-white);+ cursor: auto;+ opacity: 0;+ transition: opacity 0.5s ease 0.75s;+}++.doc .source-toolbox .copy-toast::after {+ content: "";+ position: absolute;+ top: 0;+ width: 1em;+ height: 1em;+ border: 0.55em solid transparent;+ border-left-color: var(--doc-font-color);+ transform: rotate(-90deg) translateX(50%) translateY(50%);+ transform-origin: left;+}++.doc .source-toolbox .copy-button.clicked .copy-toast {+ opacity: 1;+ transition: none;+}++.doc .language-console .hljs-meta {+ user-select: none;+}++/* Solr Removals - Start+.doc .dlist dt {+ font-style: italic;+}+ Solr Removals - End */++.doc .dlist dd {+ /* Solr Changes - Start */+ margin: 0 0 1.25rem 1.5rem;+ /* Solr Changes - Start */+}++.doc .dlist dd:last-of-type {+ margin-bottom: 0;+}++.doc td.hdlist1,+.doc td.hdlist2 {+ padding: 0.5rem 0 0;+ vertical-align: top;+}++.doc tr:first-child > .hdlist1,+.doc tr:first-child > .hdlist2 {+ padding-top: 0;+}++.doc td.hdlist1 {+ font-weight: var(--body-font-weight-bold);+ padding-right: 0.25rem;+}++.doc td.hdlist2 {+ padding-left: 0.25rem;+}++.doc .colist {+ font-size: calc(16 / var(--rem-base) * 1rem);+ margin: 0.25rem 0 -0.25rem;+}++.doc .colist > table > tr > :first-child,+.doc .colist > table > tbody > tr > :first-child {+ padding: 0.25em 0.5rem 0;+ vertical-align: top;+}++.doc .colist > table > tr > :last-child,+.doc .colist > table > tbody > tr > :last-child {+ padding: 0.25rem 0;+}++.doc .conum[data-value] {+ border: 1px solid currentColor;+ border-radius: 100%;+ display: inline-block;+ font-family: var(--body-font-family);+ font-size: calc(13.5 / var(--rem-base) * 1rem);+ font-style: normal;+ line-height: 1.2;+ text-align: center;+ width: 1.25em;+ height: 1.25em;+ letter-spacing: -0.25ex;+ text-indent: -0.25ex;+}++.doc .conum[data-value]::after {+ content: attr(data-value);+}++.doc .conum[data-value] + b {+ display: none;+}++.doc hr {+ border: solid var(--section-divider-color);+ border-width: 2px 0 0;+ height: 0;+}++.doc b.button {+ white-space: nowrap; /* effectively ignores hyphens setting */+}++.doc b.button::before {+ content: "[";+ padding-right: 0.25em;+}++.doc b.button::after {+ content: "]";+ padding-left: 0.25em;+}++.doc kbd {+ display: inline-block;+ font-size: calc(12 / var(--rem-base) * 1rem);+ background: var(--kbd-background);+ border: 1px solid var(--kbd-border-color);+ border-radius: 0.25em;+ box-shadow: 0 1px 0 var(--kbd-border-color), 0 0 0 0.1em var(--body-background) inset;+ padding: 0.25em 0.5em;+ vertical-align: text-bottom;+ white-space: nowrap; /* effectively ignores hyphens setting */+}++.doc kbd,+.doc .keyseq {+ line-height: 1;+}++.doc .keyseq {+ font-size: calc(16 / var(--rem-base) * 1rem);+}++.doc .keyseq kbd {+ margin: 0 0.125em;+}++.doc .keyseq kbd:first-child {+ margin-left: 0;+}++.doc .keyseq kbd:last-child {+ margin-right: 0;+}++.doc .menuseq,+.doc .path {+ hyphens: none;+}++.doc .menuseq i.caret::before {+ content: "\203a";+ font-size: 1.1em;+ font-weight: var(--body-font-weight-bold);+ line-height: calc(1 / 1.1);+}++.doc :not(pre).nowrap {+ white-space: nowrap;+}++.doc .nobreak {+ hyphens: none;+ word-wrap: normal;+}++#footnotes {+ font-size: 0.85em;+ line-height: 1.5;+ margin: 2rem -0.5rem 0;+}++.doc td.tableblock > .content #footnotes {+ margin: 2rem 0 0;+}++#footnotes hr {+ border-top-width: 1px;+ margin-top: 0;+ width: 20%;+}++#footnotes .footnote {+ margin: 0.5em 0 0 1em;+}++#footnotes .footnote + .footnote {+ margin-top: 0.25em;+}++#footnotes .footnote > a:first-of-type {+ display: inline-block;+ margin-left: -2em;+ text-align: right;+ width: 1.5em;+}diff --git a/solr/solr-ref-guide/ui-src/css/footer.css b/solr/solr-ref-guide/ui-src/css/footer.cssnew file mode 100644index 00000000000..9f5377388c2--- /dev/null+++ b/solr/solr-ref-guide/ui-src/css/footer.css@@ -0,0 +1,20 @@+footer.footer {+ background-color: var(--footer-background);+ color: var(--footer-font-color);+ font-size: calc(15 / var(--rem-base) * 1rem);+ line-height: var(--footer-line-height);+ /* Solr Changes - Start */+ padding: 10px;+ border-style: solid hidden;+ border-color: var(--color-solr-primary-orange);+ border-width: 1.5px;+ /* Solr Changes - End */+}++.footer p {+ margin: 0.5rem 0;+}++.footer a {+ color: var(--footer-link-font-color);+}diff --git a/solr/solr-ref-guide/ui-src/css/header.css b/solr/solr-ref-guide/ui-src/css/header.cssnew file mode 100644index 00000000000..c5243161f32--- /dev/null+++ b/solr/solr-ref-guide/ui-src/css/header.css@@ -0,0 +1,313 @@+html.is-clipped--navbar {+ overflow-y: hidden;+}++body {+ padding-top: var(--navbar-height);+}++.navbar {+ background: var(--navbar-background);+ /* Solr Changes - Start */+ border-bottom: 2px solid var(--color-solr-primary-orange);+ /* Solr Changes - End */+ color: var(--navbar-font-color);+ font-size: calc(16 / var(--rem-base) * 1rem);+ height: var(--navbar-height);+ position: fixed;+ top: 0;+ width: 100%;+ z-index: var(--z-index-navbar);+}++.navbar a {+ text-decoration: none;+}++.navbar-brand {+ display: flex;+ flex: auto;+ padding-left: 1rem;+}++.navbar-brand .navbar-item:first-child {+ align-self: center;+ padding: 0;+ color: var(--navbar-font-color);+ font-size: calc(22 / var(--rem-base) * 1rem);+ flex-wrap: wrap;+ line-height: 1;+}++.navbar-brand .navbar-item:first-child a {+ color: inherit;+ word-wrap: normal;+}++/* Solr Addition - Start */+/* The brand name is the second child because the logo is the first */+.navbar-brand .navbar-item:nth-child(2) {+ align-self: center;+ color: var(--navbar-font-color);+ font-size: calc(22 / var(--rem-base) * 1rem);+ flex-wrap: wrap;+ line-height: 1;+}++.navbar-brand .navbar-item:nth-child(2) a {+ color: inherit;+ word-wrap: normal;+}+/* Solr Addition - End */++.navbar-brand .navbar-item:first-child :not(:last-child) {+ padding-right: 0.375rem;+}++.navbar-brand .navbar-item.search {+ flex: auto;+ justify-content: flex-end;+}++#search-input {+ color: #333;+ font-family: inherit;+ font-size: 0.95rem;+ width: 150px;+ border: 1px solid #dbdbdb;+ border-radius: 0.1em;+ line-height: 1.5;+ padding: 0 0.25em;+}++.navbar-burger {+ background: none;+ border: none;+ outline: none;+ line-height: 1;+ position: relative;+ width: 3rem;+ padding: 0;+ display: flex;+ flex-direction: column;+ align-items: center;+ justify-content: center;+ margin-left: auto;+ min-width: 0;+}++.navbar-burger span {+ background-color: var(--navbar-font-color);+ height: 1.5px;+ width: 1rem;+}++.navbar-burger:not(.is-active) span {+ transition: transform ease-out 0.25s, opacity 0s 0.25s, margin-top ease-out 0.25s 0.25s;+}++.navbar-burger span + span {+ margin-top: 0.25rem;+}++.navbar-burger.is-active span + span {+ margin-top: -1.5px;+}++.navbar-burger.is-active span:nth-child(1) {+ transform: rotate(45deg);+}++.navbar-burger.is-active span:nth-child(2) {+ opacity: 0;+}++.navbar-burger.is-active span:nth-child(3) {+ transform: rotate(-45deg);+}++.navbar-item,+.navbar-link {+ color: var(--navbar-menu-font-color);+ display: block;+ line-height: var(--doc-line-height);+ padding: 0.5rem 1rem;+}++.navbar-item.has-dropdown {+ padding: 0;+}++.navbar-item .icon {+ width: 1.25rem;+ height: 1.25rem;+ display: block;+}++.navbar-item .icon img,+.navbar-item .icon svg {+ fill: currentColor;+ width: inherit;+ height: inherit;+}++.navbar-link {+ padding-right: 2.5em;+}++.navbar-dropdown .navbar-item {+ padding-left: 1.5rem;+ padding-right: 1.5rem;+}++.navbar-divider {+ background-color: var(--navbar-menu-border-color);+ border: none;+ height: 1px;+ margin: 0.25rem 0;+}++.navbar .button {+ display: inline-flex;+ align-items: center;+ background: var(--navbar-button-background);+ /* Solr Changes - Start */+ border: 1.25px solid var(--color-solr-primary-orange);+ /* Solr Changes - End */+ border-radius: 0.15rem;+ height: 1.75rem;+ color: var(--navbar-button-font-color);+ padding: 0 0.75em;+ white-space: nowrap;+}++@media screen and (max-width: 768.5px) {+ .navbar-brand .navbar-item.search {+ padding-left: 0;+ padding-right: 0;+ }+}++@media screen and (min-width: 769px) {+ #search-input {+ width: 200px;+ }+}++@media screen and (max-width: 1023.5px) {+ .navbar-brand {+ height: inherit;+ }++ .navbar-brand .navbar-item {+ align-items: center;+ display: flex;+ }++ .navbar-menu {+ background: var(--navbar-menu-background);+ box-shadow: 0 8px 16px rgba(10, 10, 10, 0.1);+ max-height: var(--body-min-height);+ overflow-y: auto;+ overscroll-behavior: none;+ padding: 0.5rem 0;+ }++ .navbar-menu:not(.is-active) {+ display: none;+ }++ .navbar-menu a.navbar-item:hover,+ .navbar-menu .navbar-link:hover {+ background: var(--navbar-menu_hover-background);+ }+}++@media screen and (min-width: 1024px) {+ .navbar-burger {+ display: none;+ }++ .navbar,+ .navbar-menu,+ .navbar-end {+ display: flex;+ }++ .navbar-item,+ .navbar-link {+ display: flex;+ position: relative;+ flex: none;+ }++ .navbar-item:not(.has-dropdown),+ .navbar-link {+ align-items: center;+ }++ .navbar-item.is-hoverable:hover .navbar-dropdown {+ display: block;+ }++ .navbar-link::after {+ border-width: 0 0 1px 1px;+ border-style: solid;+ content: "";+ display: block;+ height: 0.5em;+ pointer-events: none;+ position: absolute;+ transform: rotate(-45deg);+ width: 0.5em;+ margin-top: -0.375em;+ right: 1.125em;+ top: 50%;+ }++ .navbar-end > .navbar-item,+ .navbar-end .navbar-link {+ color: var(--navbar-font-color);+ }++ .navbar-end > a.navbar-item:hover,+ .navbar-end .navbar-link:hover,+ .navbar-end .navbar-item.has-dropdown:hover .navbar-link {+ background: var(--navbar_hover-background);+ color: var(--navbar-font-color);+ }++ .navbar-end .navbar-link::after {+ border-color: currentColor;+ }++ .navbar-dropdown {+ background: var(--navbar-menu-background);+ border: 1px solid var(--navbar-menu-border-color);+ border-top: none;+ border-radius: 0 0 0.25rem 0.25rem;+ display: none;+ top: 100%;+ left: 0;+ min-width: 100%;+ position: absolute;+ }++ .navbar-dropdown .navbar-item {+ padding: 0.5rem 3rem 0.5rem 1rem;+ white-space: nowrap;+ }++ .navbar-dropdown .navbar-item:last-child {+ border-radius: inherit;+ }++ .navbar-dropdown.is-right {+ left: auto;+ right: 0;+ }++ .navbar-dropdown a.navbar-item:hover {+ background: var(--navbar-menu_hover-background);+ }+}diff --git a/solr/solr-ref-guide/ui-src/css/main.css b/solr/solr-ref-guide/ui-src/css/main.cssnew file mode 100644index 00000000000..eb42afd20b0--- /dev/null+++ b/solr/solr-ref-guide/ui-src/css/main.css@@ -0,0 +1,37 @@+/* Solr Changes - Rename 'aside' -> 'nav' across whole file */++@media screen and (max-width: 1023.5px) {+ nav.toc.sidebar {+ display: none;+ }++ main > .content {+ overflow-x: auto;+ }+}++@media screen and (min-width: 1024px) {+ main {+ flex: auto;+ min-width: 0; /* min-width: 0 required for flexbox to constrain overflowing elements */+ }++ main > .content {+ display: flex;+ }++ nav.toc.embedded {+ display: none;+ }++ nav.toc.sidebar {+ flex: 0 0 var(--toc-width);+ order: 1;+ }+}++@media screen and (min-width: 1216px) {+ nav.toc.sidebar {+ flex-basis: var(--toc-width--widescreen);+ }+}diff --git a/solr/solr-ref-guide/ui-src/css/nav.css b/solr/solr-ref-guide/ui-src/css/nav.cssnew file mode 100644index 00000000000..a3b6c3d33f0--- /dev/null+++ b/solr/solr-ref-guide/ui-src/css/nav.css@@ -0,0 +1,266 @@+.nav-container {+ position: fixed;+ top: var(--navbar-height);+ left: 0;+ width: 100%;+ font-size: calc(17 / var(--rem-base) * 1rem);+ z-index: var(--z-index-nav);+ visibility: hidden;+}++@media screen and (min-width: 769px) {+ .nav-container {+ width: var(--nav-width);+ }+}++@media screen and (min-width: 1024px) {+ .nav-container {+ font-size: calc(15.5 / var(--rem-base) * 1rem);+ flex: none;+ position: static;+ top: 0;+ visibility: visible;+ }+}++.nav-container.is-active {+ visibility: visible;+}++.nav {+ background: var(--nav-background);+ position: relative;+ top: var(--toolbar-height);+ height: var(--nav-height);+}++@media screen and (min-width: 769px) {+ .nav {+ box-shadow: 0.5px 0 3px var(--nav-border-color);+ }+}++@media screen and (min-width: 1024px) {+ .nav {+ top: var(--navbar-height);+ box-shadow: none;+ position: sticky;+ height: var(--nav-height--desktop);+ }+}++.nav .panels {+ display: flex;+ flex-direction: column;+ height: inherit;+}++html.is-clipped--nav {+ overflow-y: hidden;+}++.nav-panel-menu {+ overflow-y: scroll;+ overscroll-behavior: none;+ height: var(--nav-panel-menu-height);+}++.nav-panel-menu:not(.is-active) .nav-menu {+ opacity: 0.75;+}++.nav-panel-menu:not(.is-active)::after {+ content: "";+ background: rgba(0, 0, 0, 0.5);+ display: block;+ position: absolute;+ top: 0;+ right: 0;+ bottom: 0;+ left: 0;+}++.nav-menu {+ min-height: 100%;+ padding: 0.5rem 0.75rem;+ line-height: var(--nav-line-height);+ position: relative;+}++.nav-menu h3.title {+ color: var(--nav-heading-font-color);+ font-size: inherit;+ font-weight: var(--body-font-weight-bold);+ margin: 0;+ padding: 0.25em 0 0.125em;+}++.nav-menu a {+ color: inherit;+}++/* Solr Changes - Start */+.nav-list {+ margin: 0 0 0 0.75rem;+}++.nav-menu > ul.nav-list {+ padding-top: 20px;+}+/* Solr Changes - End */++.nav-menu > .nav-list + .nav-list {+ margin-top: 0.5rem;+}++.nav-item {+ list-style: none;+ /* Solr Changes - Start */+ margin-top: 10px;+ /* Solr Changes - End */+}++/* adds some breathing room below a nested list */+.nav-item-toggle ~ .nav-list {+ padding-bottom: 0.125rem;+}++/* matches list without a title */+.nav-item[data-depth="0"] > .nav-list:first-child {+ display: block;+ margin: 0;+}++.nav-item:not(.is-active) > .nav-list {+ display: none;+}++.nav-item-toggle {+ background: transparent url(../img/caret.svg) no-repeat center / 50%;+ border: none;+ outline: none;+ line-height: inherit;+ position: absolute;+ height: calc(var(--nav-line-height) * 1em);+ width: calc(var(--nav-line-height) * 1em);+ margin-top: -0.05em;+ margin-left: calc(var(--nav-line-height) * -1em);+}++.nav-item.is-active > .nav-item-toggle {+ transform: rotate(90deg);+}++.is-current-page > .nav-link,+.is-current-page > .nav-text {+ font-weight: var(--body-font-weight-bold);+ /* Solr Changes - Start */+ color: var(--color-solr-primary-orange);+ /* Solr Changes - End */+}++.nav-panel-explore {+ background: var(--nav-background);+ display: flex;+ flex-direction: column;+ position: absolute;+ top: 0;+ right: 0;+ bottom: 0;+ left: 0;+}++.nav-panel-explore:not(:first-child) {+ top: auto;+ max-height: var(--nav-panel-explore-height);+}++.nav-panel-explore .context {+ font-size: calc(15 / var(--rem-base) * 1rem);+ flex-shrink: 0;+ color: var(--nav-muted-color);+ box-shadow: 0 -1px 0 var(--nav-panel-divider-color);+ padding: 0 0.5rem;+ display: flex;+ align-items: center;+ justify-content: space-between;+ cursor: pointer;+ line-height: 1;+ height: var(--drawer-height);+}++.nav-panel-explore .context .version {+ display: flex;+ align-items: inherit;+}++.nav-panel-explore .context .version::after {+ content: "";+ background: url(../img/chevron.svg) no-repeat center right / auto 100%;+ width: 1.25em;+ height: 0.75em;+}++.nav-panel-explore .components {+ line-height: var(--doc-line-height);+ flex-grow: 1;+ box-shadow: inset 0 1px 5px var(--nav-panel-divider-color);+ background: var(--nav-secondary-background);+ padding: 0.5rem 0.75rem 0 0.75rem;+ margin: 0;+ overflow-y: scroll;+ max-height: 100%;+ display: block;+}++.nav-panel-explore:not(.is-active) .components {+ display: none;+}++.nav-panel-explore .component {+ display: block;+}++.nav-panel-explore .component + .component {+ margin-top: 0.5rem;+}++.nav-panel-explore .component:last-child {+ margin-bottom: 0.75rem;+}++.nav-panel-explore .component .title {+ font-weight: var(--body-font-weight-bold);+ color: inherit;+}++.nav-panel-explore .versions {+ display: flex;+ flex-wrap: wrap;+ list-style: none;+ padding-left: 0;+ margin-top: -0.25rem;+ line-height: 1;+}++.nav-panel-explore .component .version {+ display: block;+ margin: 0.375rem 0.375rem 0 0;+}++.nav-panel-explore .component .version a {+ border: 1px solid var(--nav-border-color);+ border-radius: 0.25rem;+ color: inherit;+ opacity: 0.75;+ white-space: nowrap;+ padding: 0.125em 0.25em;+ display: inherit;+}++.nav-panel-explore .component .is-current a {+ border-color: currentColor;+ opacity: 0.9;+ font-weight: var(--body-font-weight-bold);+}diff --git a/solr/solr-ref-guide/ui-src/css/print.css b/solr/solr-ref-guide/ui-src/css/print.cssnew file mode 100644index 00000000000..efa17c4ad8b--- /dev/null+++ b/solr/solr-ref-guide/ui-src/css/print.css@@ -0,0 +1,86 @@+@page {+ margin: 0.5in;+}++@media print {+ .hide-for-print {+ display: none !important;+ }++ html {+ font-size: var(--body-font-size--print);+ }++ a {+ color: inherit !important;+ text-decoration: underline;+ }++ a.bare,+ a[href^="#"],+ a[href^="mailto:"] {+ text-decoration: none;+ }++ tr,+ img,+ object,+ svg {+ page-break-inside: avoid;+ }++ thead {+ display: table-header-group;+ }++ pre {+ hyphens: none;+ white-space: pre-wrap;+ }++ body {+ padding-top: 2rem;+ }++ .navbar {+ background: none;+ color: inherit;+ position: absolute;+ }++ .navbar * {+ color: inherit !important;+ }++ .navbar > :not(.navbar-brand),+ .nav-container,+ .toolbar,+ /* Solr Changes - Start */+ nav.toc,+ /* Solr Changes - End */+ nav.pagination {+ display: none;+ }++ .doc {+ color: inherit;+ margin: auto;+ max-width: none;+ padding-bottom: 2rem;+ }++ .doc .listingblock code[data-lang]::before {+ display: block;+ }++ footer.footer {+ background: none;+ border-top: 1px solid var(--panel-border-color);+ color: var(--quote-attribution-font-color);+ padding: 0.25rem 0.5rem 0;+ }++ .footer * {+ color: inherit;+ }+}diff --git a/solr/solr-ref-guide/ui-src/css/site.css b/solr/solr-ref-guide/ui-src/css/site.cssnew file mode 100644index 00000000000..f8468bb2511--- /dev/null+++ b/solr/solr-ref-guide/ui-src/css/site.css@@ -0,0 +1,19 @@+/* Solr Changes - Start */+@import "typeface-noto-sans.css";+@import "typeface-inconsolata.css";+/* Solr Changes - End */+@import "vars.css";+@import "base.css";+@import "body.css";+@import "nav.css";+@import "main.css";+@import "toolbar.css";+@import "breadcrumbs.css";+@import "page-versions.css";+@import "toc.css";+@import "doc.css";+@import "pagination.css";+@import "header.css";+@import "footer.css";+@import "highlight.css";+@import "print.css";diff --git a/solr/solr-ref-guide/ui-src/css/toc.css b/solr/solr-ref-guide/ui-src/css/toc.cssnew file mode 100644index 00000000000..674dfaa7769--- /dev/null+++ b/solr/solr-ref-guide/ui-src/css/toc.css@@ -0,0 +1,105 @@+.toc-menu {+ color: var(--toc-font-color);+}++.toc.sidebar .toc-menu {+ margin-right: 0.75rem;+ position: sticky;+ top: var(--toc-top);+}++.toc .toc-menu h3 {+ color: var(--toc-heading-font-color);+ /* Solr Changes - Start */+ font-size: calc(18 / var(--rem-base) * 1rem);+ /* Solr Changes - End */+ font-weight: var(--body-font-weight-bold);+ line-height: 1.3;+ margin: 0 -0.5px;+ padding-bottom: 0.25rem;+}++.toc.sidebar .toc-menu h3 {+ display: flex;+ flex-direction: column;+ height: 2.5rem;+ justify-content: flex-end;+}++.toc .toc-menu ul {+ font-size: calc(15 / var(--rem-base) * 1rem);+ line-height: var(--toc-line-height);+ list-style: none;+ margin: 0;+ padding: 0;+}++.toc.sidebar .toc-menu ul {+ max-height: var(--toc-height);+ overflow-y: auto;+ overscroll-behavior: none;+ scrollbar-width: none;+}++.toc .toc-menu ul::-webkit-scrollbar {+ width: 0;+ height: 0;+}++@media screen and (min-width: 1024px) {+ /* Solr Changes - Start */+ .toc .toc-menu h3 {+ font-size: calc(18 / var(--rem-base) * 1rem);+ }++ .toc .toc-menu ul {+ font-size: calc(15 / var(--rem-base) * 1rem);+ }+ /* Solr Changes - End */+}++.toc .toc-menu li {+ margin: 0;+}++.toc .toc-menu li[data-level="2"] a {+ padding-left: 1.25rem;+}++.toc .toc-menu li[data-level="3"] a {+ padding-left: 2rem;+}++.toc .toc-menu a {+ color: inherit;+ border-left: 2px solid var(--toc-border-color);+ display: inline-block;+ padding: 0.25rem 0 0.25rem 0.5rem;+ text-decoration: none;+}++.sidebar.toc .toc-menu a {+ display: block;+ outline: none;+}++.toc .toc-menu a:hover {+ /* Solr Changes - Start */+ color: var(--color-solr-primary-orange);+ /* Solr Changes - End */+}++.toc .toc-menu a.is-active {+ /* Solr Changes - Start */+ border-left-color: var(--color-solr-primary-orange);+ /* Solr Changes - End */+ color: var(--doc-font-color);+}++.sidebar.toc .toc-menu a:focus {+ background: var(--panel-background);+}++.toc .toc-menu .is-hidden-toc {+ display: none !important;+}diff --git a/solr/solr-ref-guide/ui-src/css/typeface-inconsolata.css b/solr/solr-ref-guide/ui-src/css/typeface-inconsolata.cssnew file mode 100644index 00000000000..2b497aeb585--- /dev/null+++ b/solr/solr-ref-guide/ui-src/css/typeface-inconsolata.css@@ -0,0 +1,12 @@+/* Solr New File */+/* Load Inconsolata for monospace */+@font-face {+ font-family: 'Inconsolata';+ src: url(../font/Inconsolata-Regular.ttf);+}++@font-face {+ font-weight: bold;+ font-family: 'Inconsolata';+ src: url(../font/Inconsolata-Bold.ttf);+}diff --git a/solr/solr-ref-guide/ui-src/css/typeface-noto-sans.css b/solr/solr-ref-guide/ui-src/css/typeface-noto-sans.cssnew file mode 100644index 00000000000..1ae7229e02f--- /dev/null+++ b/solr/solr-ref-guide/ui-src/css/typeface-noto-sans.css@@ -0,0 +1,19 @@+/* Solr New File */+/* Load Noto Sans for body and text */+@font-face {+ font-family: "Noto Sans";+ font-style: normal;+ font-weight: 400;+ src:+ local("Noto Sans"),+ local("Noto Sans-Regular"),+ url(../font/NotoSans-Regular.ttf) format("truetype");+}++@font-face {+ font-weight: bold;+ font-family: "Noto Sans";+ src:+ local("NotoSans-Bold"),+ url(../font/NotoSans-Bold.ttf) format("truetype");+}diff --git a/solr/solr-ref-guide/ui-src/css/vars.css b/solr/solr-ref-guide/ui-src/css/vars.cssnew file mode 100644index 00000000000..ec17ab47bc7--- /dev/null+++ b/solr/solr-ref-guide/ui-src/css/vars.css@@ -0,0 +1,160 @@+:root {+ /* colors */+ --color-white: #fff;+ --color-smoke-10: #fefefe;+ --color-smoke-30: #fafafa;+ --color-smoke-50: #f5f5f5;+ --color-smoke-70: #f0f0f0;+ --color-smoke-90: #e1e1e1;+ --color-gray-10: #c1c1c1;+ --color-gray-30: #8e8e8e;+ --color-gray-50: #808080;+ --color-gray-70: #5d5d5d;+ --color-jet-20: #4a4a4a;+ --color-jet-30: #424242;+ --color-jet-50: #333;+ --color-jet-70: #222;+ --color-jet-80: #191919;+ --color-black: #000;+ /* Solr Additions - Start */+ --color-solr-primary-orange: #d9411e;+ --color-solr-gray: #e6e7e8;+ --color-solr-light-gray: #f8f8f7;+ --color-solr-light-orange: #ff833d;+ --color-solr-blue: #305cb3;+ --color-solr-light-blue: #a5dbff;+ --color-solr-dark-blue: #262130;+ /* Solr Additions - End */+ /* fonts */+ --rem-base: 18; /* used to compute rem value from desired pixel value (e.g., calc(18 / var(--rem-base) * 1rem) = 18px) */+ --body-font-size: 1.0625em; /* 17px */+ --body-font-size--desktop: 1.125em; /* 18px */+ --body-font-size--print: 0.9375em; /* 15px */+ --body-line-height: 1.15;+ --body-font-color: var(--color-jet-70);+ /* Solr Changes - Start */+ --body-font-family: "Noto Sans", sans-serif;+ --body-font-weight-bold: 700;+ --monospace-font-family: "Inconsolata", monospace;+ --monospace-font-weight-bold: 700;+ /* Solr Changes - End */+ /* base */+ --body-background: var(--color-white);+ --panel-background: var(--color-smoke-30);+ --panel-border-color: var(--color-smoke-90);+ --scrollbar-thumb-color: var(--color-gray-10);+ /* navbar */+ /* Solr Changes - Start */+ --navbar-background: var(--color-smoke-30);+ --navbar-font-color: var(--color-black);+ --navbar-border-color: var(--color-solr-primary-orange);+ --navbar_hover-background: var(--color-solr-light-orange);+ /* Solr Changes - End */+ --navbar-button-background: var(--color-white);+ --navbar-button-border-color: var(--panel-border-color);+ --navbar-button-font-color: var(--body-font-color);+ --navbar-menu-border-color: var(--panel-border-color);+ --navbar-menu-background: var(--color-white);+ --navbar-menu-font-color: var(--body-font-color);+ --navbar-menu_hover-background: var(--color-smoke-50);+ /* nav */+ --nav-background: var(--panel-background);+ --nav-border-color: var(--color-gray-10);+ --nav-line-height: 1.35;+ --nav-heading-font-color: var(--color-jet-30);+ --nav-muted-color: var(--color-gray-70);+ --nav-panel-divider-color: var(--color-smoke-90);+ --nav-secondary-background: var(--color-smoke-70);+ /* toolbar */+ --toolbar-background: var(--panel-background);+ --toolbar-border-color: var(--panel-border-color);+ --toolbar-font-color: var(--color-gray-70);+ --toolbar-muted-color: var(--color-gray-30);+ --page-version-menu-background: var(--color-smoke-70);+ --page-version-missing-font-color: var(--color-gray-30);+ /* admonitions */+ --caution-color: #a0439c;+ --caution-on-color: var(--color-white);+ --important-color: #d32f2f;+ --important-on-color: var(--color-white);+ --note-color: #217ee7;+ --note-on-color: var(--color-white);+ --tip-color: #41af46;+ --tip-on-color: var(--color-white);+ --warning-color: #e18114;+ --warning-on-color: var(--color-white);+ /* doc */+ --doc-font-color: var(--color-jet-50);+ --doc-font-size: inherit;+ --doc-font-size--desktop: calc(17 / var(--rem-base) * 1rem);+ --doc-line-height: 1.6;+ --doc-margin: 0 auto;+ --doc-margin--desktop: 0 2rem;+ /* Solr Changes - Start */+ --heading-font-color: var(--color-solr-primary-orange);+ --heading-font-weight: normal;+ --alt-heading-font-weight: var(--body-font-weight-bold);+ --section-divider-color: var(--panel-border-color);+ --link-font-color: var(--color-solr-blue);+ --link_hover-font-color: var(--color-solr-blue);+ /* Solr Changes - End */+ --link_unresolved-font-color: var(--important-color);+ --abstract-background: var(--color-smoke-70);+ --abstract-font-color: var(--color-jet-20);+ --abstract-border-color: var(--panel-border-color);+ --admonition-background: var(--panel-background);+ --admonition-label-font-weight: var(--body-font-weight-bold);+ --caption-font-color: var(--color-gray-70);+ --caption-font-weight: var(--body-font-weight-bold);+ --code-background: var(--panel-background);+ --code-font-color: var(--body-font-color);+ --example-background: var(--color-white);+ --example-border-color: var(--color-gray-70);+ --kbd-background: var(--panel-background);+ --kbd-border-color: var(--color-gray-10);+ --pre-background: var(--panel-background);+ --pre-border-color: var(--panel-border-color);+ --pre-annotation-font-color: var(--color-gray-50);+ --quote-background: var(--panel-background);+ --quote-border-color: var(--color-gray-70);+ --quote-font-color: var(--color-gray-70);+ --quote-attribution-font-color: var(--color-gray-30);+ /* Solr Changes - Start */+ --sidebar-background: var(--color-solr-light-gray);+ /* Solr Changes - End */+ --table-border-color: var(--panel-border-color);+ --table-stripe-background: var(--panel-background);+ --table-footer-background: linear-gradient(to bottom, var(--color-smoke-70) 0%, var(--color-white) 100%);+ /* toc */+ --toc-font-color: var(--nav-muted-color);+ --toc-heading-font-color: var(--doc-font-color);+ --toc-border-color: var(--panel-border-color);+ --toc-line-height: 1.2;+ /* footer */+ --footer-line-height: var(--doc-line-height);+ --footer-background: var(--color-smoke-90);+ --footer-font-color: var(--color-gray-70);+ --footer-link-font-color: var(--color-jet-80);+ /* dimensions and positioning */+ --navbar-height: calc(63 / var(--rem-base) * 1rem);+ --toolbar-height: calc(45 / var(--rem-base) * 1rem);+ --drawer-height: var(--toolbar-height);+ --body-top: var(--navbar-height);+ --body-min-height: calc(100vh - var(--body-top));+ --nav-height: calc(var(--body-min-height) - var(--toolbar-height));+ --nav-height--desktop: var(--body-min-height);+ --nav-panel-menu-height: calc(100% - var(--drawer-height));+ --nav-panel-explore-height: calc(50% + var(--drawer-height));+ --nav-width: calc(270 / var(--rem-base) * 1rem);+ --toc-top: calc(var(--body-top) + var(--toolbar-height));+ --toc-height: calc(100vh - var(--toc-top) - 2.5rem);+ --toc-width: calc(162 / var(--rem-base) * 1rem);+ --toc-width--widescreen: calc(216 / var(--rem-base) * 1rem);+ --doc-max-width: calc(720 / var(--rem-base) * 1rem);+ --doc-max-width--desktop: calc(828 / var(--rem-base) * 1rem);+ /* stacking */+ --z-index-nav: 1;+ --z-index-toolbar: 2;+ --z-index-page-version-menu: 3;+ --z-index-navbar: 4;+}diff --git a/solr/solr-ref-guide/src/fonts/Inconsolata/Inconsolata-Bold.ttf b/solr/solr-ref-guide/ui-src/font/Inconsolata-Bold.ttfold mode 100755new mode 100644similarity index 100%rename from solr/solr-ref-guide/src/fonts/Inconsolata/Inconsolata-Bold.ttfrename to solr/solr-ref-guide/ui-src/font/Inconsolata-Bold.ttfdiff --git a/solr/solr-ref-guide/src/fonts/Inconsolata/Inconsolata-Regular.ttf b/solr/solr-ref-guide/ui-src/font/Inconsolata-Regular.ttfold mode 100755new mode 100644similarity index 100%rename from solr/solr-ref-guide/src/fonts/Inconsolata/Inconsolata-Regular.ttfrename to solr/solr-ref-guide/ui-src/font/Inconsolata-Regular.ttfdiff --git a/solr/solr-ref-guide/src/fonts/Inconsolata/OFL.txt b/solr/solr-ref-guide/ui-src/font/Inconsolata/OFL.txtold mode 100755new mode 100644similarity index 100%rename from solr/solr-ref-guide/src/fonts/Inconsolata/OFL.txtrename to solr/solr-ref-guide/ui-src/font/Inconsolata/OFL.txtdiff --git a/solr/solr-ref-guide/src/fonts/Noto_Sans/NotoSans-Bold.ttf b/solr/solr-ref-guide/ui-src/font/NotoSans-Bold.ttfold mode 100755new mode 100644similarity index 100%rename from solr/solr-ref-guide/src/fonts/Noto_Sans/NotoSans-Bold.ttfrename to solr/solr-ref-guide/ui-src/font/NotoSans-Bold.ttfdiff --git a/solr/solr-ref-guide/src/fonts/Noto_Sans/NotoSans-BoldItalic.ttf b/solr/solr-ref-guide/ui-src/font/NotoSans-BoldItalic.ttfold mode 100755new mode 100644similarity index 100%rename from solr/solr-ref-guide/src/fonts/Noto_Sans/NotoSans-BoldItalic.ttfrename to solr/solr-ref-guide/ui-src/font/NotoSans-BoldItalic.ttfdiff --git a/solr/solr-ref-guide/src/fonts/Noto_Sans/NotoSans-Italic.ttf b/solr/solr-ref-guide/ui-src/font/NotoSans-Italic.ttfold mode 100755new mode 100644similarity index 100%rename from solr/solr-ref-guide/src/fonts/Noto_Sans/NotoSans-Italic.ttfrename to solr/solr-ref-guide/ui-src/font/NotoSans-Italic.ttfdiff --git a/solr/solr-ref-guide/src/fonts/Noto_Sans/NotoSans-Regular.ttf b/solr/solr-ref-guide/ui-src/font/NotoSans-Regular.ttfold mode 100755new mode 100644similarity index 100%rename from solr/solr-ref-guide/src/fonts/Noto_Sans/NotoSans-Regular.ttfrename to solr/solr-ref-guide/ui-src/font/NotoSans-Regular.ttfdiff --git a/solr/solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt b/solr/solr-ref-guide/ui-src/font/Noto_Sans/LICENSE.txtold mode 100755new mode 100644similarity index 100%rename from solr/solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txtrename to solr/solr-ref-guide/ui-src/font/Noto_Sans/LICENSE.txtdiff --git a/solr/solr-ref-guide/ui-src/img/favicon.ico b/solr/solr-ref-guide/ui-src/img/favicon.iconew file mode 100644index 00000000000..50704f05376Binary files /dev/null and b/solr/solr-ref-guide/ui-src/img/favicon.ico differdiff --git a/solr/solr-ref-guide/ui-src/img/solr-sunOnly-small.png b/solr/solr-ref-guide/ui-src/img/solr-sunOnly-small.pngnew file mode 100644index 00000000000..366f1c883abBinary files /dev/null and b/solr/solr-ref-guide/ui-src/img/solr-sunOnly-small.png differdiff --git a/solr/solr-ref-guide/ui-src/js/02-on-this-page.js b/solr/solr-ref-guide/ui-src/js/02-on-this-page.jsnew file mode 100644index 00000000000..89cee2e0eec--- /dev/null+++ b/solr/solr-ref-guide/ui-src/js/02-on-this-page.js@@ -0,0 +1,118 @@+;(function () {+ 'use strict'++ /* Solr Changes - Start */+ var sidebar = document.querySelector('nav.toc.sidebar')+ /* Solr Changes - End */+ if (!sidebar) return+ if (document.querySelector('body.-toc')) return sidebar.parentNode.removeChild(sidebar)+ var levels = parseInt(sidebar.dataset.levels || 2, 10)+ if (levels < 0) return++ var articleSelector = 'article.doc'+ var article = document.querySelector(articleSelector)+ var headingsSelector = []+ for (var level = 0; level <= levels; level++) {+ var headingSelector = [articleSelector]+ if (level) {+ for (var l = 1; l <= level; l++) headingSelector.push((l === 2 ? '.sectionbody>' : '') + '.sect' + l)+ headingSelector.push('h' + (level + 1) + '[id]')+ } else {+ headingSelector.push('h1[id].sect0')+ }+ headingsSelector.push(headingSelector.join('>'))+ }+ var headings = find(headingsSelector.join(','), article.parentNode)+ if (!headings.length) return sidebar.parentNode.removeChild(sidebar)++ var lastActiveFragment+ var links = {}+ var list = headings.reduce(function (accum, heading) {+ var link = document.createElement('a')+ link.textContent = heading.textContent+ links[(link.href = '#' + heading.id)] = link+ var listItem = document.createElement('li')+ listItem.dataset.level = parseInt(heading.nodeName.slice(1), 10) - 1+ listItem.appendChild(link)+ accum.appendChild(listItem)+ return accum+ }, document.createElement('ul'))++ var menu = sidebar.querySelector('.toc-menu')+ if (!menu) (menu = document.createElement('div')).className = 'toc-menu'++ var title = document.createElement('h3')+ title.textContent = sidebar.dataset.title || 'Contents'+ menu.appendChild(title)+ menu.appendChild(list)++ var startOfContent = !document.getElementById('toc') && article.querySelector('h1.page ~ :not(.is-before-toc)')+ if (startOfContent) {+ /* Solr Changes - Start */+ var embeddedToc = document.createElement('nav')+ /* Solr Changes - End */+ embeddedToc.className = 'toc embedded'+ embeddedToc.appendChild(menu.cloneNode(true))+ startOfContent.parentNode.insertBefore(embeddedToc, startOfContent)+ }++ window.addEventListener('load', function () {+ onScroll()+ window.addEventListener('scroll', onScroll)+ })++ function onScroll () {+ var scrolledBy = window.pageYOffset+ var buffer = getNumericStyleVal(document.documentElement, 'fontSize') * 1.15+ var ceil = article.offsetTop+ if (scrolledBy && window.innerHeight + scrolledBy + 2 >= document.documentElement.scrollHeight) {+ lastActiveFragment = Array.isArray(lastActiveFragment) ? lastActiveFragment : Array(lastActiveFragment || 0)+ var activeFragments = []+ var lastIdx = headings.length - 1+ headings.forEach(function (heading, idx) {+ var fragment = '#' + heading.id+ if (idx === lastIdx || heading.getBoundingClientRect().top + getNumericStyleVal(heading, 'paddingTop') > ceil) {+ activeFragments.push(fragment)+ if (lastActiveFragment.indexOf(fragment) < 0) links[fragment].classList.add('is-active')+ } else if (~lastActiveFragment.indexOf(fragment)) {+ links[lastActiveFragment.shift()].classList.remove('is-active')+ }+ })+ list.scrollTop = list.scrollHeight - list.offsetHeight+ lastActiveFragment = activeFragments.length > 1 ? activeFragments : activeFragments[0]+ return+ }+ if (Array.isArray(lastActiveFragment)) {+ lastActiveFragment.forEach(function (fragment) {+ links[fragment].classList.remove('is-active')+ })+ lastActiveFragment = undefined+ }+ var activeFragment+ headings.some(function (heading) {+ if (heading.getBoundingClientRect().top + getNumericStyleVal(heading, 'paddingTop') - buffer > ceil) return true+ activeFragment = '#' + heading.id+ })+ if (activeFragment) {+ if (activeFragment === lastActiveFragment) return+ if (lastActiveFragment) links[lastActiveFragment].classList.remove('is-active')+ var activeLink = links[activeFragment]+ activeLink.classList.add('is-active')+ if (list.scrollHeight > list.offsetHeight) {+ list.scrollTop = Math.max(0, activeLink.offsetTop + activeLink.offsetHeight - list.offsetHeight)+ }+ lastActiveFragment = activeFragment+ } else if (lastActiveFragment) {+ links[lastActiveFragment].classList.remove('is-active')+ lastActiveFragment = undefined+ }+ }++ function find (selector, from) {+ return [].slice.call((from || document).querySelectorAll(selector))+ }++ function getNumericStyleVal (el, prop) {+ return parseFloat(window.getComputedStyle(el)[prop])+ }+})()diff --git a/solr/solr-ref-guide/ui-src/partials/footer-content.hbs b/solr/solr-ref-guide/ui-src/partials/footer-content.hbsnew file mode 100644index 00000000000..1d00a84edb3--- /dev/null+++ b/solr/solr-ref-guide/ui-src/partials/footer-content.hbs@@ -0,0 +1,5 @@+<footer class="footer">+ <!-- Solr Changes - Start -->+ <p> © Apache Software Foundation. All rights reserved.</p>+ <!-- Solr Changes - End -->+</footer>diff --git a/solr/solr-ref-guide/ui-src/partials/head-icons.hbs b/solr/solr-ref-guide/ui-src/partials/head-icons.hbsnew file mode 100644index 00000000000..863d2c56179--- /dev/null+++ b/solr/solr-ref-guide/ui-src/partials/head-icons.hbs@@ -0,0 +1,3 @@+<!-- Solr Changes - Start -->+ <link rel="icon" href="{{{uiRootPath}}}/img/favicon.ico" type="image/x-icon">+<!-- Solr Changes - End -->diff --git a/solr/solr-ref-guide/ui-src/partials/header-content.hbs b/solr/solr-ref-guide/ui-src/partials/header-content.hbsnew file mode 100644index 00000000000..63635ad1fe6--- /dev/null+++ b/solr/solr-ref-guide/ui-src/partials/header-content.hbs@@ -0,0 +1,44 @@+<header class="header">+ <nav class="navbar">+ <div class="navbar-brand">+ <!-- Solr Changes - Start -->+ <img class="navbar-item" src="{{{uiRootPath}}}/img/solr-sunOnly-small.png" width="30" height="30">+ <a class="navbar-item" href="{{{or site.url siteRootPath}}}">{{site.title}}</a>+ <!-- Solr Changes - End -->+ {{#if env.SITE_SEARCH_ENABLED}}+ <div class="navbar-item search hide-for-print">+ <div id="search-field" class="field">+ <input id="search-input" type="text" placeholder="Search the docs"{{#if page.home}} autofocus{{/if}}>+ </div>+ </div>+ {{/if}}++ <button class="navbar-burger" data-target="topbar-nav">+ <span></span>+ <span></span>+ <span></span>+ </button>+ </div>+ <div id="topbar-nav" class="navbar-menu">+ <div class="navbar-end">+ <!-- Solr Changes - Start -->+ <a class="navbar-item" href="https://solr.apache.org/" target="_blank" rel="noreferrer nopener">Solr Website</a>+ <div class="navbar-item has-dropdown is-hoverable">+ <a class="navbar-link" href="#">Resources</a>+ <div class="navbar-dropdown">+ <a class="navbar-item" href="{{{page.attributes.solr-javadocs}}}/index.html" target="_blank" rel="noreferrer nopener">Solr Javadocs</a>+ <a class="navbar-item" href="https://solr.apache.org/community.html#version-control" target="_blank" rel="noreferrer nopener">Source Code</a>+ <a class="navbar-item" href="https://solr.apache.org/community.html" target="_blank" rel="noreferrer nopener">Community Links</a>+ <a class="navbar-item" href="https://github.com/apache/solr/tree/main/dev-docs/ref-guide" target="_blank" rel="noreferrer nopener">Contribute</a>+ </div>+ </div>+ <div class="navbar-item">+ <span class="control">+ <a class="button is-primary" href="https://solr.apache.org/downloads.html" target="_blank" rel="noreferrer nopener">Download</a>+ </span>+ </div>+ <!-- Solr Changes - End -->+ </div>+ </div>+ </nav>+</header>diff --git a/solr/solr-ref-guide/ui-src/partials/nav-explore.hbs b/solr/solr-ref-guide/ui-src/partials/nav-explore.hbsnew file mode 100644index 00000000000..32870114353--- /dev/null+++ b/solr/solr-ref-guide/ui-src/partials/nav-explore.hbs@@ -0,0 +1,97 @@+<div class="nav-panel-explore{{#unless page.navigation}} is-active{{/unless}}" data-panel="explore">+ {{#if page.component}}+ <div class="context">+ <span class="title">{{page.component.title}}</span>+ <span class="version">{{page.componentVersion.displayVersion}}</span>+ </div>+ {{/if}}+<!-- Programmatically creates the component and version list -->+ <ul class="components">+ {{#each site.components}}+ <li class="component{{#if (eq this @root.page.component)}} is-current{{/if}}">+ <a class="title" href="{{{relativize ./url}}}">{{{./title}}}</a>+ <ul class="versions">+ {{#each ./versions}}+ <li class="version+ {{~#if (and (eq .. @root.page.component) (eq this @root.page.componentVersion))}} is-current{{/if~}}+ {{~#if (eq this ../latest)}} is-latest{{/if}}">+ <a href="{{{relativize ./url}}}">{{./displayVersion}}</a>+ </li>+ {{/each}}+ </ul>+ </li>+ {{/each}}+ </ul>++ <!-- Solr Additions - Start -->+ <!-- A hard-coded list of older Ref Guides, pre-Antora -->+ <ul class="components">+ <li class="component"> <a class="title" href="https://solr.apache.org/guide">Pre-9.0 Reference Guides</a>+ <ul class="versions">+ <li class="version">+ <a href="https://solr.apache.org/guide/8_11">8.11</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/8_10">8.10</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/8_9">8.9</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/8_8">8.8</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/8_7">8.7</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/8_6">8.6</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/8_5">8.5</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/8_4">8.4</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/8_3">8.3</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/8_2">8.2</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/8_1">8.1</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/8_0">8.0</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/7_7">7.7</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/7_6">7.6</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/7_5">7.5</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/7_4">7.4</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/7_3">7.3</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/7_2">7.2</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/7_1">7.1</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/7_0">7.0</a>+ </li>+ <li class="version">+ <a href="https://solr.apache.org/guide/6_6">6.6</a>+ </ul>+ </li>+ <!-- Solr Additions - End -->+ </ul>+</div>diff --git a/solr/solr-ref-guide/ui-src/partials/nav.hbs b/solr/solr-ref-guide/ui-src/partials/nav.hbsnew file mode 100644index 00000000000..8d323442fa7--- /dev/null+++ b/solr/solr-ref-guide/ui-src/partials/nav.hbs@@ -0,0 +1,10 @@+<div class="nav-container"{{#if page.component}} data-component="{{page.component.name}}" data-version="{{page.version}}"{{/if}}>+ <!-- Solr Changes - Start (change 'aside' -> 'nav') -->+ <nav class="nav">+ <div class="panels">+{{> nav-menu}}+{{> nav-explore}}+ </div>+ </nav>+ <!-- Solr Changes - End -->+</div>diff --git a/solr/solr-ref-guide/ui-src/partials/toc.hbs b/solr/solr-ref-guide/ui-src/partials/toc.hbsnew file mode 100644index 00000000000..3265b592b2c--- /dev/null+++ b/solr/solr-ref-guide/ui-src/partials/toc.hbs@@ -0,0 +1,5 @@+<!-- Solr Changes - Start -->+<nav class="toc sidebar" data-title="{{or page.attributes.toctitle 'On This Page'}}" data-levels="{{{or page.attributes.toclevels 2}}}">+ <div class="toc-menu"></div>+</nav>+<!-- Solr Changes - End -->\ No newline at end of filediff --git a/versions.lock b/versions.lockindex 4f7d27d7ac2..361e48830aa 100644--- a/versions.lock+++ b/versions.lock@@ -260,27 +260,14 @@ com.amazonaws:aws-java-sdk-core:1.12.15 (2 constraints: 501a5183)com.amazonaws:aws-java-sdk-kms:1.12.15 (1 constraints: d60cb42a)com.amazonaws:aws-java-sdk-s3:1.12.15 (1 constraints: e0125c30)com.amazonaws:jmespath-java:1.12.15 (2 constraints: 501a5183)-com.beust:jcommander:1.35 (1 constraints: b50c1901)com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.1 (2 constraints: 5d1c0ff1)com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.1 (2 constraints: a419c512)com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.1 (2 constraints: 06248081)com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.1 (3 constraints: 743d1c0e)com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1 (2 constraints: a31da85f)com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.1 (2 constraints: 06248081)-com.github.jnr:jffi:1.2.18 (1 constraints: b20902ab)-com.github.jnr:jnr-constants:0.9.12 (4 constraints: ed2c9d5d)-com.github.jnr:jnr-enxio:0.19 (2 constraints: 2a167d08)-com.github.jnr:jnr-netdb:1.1.6 (1 constraints: 7e0952a1)-com.github.jnr:jnr-posix:3.0.49 (2 constraints: f0161b5b)-com.github.jnr:jnr-unixsocket:0.20 (1 constraints: 4a09d497)com.github.stephenc.jcip:jcip-annotations:1.0-1 (2 constraints: c5188bde)com.google.cloud:google-cloud-nio:0.122.11 (1 constraints: 99053046)-com.headius:backport9:1.1 (1 constraints: 1a098c8e)-com.headius:invokebinder:1.11 (1 constraints: 4b09d797)-com.headius:modulator:1.0 (1 constraints: 19098b8e)-com.headius:options:1.4 (1 constraints: 1d098f8e)-com.jcraft:jzlib:1.1.3 (1 constraints: 7b094fa1)-com.martiansoftware:nailgun-server:0.9.1 (1 constraints: 800960a1)com.nimbusds:content-type:2.2 (1 constraints: d80b68eb)com.nimbusds:lang-tag:1.5 (1 constraints: da0b68eb)com.nimbusds:nimbus-jose-jwt:9.16.1 (1 constraints: 730c5410)@@ -289,7 +276,6 @@ com.squareup.okhttp3:mockwebserver:4.9.3 (1 constraints: c60ebf62)com.squareup.okhttp3:okhttp:4.9.3 (1 constraints: 3f0f516d)com.squareup.okio:okio:2.8.0 (1 constraints: 540c39fd)com.sun.jersey:jersey-servlet:1.19 (1 constraints: df04fa30)-com.vaadin.external.google:android-json:0.0.20131108.vaadin1 (1 constraints: 34092a9e)io.github.microutils:kotlin-logging:2.1.21 (1 constraints: ec0e8871)io.github.microutils:kotlin-logging-jvm:2.1.21 (1 constraints: af0f358c)io.micrometer:micrometer-core:1.5.14 (1 constraints: fc161b19)@@ -299,7 +285,7 @@ jakarta.annotation:jakarta.annotation-api:1.3.5 (1 constraints: 3a131133)jakarta.servlet:jakarta.servlet-api:4.0.4 (1 constraints: 961568b9)jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9)javax.inject:javax.inject:1 (1 constraints: 7a0df617)-joda-time:joda-time:2.9.9 (2 constraints: 0317195a)+joda-time:joda-time:2.9.9 (2 constraints: 8f124433)net.bytebuddy:byte-buddy:1.10.20 (2 constraints: 7c10a9d0)net.minidev:accessors-smart:2.4.7 (1 constraints: 4e0a90b8)net.minidev:json-smart:2.4.7 (1 constraints: 160e936e)@@ -313,8 +299,6 @@ org.apache.kerby:kerb-identity:1.0.1 (1 constraints: 5f0cb602)org.apache.kerby:kerb-server:1.0.1 (1 constraints: d10b65f2)org.apache.kerby:kerb-simplekdc:1.0.1 (1 constraints: dc0d7e3e)org.apache.logging.log4j:log4j-1.2-api:2.17.1 (1 constraints: 3d05453b)-org.asciidoctor:asciidoctorj:1.6.2 (1 constraints: 0b050436)-org.asciidoctor:asciidoctorj-api:1.6.2 (1 constraints: e30cfb0d)org.freemarker:freemarker:2.3.31 (1 constraints: ef0e9271)org.glassfish:jakarta.el:3.0.3 (1 constraints: 941562b9)org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029)@@ -325,13 +309,6 @@ org.jetbrains.kotlin:kotlin-stdlib:1.6.10 (6 constraints: b456d578)org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10 (3 constraints: 852a7097)org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0 (1 constraints: ae1013c2)org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0 (2 constraints: 5e203d24)-org.jruby:dirgra:0.3 (1 constraints: 1b098b8e)-org.jruby:jruby:9.2.6.0 (1 constraints: 490d7d28)-org.jruby:jruby-core:9.2.6.0 (1 constraints: 0f08b57d)-org.jruby:jruby-stdlib:9.2.6.0 (1 constraints: 0f08b57d)-org.jruby.jcodings:jcodings:1.0.41 (2 constraints: e3124361)-org.jruby.joni:joni:2.1.25 (1 constraints: b00903ab)-org.jsoup:jsoup:1.12.1 (1 constraints: 3705303b)org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b)org.mockito:mockito-core:3.8.0 (1 constraints: 0d051236)org.objenesis:objenesis:3.1 (2 constraints: 5b0ff979)diff --git a/versions.props b/versions.propsindex a1e63533e48..3915dbd0ea5 100644--- a/versions.props+++ b/versions.props@@ -47,7 +47,6 @@ com.pff:java-libpst=0.8.1com.rometools:*=1.12.2com.sun.jersey:*=1.19com.tdunning:t-digest=3.1-com.vaadin.external.google:android-json=0.0.20131108.vaadin1commons-cli:commons-cli=1.4commons-codec:commons-codec=1.13commons-collections:commons-collections=3.2.2@@ -63,6 +62,7 @@ io.opentracing:*=0.33.0io.prometheus:*=0.2.0io.sgr:s2-geometry-library-java=1.0.0javax.servlet:javax.servlet-api=3.1.0+joda-time:joda-time=2.9.9junit:junit=4.13.1net.arnx:jsonic=1.2.7net.bytebuddy:byte-buddy=1.9.3@@ -98,7 +98,6 @@ org.apache.tika:*=1.27org.apache.xmlbeans:xmlbeans=3.1.0org.apache.zookeeper:*=3.7.0org.apiguardian:apiguardian-api=1.1.0-org.asciidoctor:asciidoctorj=1.6.2org.aspectj:aspectjrt=1.8.0org.bitbucket.b_c:jose4j=0.7.9org.bouncycastle:*=1.69@@ -116,7 +115,6 @@ org.hamcrest:*=2.2org.hsqldb:hsqldb=2.4.0org.jctools:jctools-core=3.3.0org.jdom:jdom2=2.0.6-org.jsoup:jsoup=1.12.1org.locationtech.spatial4j:*=0.7org.mockito:mockito-core=3.8.0org.objenesis:objenesis=2.6