Merge branch 'main' into production
diff --git a/content/pages/core/corenews.md b/content/pages/core/corenews.md
index 7305b8f..878535c 100644
--- a/content/pages/core/corenews.md
+++ b/content/pages/core/corenews.md
@@ -1,4 +1,4 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Core News
+Title: Lucene™ Core News
URL: core/corenews.html
save_as: core/corenews.html
template: lucene/core/news
diff --git a/content/pages/core/developer.md b/content/pages/core/developer.md
index 807e5ae..4d6b3ed 100644
--- a/content/pages/core/developer.md
+++ b/content/pages/core/developer.md
@@ -1,4 +1,4 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Dev
+Title: Lucene™ Dev
URL: core/developer.html
save_as: core/developer.html
theme: lucene-core
diff --git a/content/pages/core/discussion.md b/content/pages/core/discussion.md
index 6c9d7fc..e24ee5a 100644
--- a/content/pages/core/discussion.md
+++ b/content/pages/core/discussion.md
@@ -1,4 +1,4 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Mailing Lists and IRC
+Title: Lucene™ Mailing Lists and IRC
URL: core/discussion.html
save_as: core/discussion.html
template: lucene/core/page
diff --git a/content/pages/core/documentation.md b/content/pages/core/documentation.md
index 66f2b19..ce6e80e 100644
--- a/content/pages/core/documentation.md
+++ b/content/pages/core/documentation.md
@@ -1,4 +1,4 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Release Docs
+Title: Lucene™ Release Docs
URL: core/documentation.html
save_as: core/documentation.html
template: lucene/core/documentation
diff --git a/content/pages/core/downloads.md b/content/pages/core/downloads.md
index 47ebc41..6a77001 100644
--- a/content/pages/core/downloads.md
+++ b/content/pages/core/downloads.md
@@ -1,4 +1,4 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Downloads
+Title: Lucene™ Downloads
URL: core/downloads.html
save_as: core/downloads.html
template: lucene/core/downloads
diff --git a/content/pages/core/features.md b/content/pages/core/features.md
index 31fc81b..5084022 100644
--- a/content/pages/core/features.md
+++ b/content/pages/core/features.md
@@ -1,4 +1,4 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Features
+Title: Lucene™ Features
URL: core/features.html
save_as: core/features.html
template: lucene/core/page
@@ -29,4 +29,4 @@
* Available as Open Source software under the [Apache License](https://www.apache.org/licenses/LICENSE-2.0.html) which lets you use Lucene in both commercial and Open Source programs
* 100%-pure Java
-* Implementations in [other programming languages available](https://cwiki.apache.org/confluence/display/lucene/LuceneImplementations) that are index-compatible
\ No newline at end of file
+* Implementations in [other programming languages available](https://cwiki.apache.org/confluence/display/lucene/LuceneImplementations) that are index-compatible
diff --git a/content/pages/core/index.md b/content/pages/core/index.md
index b398539..92c7643 100644
--- a/content/pages/core/index.md
+++ b/content/pages/core/index.md
@@ -4,7 +4,7 @@
theme: lucene-core
template: lucene/core/page
-Apache Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> is a
+Apache Lucene™ is a
high-performance, full-featured text search engine library written entirely in Java.
It is a technology suitable for nearly any application that requires full-text search,
especially cross-platform.
@@ -12,7 +12,7 @@
Apache Lucene is an open source project available for free download. Please use the
links on the right to access Lucene.
-# Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Features
+# Lucene™ Features
Lucene offers powerful features through a simple API:
diff --git a/content/pages/core/quickstart.md b/content/pages/core/quickstart.md
index ff6ca81..d45bc58 100644
--- a/content/pages/core/quickstart.md
+++ b/content/pages/core/quickstart.md
@@ -1,4 +1,4 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Tutorials
+Title: Lucene™ Tutorials
URL: core/quickstart.html
save_as: core/quickstart.html
template: lucene/core/quickstart
diff --git a/content/pages/core/systemreqs.md b/content/pages/core/systemreqs.md
index c69d72b..ac58703 100644
--- a/content/pages/core/systemreqs.md
+++ b/content/pages/core/systemreqs.md
@@ -1,4 +1,4 @@
-Title: Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> System Requirements
+Title: Lucene™ System Requirements
URL: core/systemreqs.html
save_as: core/systemreqs.html
template: lucene/core/systemreqs
diff --git a/content/pages/openrelevance/index.md b/content/pages/openrelevance/index.md
index 27e291c..0472fc9 100644
--- a/content/pages/openrelevance/index.md
+++ b/content/pages/openrelevance/index.md
@@ -4,15 +4,12 @@
template: lucene/openrelevance/index
The Open Relevance Project (ORP) was a small Apache
-Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> sub-project
+Lucene™ sub-project
aimed at making materials for doing relevance testing for Information Retrieval (IR),
Machine Learning and Natural Language Processing (NLP) into open source.
Our initial focus was on creating collections, judgments, queries and tools for the
-Lucene ecosystem of projects (Lucene Java,
-Solr<span style="vertical-align: super; font-size: xx-small">TM</span>,
-Nutch<span style="vertical-align: super; font-size: xx-small">TM</span>,
-Mahout<span style="vertical-align: super; font-size: xx-small">TM</span>, etc.)
+Lucene ecosystem of projects (Lucene Java, Solr™, Nutch™, Mahout™, etc.)
that can be used to judge relevance in a free, repeatable manner.
<span style="color: red; font-weight: bold">The Apache Lucene Project Management Committee decided in a vote,
diff --git a/content/pages/pylucene/features.md b/content/pages/pylucene/features.md
index 497a9e4..2253f46 100644
--- a/content/pages/pylucene/features.md
+++ b/content/pages/pylucene/features.md
@@ -22,7 +22,7 @@
## API documentation
PyLucene is closely tracking Java
-Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> releases.
+Lucene™ releases.
It intends to supports the entire Lucene API.
diff --git a/content/pages/pylucene/index.md b/content/pages/pylucene/index.md
index e4cd27d..5264c61 100644
--- a/content/pages/pylucene/index.md
+++ b/content/pages/pylucene/index.md
@@ -6,8 +6,7 @@
## What is PyLucene ?
PyLucene is a [Python](https://www.python.org) extension for accessing Java
-[Lucene](https://lucene.apache.org/java/)
-<span style="vertical-align: super; font-size: xx-small">TM</span>. Its goal
+[Lucene](https://lucene.apache.org/java/)™. Its goal
is to allow you to use Lucene's text indexing and searching capabilities from
Python. It is API compatible with Java Lucene version 8.8.1 as of March 8th,
2021.
diff --git a/content/pages/pylucene/mailing-lists.md b/content/pages/pylucene/mailing-lists.md
index 5d343ee..3c861dd 100644
--- a/content/pages/pylucene/mailing-lists.md
+++ b/content/pages/pylucene/mailing-lists.md
@@ -5,7 +5,7 @@
## Users
-Historically, Lucene<span style="vertical-align: super; font-size: xx-small">TM</span>
+Historically, Lucene™
user issues or questions have almost always been best addressed on the Java Lucene
User mailing list. PyLucene users with general Lucene questions should consider
contacting the [Java Lucene User](https://lucene.apache.org/java/docs/mailinglists.html#Java%20User%20List)
diff --git a/content/pages/site-instructions.md b/content/pages/site-instructions.md
index 14bb39a..a54cee8 100644
--- a/content/pages/site-instructions.md
+++ b/content/pages/site-instructions.md
@@ -3,7 +3,7 @@
save_as: site-instructions.html
template: lucene/tlp/page
-## Editing Content on the Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> sites
+## Editing Content on the Lucene™ sites
The web site is hosted in its own git repository `lucene-site` (see [Github](https://github.com/apache/lucene-site/) and [Gitbox](https://gitbox.apache.org/repos/asf/lucene-site.git)).
diff --git a/content/pages/whoweare.md b/content/pages/whoweare.md
index 32d6d1d..7fa7ba5 100644
--- a/content/pages/whoweare.md
+++ b/content/pages/whoweare.md
@@ -3,7 +3,7 @@
save_as: whoweare.html
template: lucene/tlp/page
-## Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Committers
+## Lucene™ Committers
- *[Namgyu Kim](https://www.linkedin.com/in/danmuzi)* (namgyu@...)
- *[Ramkumar Aiyengar](https://www.linkedin.com/in/andyetitmoves)* (andyetitmoves@...)
- *Ahmet Arslan* (iorixxx@...)
