diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/package-info.java
index 4d20996e41bd..f3c1ded1f1ff 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/package-info.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/package-info.java
@@ -15,83 +15,5 @@
* limitations under the License.
*/
-/**
- * Flexible query parser is a modular, extensible framework for implementing Lucene query parsers.
- * In the flexible query parser model, query parsing takes three steps: syntax parsing, processing
- * (query semantics) and building (conversion to a Lucene {@link org.apache.lucene.search.Query}).
- *
- *
The flexible query parser module provides not just the framework but also the {@linkplain
- * org.apache.lucene.queryparser.flexible.standard.StandardQueryParser} - the default implementation
- * of a fully fledged query parser that supports most of the classic query parser's syntax but also
- * adds support for interval functions, min-should-match operator on Boolean groups and many hooks
- * for customization of how the parser behaves at runtime.
- *
- *
The flexible query parser is divided in two packages:
- *
- *
- * - {@link org.apache.lucene.queryparser.flexible.core}: contains the query parser API classes,
- * which should be extended by custom query parser implementations.
- *
- {@link org.apache.lucene.queryparser.flexible.standard}: contains an example Lucene query
- * parser implementation built on top of the flexible query parser API.
- *
- *
- * Features
- *
- *
- * - full support for Boolean expressions, including groups
- *
- {@linkplain org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser syntax parsers}
- * - support for arbitrary syntax parsers, that can be converted into {@link
- * org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} trees.
- *
- {@linkplain org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor query
- * node processors} - optimize, validate, rewrite the {@link
- * org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} trees
- *
- {@linkplain
- * org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorPipeline processor
- * pipelines} - select your favorite query processors and build a pipeline to implement the
- * features you need.
- *
- {@linkplain org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler query
- * configuration handlers}
- *
- {@linkplain org.apache.lucene.queryparser.flexible.core.builders.QueryBuilder query
- * builders} - convert {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode}
- * trees into Lucene {@link org.apache.lucene.search.Query} instances.
- *
- *
- * Design
- *
- * The flexible query parser was designed to have a very generic architecture, so that it can be
- * easily used for different products with varying query syntax needs.
- *
- *
The query parser has three layers and its core is what we call the {@linkplain
- * org.apache.lucene.queryparser.flexible.core.nodes.QueryNode query node tree}. It is a tree of
- * objects that represent the syntax of the original query, for example, for 'a AND b' the tree
- * could look like this:
- *
- *
- * AND
- * / \
- * A B
- *
- *
- * The three flexible query parser layers are:
- *
- *
- * - {@link org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser}
- *
- This layer is the text parsing layer which simply transforms the query text string into a
- * {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} tree. Every text parser
- * must implement the interface {@link
- * org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser}. The default
- * implementation is {@link
- * org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser}.
- *
- {@link org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor}
- *
- The query node processor does most of the work: it contains a chain of {@linkplain
- * org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor query node
- * processors}. Each processor can walk the tree and modify nodes or even the tree's
- * structure. This allows for query optimization before the node tree is converted to an
- * actual query.
- *
- {@link org.apache.lucene.queryparser.flexible.core.builders.QueryBuilder}
- *
- The third layer is a configurable map of builders, which map {@linkplain
- * org.apache.lucene.queryparser.flexible.core.nodes.QueryNode query nodes} to their adapters
- * that convert each node into a {@link org.apache.lucene.search.Query}.
- *
- */
+/** */
package org.apache.lucene.queryparser.flexible;
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/package-info.java
index 569df7a029cf..9d02e8aff020 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/package-info.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/package-info.java
@@ -22,10 +22,83 @@
* operations. In the new query parser structure, the parsing was divided in 3 steps: parsing
* (syntax), processing (semantic) and building.
*
- * The classes contained in the package org.apache.lucene.queryParser.standard are used to
- * reproduce the same behavior as the old query parser.
+ *
Flexible query parser is a modular, extensible framework for implementing Lucene query
+ * parsers. In the flexible query parser model, query parsing takes three steps: syntax parsing,
+ * processing (query semantics) and building (conversion to a Lucene {@link
+ * org.apache.lucene.search.Query}).
*
- *
Check {@link org.apache.lucene.queryparser.flexible.standard.StandardQueryParser} to quick
- * start using the Lucene query parser.
+ *
The flexible query parser module provides not just the framework but also the {@linkplain
+ * org.apache.lucene.queryparser.flexible.standard.StandardQueryParser} - the default implementation
+ * of a fully fledged query parser that supports most of the classic query parser's syntax but also
+ * adds support for interval functions, min-should-match operator on Boolean groups and many hooks
+ * for customization of how the parser behaves at runtime.
+ *
+ *
The flexible query parser is divided in two packages:
+ *
+ *
+ * - {@link org.apache.lucene.queryparser.flexible.core}: contains the query parser API classes,
+ * which should be extended by custom query parser implementations.
+ *
- {@link org.apache.lucene.queryparser.flexible.standard}: contains an example Lucene query
+ * parser implementation built on top of the flexible query parser API.
+ *
+ *
+ * Features
+ *
+ *
+ * - full support for Boolean expressions, including groups
+ *
- {@linkplain org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser syntax parsers}
+ * - support for arbitrary syntax parsers, that can be converted into {@link
+ * org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} trees.
+ *
- {@linkplain org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor query
+ * node processors} - optimize, validate, rewrite the {@link
+ * org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} trees
+ *
- {@linkplain
+ * org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorPipeline processor
+ * pipelines} - select your favorite query processors and build a pipeline to implement the
+ * features you need.
+ *
- {@linkplain org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler query
+ * configuration handlers}
+ *
- {@linkplain org.apache.lucene.queryparser.flexible.core.builders.QueryBuilder query
+ * builders} - convert {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode}
+ * trees into Lucene {@link org.apache.lucene.search.Query} instances.
+ *
+ *
+ * Design
+ *
+ * The flexible query parser was designed to have a very generic architecture, so that it can be
+ * easily used for different products with varying query syntax needs.
+ *
+ *
The query parser has three layers and its core is what we call the {@linkplain
+ * org.apache.lucene.queryparser.flexible.core.nodes.QueryNode query node tree}. It is a tree of
+ * objects that represent the syntax of the original query, for example, for 'a AND b' the tree
+ * could look like this:
+ *
+ *
+ * AND
+ * / \
+ * A B
+ *
+ *
+ * The three flexible query parser layers are:
+ *
+ *
+ * - {@link org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser}
+ *
- This layer is the text parsing layer which simply transforms the query text string into a
+ * {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} tree. Every text parser
+ * must implement the interface {@link
+ * org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser}. The default
+ * implementation is {@link
+ * org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser}.
+ *
- {@link org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor}
+ *
- The query node processor does most of the work: it contains a chain of {@linkplain
+ * org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor query node
+ * processors}. Each processor can walk the tree and modify nodes or even the tree's
+ * structure. This allows for query optimization before the node tree is converted to an
+ * actual query.
+ *
- {@link org.apache.lucene.queryparser.flexible.core.builders.QueryBuilder}
+ *
- The third layer is a configurable map of builders, which map {@linkplain
+ * org.apache.lucene.queryparser.flexible.core.nodes.QueryNode query nodes} to their adapters
+ * that convert each node into a {@link org.apache.lucene.search.Query}.
+ *
*/
package org.apache.lucene.queryparser.flexible.standard;
diff --git a/lucene/queryparser/src/java/overview.html b/lucene/queryparser/src/java/overview.html
index 2b6f8a446afb..a7c579dd836f 100644
--- a/lucene/queryparser/src/java/overview.html
+++ b/lucene/queryparser/src/java/overview.html
@@ -27,16 +27,16 @@ Apache Lucene QueryParsers.
This module provides a number of query parsers:
- - {@linkplain org.apache.lucene.queryparser.flexible flexible query parser}
+
- {@linkplain org.apache.lucene.queryparser.flexible.standard flexible query parser}
- {@linkplain org.apache.lucene.queryparser.classic classic query parser}
- {@linkplain org.apache.lucene.queryparser.complexPhrase complex phrase query parser}
- {@linkplain org.apache.lucene.queryparser.ext extendable query parser}
-
- {@linkplain org.apache.lucene.queryparser.surround surround query parser (span queries)}
+
- {@linkplain org.apache.lucene.queryparser.surround.parser surround query parser (span queries)}
- {@linkplain org.apache.lucene.queryparser.xml query parser building Query objects from XML}
- If you're new to query parsers, the {@linkplain org.apache.lucene.queryparser.flexible flexible query parser}'s
+ If you're new to query parsers, the {@linkplain org.apache.lucene.queryparser.flexible.standard flexible query parser}'s
{@link org.apache.lucene.queryparser.flexible.standard.StandardQueryParser} is probably a good place to start.