You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2023/10/29 22:36:24 UTC

(sis) 03/06: Replace "..." by .... Previous form was a wrong usage of HTML tag.

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit c586f3e5873ee9e54680e511d8e5ca6d2a9082bf
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sun Oct 29 15:20:37 2023 +0100

    Replace <cite>"..."</cite> by <q>...</q>.
    Previous form was a wrong usage of HTML <cite> tag.
---
 .../main/org/apache/sis/console/CommandRunner.java |  2 +-
 .../org/apache/sis/coverage/grid/GridGeometry.java |  2 +-
 .../org/apache/sis/feature/AbstractAttribute.java  |  2 +-
 .../apache/sis/feature/AbstractIdentifiedType.java |  8 ++--
 .../apache/sis/feature/DefaultAssociationRole.java |  2 +-
 .../apache/sis/feature/DefaultAttributeType.java   |  4 +-
 .../sis/feature/builder/AttributeTypeBuilder.java  |  4 +-
 .../apache/sis/feature/builder/TypeBuilder.java    |  6 +--
 .../main/org/apache/sis/image/Colorizer.java       |  4 +-
 .../apache/sis/metadata/internal/AxisNames.java    | 48 +++++++++----------
 .../apache/sis/metadata/internal/NameMeaning.java  |  2 +-
 .../sis/metadata/internal/ReferencingServices.java |  2 +-
 .../sis/metadata/iso/citation/Citations.java       | 12 ++---
 .../iso/constraint/DefaultConstraints.java         |  6 +--
 .../metadata/iso/distribution/DefaultFormat.java   |  2 +-
 .../iso/extent/DefaultGeographicBoundingBox.java   |  4 +-
 .../iso/extent/DefaultGeographicDescription.java   |  6 +--
 .../apache/sis/metadata/iso/extent/Extents.java    |  4 +-
 .../main/org/apache/sis/util/iso/Types.java        |  2 +-
 .../main/org/apache/sis/xml/bind/Context.java      |  2 +-
 .../test/org/apache/sis/metadata/TreeNodeTest.java |  6 +--
 .../sis/openoffice/ReferencingFunctions.java       |  4 +-
 .../org/apache/sis/openoffice/XReferencing.java    |  4 +-
 .../referencing/gazetteer/FinalLocationType.java   | 12 ++---
 .../gazetteer/ModifiableLocationType.java          | 12 ++---
 .../main/org/apache/sis/io/wkt/Convention.java     |  2 +-
 .../main/org/apache/sis/io/wkt/Formatter.java      |  4 +-
 .../org/apache/sis/io/wkt/MathTransformParser.java |  4 +-
 .../main/org/apache/sis/io/wkt/StoredTree.java     |  4 +-
 .../main/org/apache/sis/io/wkt/Transliterator.java | 30 ++++++------
 .../main/org/apache/sis/io/wkt/package-info.java   |  4 +-
 .../parameter/DefaultParameterDescriptorGroup.java |  4 +-
 .../sis/parameter/DefaultParameterValue.java       |  4 +-
 .../org/apache/sis/parameter/ParameterBuilder.java | 10 ++--
 .../org/apache/sis/parameter/TensorParameters.java |  2 +-
 .../sis/referencing/AbstractIdentifiedObject.java  | 12 ++---
 .../main/org/apache/sis/referencing/Builder.java   | 10 ++--
 .../main/org/apache/sis/referencing/CRS.java       |  6 +--
 .../main/org/apache/sis/referencing/CommonCRS.java |  6 +--
 .../apache/sis/referencing/IdentifiedObjects.java  |  4 +-
 .../apache/sis/referencing/NamedIdentifier.java    |  2 +-
 .../sis/referencing/crs/DefaultDerivedCRS.java     |  2 +-
 .../apache/sis/referencing/cs/AxesConvention.java  |  2 +-
 .../org/apache/sis/referencing/cs/AxisFilter.java  |  4 +-
 .../sis/referencing/cs/CoordinateSystems.java      | 12 ++---
 .../cs/DefaultCoordinateSystemAxis.java            | 16 +++----
 .../sis/referencing/cs/DirectionAlongMeridian.java |  8 ++--
 .../sis/referencing/datum/DatumShiftGrid.java      |  2 +-
 .../referencing/datum/DefaultGeodeticDatum.java    |  4 +-
 .../factory/CommonAuthorityFactory.java            |  4 +-
 .../factory/IdentifiedObjectFinder.java            |  2 +-
 .../referencing/factory/IdentifiedObjectSet.java   |  2 +-
 .../referencing/factory/sql/EPSGDataAccess.java    |  6 +--
 .../sis/referencing/factory/sql/package-info.java  |  4 +-
 .../sis/referencing/internal/DeprecatedCode.java   |  2 +-
 .../sis/referencing/internal/DeprecatedName.java   |  2 +-
 .../operation/CoordinateOperationContext.java      |  6 +--
 .../operation/CoordinateOperationRegistry.java     |  2 +-
 .../DefaultCoordinateOperationFactory.java         |  2 +-
 .../operation/LooselyDefinedMethod.java            | 12 ++---
 .../builder/LocalizationGridException.java         |  4 +-
 .../operation/builder/ProjectedTransformTry.java   |  2 +-
 .../sis/referencing/operation/matrix/Matrices.java |  2 +-
 .../operation/projection/AzimuthalEquidistant.java |  2 +-
 .../operation/projection/CassiniSoldner.java       |  8 ++--
 .../operation/projection/ConformalProjection.java  |  4 +-
 .../projection/LambertConicConformal.java          | 20 ++++----
 .../referencing/operation/projection/Mercator.java | 26 +++++------
 .../projection/ModifiedAzimuthalEquidistant.java   |  2 +-
 .../operation/projection/Mollweide.java            |  4 +-
 .../operation/projection/NormalizedProjection.java |  6 +--
 .../operation/projection/ObliqueMercator.java      | 10 ++--
 .../operation/projection/ObliqueStereographic.java |  8 ++--
 .../operation/projection/Orthographic.java         |  2 +-
 .../operation/projection/PolarStereographic.java   | 26 +++++------
 .../operation/projection/Polyconic.java            |  2 +-
 .../operation/projection/Sinusoidal.java           |  6 +--
 .../operation/projection/TransverseMercator.java   |  4 +-
 .../operation/projection/ZonedGridSystem.java      |  2 +-
 .../operation/projection/package-info.java         |  6 +--
 .../operation/provider/AbridgedMolodensky.java     |  6 +--
 .../operation/provider/AbstractProvider.java       |  2 +-
 .../operation/provider/AbstractStereographic.java  |  2 +-
 .../sis/referencing/operation/provider/Affine.java |  2 +-
 .../operation/provider/AlbersEqualArea.java        |  2 +-
 .../operation/provider/AxisOrderReversal.java      |  2 +-
 .../operation/provider/AxisOrderReversal3D.java    |  2 +-
 .../provider/AzimuthalEquidistantSpherical.java    |  2 +-
 .../operation/provider/CassiniSoldner.java         |  2 +-
 .../provider/CoordinateFrameRotation.java          |  2 +-
 .../provider/CoordinateFrameRotation2D.java        |  2 +-
 .../provider/CoordinateFrameRotation3D.java        |  2 +-
 .../operation/provider/Equirectangular.java        |  4 +-
 .../provider/FranceGeocentricInterpolation.java    | 10 ++--
 .../operation/provider/GeocentricToGeographic.java |  2 +-
 .../provider/GeocentricToTopocentric.java          |  2 +-
 .../operation/provider/GeocentricTranslation.java  |  2 +-
 .../provider/GeocentricTranslation2D.java          |  2 +-
 .../provider/GeocentricTranslation3D.java          |  2 +-
 .../operation/provider/Geographic2Dto3D.java       |  2 +-
 .../operation/provider/Geographic3Dto2D.java       |  2 +-
 .../provider/GeographicAndVerticalOffsets.java     |  6 +--
 .../operation/provider/GeographicOffsets.java      |  8 ++--
 .../operation/provider/GeographicOffsets2D.java    |  2 +-
 .../operation/provider/GeographicToGeocentric.java |  4 +-
 .../provider/GeographicToTopocentric.java          |  2 +-
 .../provider/HyperbolicCassiniSoldner.java         |  2 +-
 .../operation/provider/Interpolation1D.java        |  4 +-
 .../provider/LambertAzimuthalEqualArea.java        |  2 +-
 .../LambertAzimuthalEqualAreaSpherical.java        |  2 +-
 .../operation/provider/LambertConformal1SP.java    |  2 +-
 .../operation/provider/LambertConformal2SP.java    |  2 +-
 .../provider/LambertConformalBelgium.java          |  2 +-
 .../provider/LambertConformalMichigan.java         |  2 +-
 .../operation/provider/LambertConformalWest.java   |  6 +--
 .../provider/LambertCylindricalEqualArea.java      |  2 +-
 .../LambertCylindricalEqualAreaSpherical.java      |  2 +-
 .../operation/provider/LongitudeRotation.java      |  2 +-
 .../operation/provider/Mercator1SP.java            |  2 +-
 .../operation/provider/Mercator2SP.java            |  2 +-
 .../provider/MercatorAuxiliarySphere.java          |  2 +-
 .../operation/provider/MercatorSpherical.java      |  2 +-
 .../operation/provider/MillerCylindrical.java      |  2 +-
 .../provider/ModifiedAzimuthalEquidistant.java     |  2 +-
 .../referencing/operation/provider/Mollweide.java  |  2 +-
 .../referencing/operation/provider/Molodensky.java |  6 +--
 .../sis/referencing/operation/provider/NADCON.java |  6 +--
 .../sis/referencing/operation/provider/NTv1.java   |  2 +-
 .../sis/referencing/operation/provider/NTv2.java   |  4 +-
 .../operation/provider/ObliqueMercator.java        |  4 +-
 .../operation/provider/ObliqueMercatorCenter.java  |  4 +-
 .../provider/ObliqueMercatorTwoPoints.java         |  2 +-
 .../provider/ObliqueMercatorTwoPointsCenter.java   |  2 +-
 .../operation/provider/ObliqueStereographic.java   |  2 +-
 .../operation/provider/Orthographic.java           |  2 +-
 .../operation/provider/PolarStereographicA.java    |  4 +-
 .../operation/provider/PolarStereographicB.java    |  4 +-
 .../operation/provider/PolarStereographicC.java    |  2 +-
 .../provider/PolarStereographicNorth.java          |  2 +-
 .../provider/PolarStereographicSouth.java          |  2 +-
 .../referencing/operation/provider/Polyconic.java  |  2 +-
 .../operation/provider/PositionVector7Param.java   |  2 +-
 .../operation/provider/PositionVector7Param2D.java |  2 +-
 .../operation/provider/PositionVector7Param3D.java |  2 +-
 .../operation/provider/PseudoMercator.java         |  2 +-
 .../operation/provider/PseudoPlateCarree.java      |  2 +-
 .../operation/provider/PseudoSinusoidal.java       |  2 +-
 .../operation/provider/RegionalMercator.java       |  2 +-
 .../operation/provider/SatelliteTracking.java      |  2 +-
 .../referencing/operation/provider/Sinusoidal.java |  2 +-
 .../operation/provider/TransverseMercator.java     |  4 +-
 .../provider/TransverseMercatorSouth.java          |  2 +-
 .../operation/provider/VerticalOffset.java         |  4 +-
 .../provider/ZonedTransverseMercator.java          |  2 +-
 .../operation/transform/ContextualParameters.java  |  2 +-
 .../transform/DefaultMathTransformFactory.java     | 14 +++---
 .../transform/InterpolatedGeocentricTransform.java |  8 ++--
 .../operation/transform/InterpolatedTransform.java |  2 +-
 .../operation/transform/MolodenskyTransform.java   |  2 +-
 .../sis/referencing/util/AxisDirections.java       |  4 +-
 .../sis/referencing/util/CoordinateOperations.java |  2 +-
 .../sis/referencing/util/DefinitionVerifier.java   |  8 ++--
 .../org/apache/sis/referencing/util/Formulas.java  |  4 +-
 .../referencing/util/GeodeticObjectBuilder.java    |  8 ++--
 .../sis/referencing/util/ReferencingUtilities.java | 10 ++--
 .../org/apache/sis/referencing/util/j2d/Tile.java  | 12 ++---
 .../referencing/CC_GeneralOperationParameter.java  |  4 +-
 .../org/apache/sis/io/wkt/ComparisonWithEPSG.java  |  6 +--
 .../sis/io/wkt/GeodeticObjectParserTest.java       |  4 +-
 .../test/org/apache/sis/io/wkt/WKTParserTest.java  |  2 +-
 .../apache/sis/parameter/ParameterBuilderTest.java |  2 +-
 .../org/apache/sis/referencing/BuilderTest.java    |  2 +-
 .../sis/referencing/crs/DefaultDerivedCRSTest.java |  4 +-
 .../referencing/crs/DefaultProjectedCRSTest.java   |  2 +-
 .../apache/sis/referencing/cs/HardCodedAxes.java   | 54 +++++++++++-----------
 .../operation/CoordinateOperationFinderTest.java   |  4 +-
 .../operation/CoordinateOperationRegistryTest.java | 20 ++++----
 .../DefaultCoordinateOperationFactoryTest.java     |  2 +-
 .../operation/projection/CassiniSoldnerTest.java   |  4 +-
 .../projection/LambertConicConformalTest.java      | 12 ++---
 .../operation/projection/MercatorTest.java         | 22 ++++-----
 .../ModifiedAzimuthalEquidistantTest.java          |  2 +-
 .../operation/projection/ObliqueMercatorTest.java  |  2 +-
 .../operation/projection/OrthographicTest.java     |  2 +-
 .../projection/PolarStereographicTest.java         |  2 +-
 .../provider/CoordinateFrameRotationTest.java      |  4 +-
 .../FranceGeocentricInterpolationTest.java         |  2 +-
 .../provider/GeocentricTranslationTest.java        |  6 +--
 .../operation/provider/GeographicOffsetsTest.java  |  4 +-
 .../provider/PositionVector7ParamTest.java         |  4 +-
 .../operation/provider/SeismicBinGridMock.java     |  4 +-
 .../operation/transform/CopyTransformTest.java     |  2 +-
 .../transform/EllipsoidToCentricTransformTest.java |  4 +-
 .../InterpolatedGeocentricTransformTest.java       |  2 +-
 .../transform/InterpolatedTransformTest.java       |  4 +-
 .../transform/MolodenskyTransformTest.java         |  4 +-
 .../operation/transform/ScaleTransformTest.java    |  2 +-
 .../org/apache/sis/storage/netcdf/base/Axis.java   |  4 +-
 .../apache/sis/storage/netcdf/base/CRSBuilder.java | 12 ++---
 .../apache/sis/storage/netcdf/base/Convention.java |  6 +--
 .../apache/sis/storage/netcdf/base/Decoder.java    |  2 +-
 .../org/apache/sis/storage/netcdf/base/Grid.java   |  4 +-
 .../apache/sis/storage/netcdf/base/Variable.java   |  2 +-
 .../sis/storage/netcdf/base/package-info.java      | 10 ++--
 .../sis/storage/netcdf/classic/ChannelDecoder.java |  2 +-
 .../sis/storage/netcdf/classic/GridInfo.java       |  2 +-
 .../sis/storage/netcdf/classic/VariableInfo.java   |  4 +-
 .../apache/sis/storage/netcdf/package-info.java    | 10 ++--
 .../sis/storage/netcdf/ucar/DecoderWrapper.java    |  2 +-
 .../sis/storage/netcdf/ucar/GridWrapper.java       |  2 +-
 .../org/apache/sis/storage/DataStoreProvider.java  |  4 +-
 .../main/org/apache/sis/storage/Resource.java      |  2 +-
 .../org/apache/sis/storage/StorageConnector.java   |  2 +-
 .../org/apache/sis/storage/image/FormatFinder.java |  2 +-
 .../main/org/apache/sis/storage/xml/Store.java     |  2 +-
 .../main/org/apache/sis/io/AppendableWriter.java   |  2 +-
 .../main/org/apache/sis/io/Appender.java           |  2 +-
 .../main/org/apache/sis/io/IO.java                 |  2 +-
 .../main/org/apache/sis/io/TableAppender.java      |  2 +-
 .../main/org/apache/sis/io/TabularFormat.java      |  4 +-
 .../main/org/apache/sis/measure/package-info.java  |  6 +--
 .../main/org/apache/sis/setup/About.java           |  2 +-
 .../sis/util/AbstractInternationalString.java      |  2 +-
 .../main/org/apache/sis/util/CharSequences.java    |  6 +--
 .../main/org/apache/sis/util/ComparisonMode.java   |  4 +-
 .../main/org/apache/sis/util/Debug.java            |  2 +-
 .../org/apache/sis/util/LenientComparable.java     |  4 +-
 .../main/org/apache/sis/util/Numbers.java          |  4 +-
 .../main/org/apache/sis/util/ObjectConverter.java  |  2 +-
 .../main/org/apache/sis/util/StringBuilders.java   |  2 +-
 .../org/apache/sis/util/collection/Containers.java |  2 +-
 .../apache/sis/util/collection/TableColumn.java    | 16 +++----
 .../sis/util/collection/TreeTableFormat.java       |  4 +-
 .../org/apache/sis/util/internal/Constants.java    |  2 +-
 .../org/apache/sis/util/internal/DoubleDouble.java |  2 +-
 .../sis/util/internal/LocalizedParseException.java |  4 +-
 .../org/apache/sis/measure/UnitFormatTest.java     |  2 +-
 .../gui/referencing/RecentReferenceSystems.java    |  4 +-
 .../main/org/apache/sis/gui/setup/Wizard.java      |  2 +-
 239 files changed, 570 insertions(+), 570 deletions(-)

diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java
index 8b771a8f66..d2c2424916 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java
@@ -303,7 +303,7 @@ abstract class CommandRunner {
     }
 
     /**
-     * Prints the <cite>"Cannot open …"</cite> error message followed by the message in the given exception.
+     * Prints the <q>Cannot open …</q> error message followed by the message in the given exception.
      *
      * @param fileIndex  index in the {@link #files} list of the file that cannot be opened.
      * @param e          the exception which occurred.
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java
index b77e437c60..bfbee84f27 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java
@@ -165,7 +165,7 @@ public class GridGeometry implements LenientComparable, Serializable {
     public static final int EXTENT = 4;
 
     /**
-     * A bitmask to specify the validity of the <cite>"grid to CRS"</cite> transform.
+     * A bitmask to specify the validity of the <q>grid to CRS</q> transform.
      *
      * @see #isDefined(int)
      * @see #getGridToCRS(PixelInCell)
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractAttribute.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractAttribute.java
index 947537e064..72ca6bea54 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractAttribute.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractAttribute.java
@@ -270,7 +270,7 @@ public abstract class AbstractAttribute<V> extends Field<V> implements Attribute
     /**
      * Other attributes that describes this attribute. For example if this attribute carries a measurement,
      * then a characteristic of this attribute could be the measurement accuracy.
-     * See <cite>"Attribute characterization"</cite> in {@link DefaultAttributeType} Javadoc for more information.
+     * See <q>Attribute characterization</q> in {@link DefaultAttributeType} Javadoc for more information.
      *
      * <p>The map returned by this method contains only the characteristics explicitly defined for this attribute.
      * If the map contains no characteristic for a given name, a {@linkplain DefaultAttributeType#getDefaultValue()
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractIdentifiedType.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractIdentifiedType.java
index cd885c959b..c78128d2bd 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractIdentifiedType.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractIdentifiedType.java
@@ -91,7 +91,7 @@ public class AbstractIdentifiedType implements IdentifiedType, Deprecable, Seria
      * This is used for setting the value to be returned by {@link #isDeprecated()}.
      *
      * <p>If this property is set to {@code true}, then the value associated to {@link #DESCRIPTION_KEY}
-     * should give the replacement (e.g. <cite>"superceded by …"</cite>).</p>
+     * should give the replacement (e.g. <q>superceded by …</q>).</p>
      *
      * @see #isDeprecated()
      *
@@ -294,7 +294,7 @@ public class AbstractIdentifiedType implements IdentifiedType, Deprecable, Seria
      * The description may assist in understanding the element scope and application.
      *
      * <p>If this type {@linkplain #isDeprecated() is deprecated}, then the description should give
-     * indication about the replacement (e.g. <cite>"superceded by …"</cite>).</p>
+     * indication about the replacement (e.g. <q>superceded by …</q>).</p>
      *
      * @return information beyond that required for concise definition of the element, or {@code null} if none.
      */
@@ -310,7 +310,7 @@ public class AbstractIdentifiedType implements IdentifiedType, Deprecable, Seria
      * <ul>
      *   <li>If this type {@linkplain #isDeprecated() is deprecated}, returns the
      *       {@linkplain #getDescription() description}. The description of deprecated types
-     *       should give indication about the replacement (e.g. <cite>"superceded by …"</cite>).</li>
+     *       should give indication about the replacement (e.g. <q>superceded by …</q>).</li>
      *   <li>Otherwise returns {@code null} since remarks are not part of the ISO 19109 feature model.</li>
      * </ul>
      *
@@ -326,7 +326,7 @@ public class AbstractIdentifiedType implements IdentifiedType, Deprecable, Seria
     /**
      * Returns {@code true} if this type is deprecated.
      * If this method returns {@code true}, then the {@linkplain #getRemarks() remarks} should give
-     * indication about the replacement (e.g. <cite>"superceded by …"</cite>).
+     * indication about the replacement (e.g. <q>superceded by …</q>).
      *
      * @return whether this type is deprecated.
      *
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
index 3825a51287..b1ca3058a8 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
@@ -163,7 +163,7 @@ public class DefaultAssociationRole extends FieldType implements FeatureAssociat
      *     );
      *     }
      *
-     * After the above code completed, the {@linkplain #getValueType() value type} of <cite>"association to B"</cite>
+     * After the above code completed, the {@linkplain #getValueType() value type} of <q>association to B</q>
      * has been automatically set to the {@code typeB} instance.
      *
      * Callers shall make sure that the feature types graph will not contain more than one feature of the given name.
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAttributeType.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAttributeType.java
index 7902d3fa0a..f9ad90b018 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAttributeType.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAttributeType.java
@@ -180,7 +180,7 @@ public class DefaultAttributeType<V> extends FieldType implements AttributeType<
      * @param characterizedBy  other attribute types that describes this attribute type (can be {@code null} for none).
      *                         For example if this new {@code DefaultAttributeType} describes a measurement,
      *                         then {@code characterizedBy} could holds the measurement accuracy.
-     *                         See <cite>"Attribute characterization"</cite> in class Javadoc for more information.
+     *                         See <q>Attribute characterization</q> in class Javadoc for more information.
      *
      * @see org.apache.sis.feature.builder.AttributeTypeBuilder
      */
@@ -299,7 +299,7 @@ public class DefaultAttributeType<V> extends FieldType implements AttributeType<
      * The characteristics are enumerated in the {@linkplain Map#values() map values}.
      * The {@linkplain Map#keySet() map keys} are the {@code String} representations
      * of characteristics {@linkplain #getName() name}, for more convenient lookups.
-     * See <cite>"Attribute characterization"</cite> in class Javadoc for more information.
+     * See <q>Attribute characterization</q> in class Javadoc for more information.
      *
      * <h4>Example</h4>
      * An attribute that carries a measurement (e.g. air temperature) may have another attribute that holds the
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/AttributeTypeBuilder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/AttributeTypeBuilder.java
index 3e5920b601..87c5a52d9d 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/AttributeTypeBuilder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/AttributeTypeBuilder.java
@@ -492,7 +492,7 @@ public final class AttributeTypeBuilder<V> extends PropertyTypeBuilder {
 
     /**
      * Adds another attribute type that describes this attribute type.
-     * See <cite>"Attribute characterization"</cite> in {@link DefaultAttributeType} Javadoc for more information.
+     * See <q>Attribute characterization</q> in {@link DefaultAttributeType} Javadoc for more information.
      *
      * <h4>Usage example</h4>
      * {@snippet lang="java" :
@@ -518,7 +518,7 @@ public final class AttributeTypeBuilder<V> extends PropertyTypeBuilder {
 
     /**
      * Adds another attribute type that describes this attribute type, using an existing one as a template.
-     * See <cite>"Attribute characterization"</cite> in {@link DefaultAttributeType} Javadoc for more information.
+     * See <q>Attribute characterization</q> in {@link DefaultAttributeType} Javadoc for more information.
      *
      * @param  <C>       the compile-time type of values in the {@code template} argument.
      * @param  template  an existing attribute type to use as a template.
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/TypeBuilder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/TypeBuilder.java
index 91733ca9df..40f6ad6f3c 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/TypeBuilder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/TypeBuilder.java
@@ -370,7 +370,7 @@ public abstract class TypeBuilder implements Localized {
      * Sets optional information beyond that required for concise definition of the element.
      * The description may assist in understanding the feature scope and application.
      * If the type {@linkplain #isDeprecated() is deprecated}, then the description should
-     * give indication about the replacement (e.g. <cite>"superceded by …"</cite>).
+     * give indication about the replacement (e.g. <q>superceded by …</q>).
      *
      * @param  description  information beyond that required for concise definition of the element, or {@code null} if none.
      * @return {@code this} for allowing method calls chaining.
@@ -388,7 +388,7 @@ public abstract class TypeBuilder implements Localized {
     /**
      * Returns {@code true} if the type is deprecated.
      * If this method returns {@code true}, then the {@linkplain #getDescription() description} should give
-     * indication about the replacement (e.g. <cite>"superceded by …"</cite>).
+     * indication about the replacement (e.g. <q>superceded by …</q>).
      *
      * @return whether this type is deprecated.
      *
@@ -401,7 +401,7 @@ public abstract class TypeBuilder implements Localized {
     /**
      * Sets whether the type is deprecated.
      * If the type is deprecated, then the {@linkplain #setDescription(CharSequence) description}
-     * should be set to an indication about the replacement (e.g. <cite>"superceded by …"</cite>).
+     * should be set to an indication about the replacement (e.g. <q>superceded by …</q>).
      *
      * @param  deprecated  whether this type is deprecated.
      * @return {@code this} for allowing method calls chaining.
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Colorizer.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Colorizer.java
index 64f9525349..196223c66a 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Colorizer.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Colorizer.java
@@ -248,8 +248,8 @@ public interface Colorizer extends Function<Colorizer.Target, Optional<ColorMode
      * colors to predefined ranges of pixel values, it maps colors to {@linkplain Category#getName() category names},
      * {@linkplain org.apache.sis.measure.MeasurementRange#unit() units of measurement} or other properties.
      * The given function provides a way to colorize images without knowing in advance the numerical values of pixels.
-     * For example, instead of specifying <cite>"pixel value 0 is blue, 1 is green, 2 is yellow"</cite>,
-     * the given function allows to specify <cite>"Lakes are blue, Forests are green, Sand is yellow"</cite>.
+     * For example, instead of specifying <q>pixel value 0 is blue, 1 is green, 2 is yellow</q>,
+     * the given function allows to specify <q>Lakes are blue, Forests are green, Sand is yellow</q>.
      *
      * <h4>Default colors</h4>
      * The given function can return {@code null} or empty color arrays for some categories.
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/AxisNames.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/AxisNames.java
index a17fd0568f..7e559ab9d0 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/AxisNames.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/AxisNames.java
@@ -33,43 +33,43 @@ import static java.util.logging.Logger.getLogger;
  */
 public final class AxisNames {
     /**
-     * The ISO 19162 <cite>"Longitude"</cite> name.
+     * The ISO 19162 <q>Longitude</q> name.
      */
     public static final String LONGITUDE = "Longitude";
 
     /**
-     * The ISO 19162 <cite>"Latitude"</cite> name.
+     * The ISO 19162 <q>Latitude</q> name.
      */
     public static final String LATITUDE = "Latitude";
 
     /**
-     * The ISO 19111 <cite>"geodetic longitude"</cite> name. Abbreviation is "λ" (lambda).
+     * The ISO 19111 <q>geodetic longitude</q> name. Abbreviation is "λ" (lambda).
      */
     public static final String GEODETIC_LONGITUDE = "Geodetic longitude";
 
     /**
-     * The ISO 19111 <cite>"geodetic latitude"</cite> name. Abbreviation is "φ" (phi).
+     * The ISO 19111 <q>geodetic latitude</q> name. Abbreviation is "φ" (phi).
      */
     public static final String GEODETIC_LATITUDE = "Geodetic latitude";
 
     /**
-     * The <cite>"planetodetic longitude"</cite> name used in astronomy.
+     * The <q>planetodetic longitude</q> name used in astronomy.
      */
     public static final String PLANETODETIC_LONGITUDE = "Planetodetic longitude";
 
     /**
-     * The <cite>"planetodetic latitude"</cite> name used in astronomy.
+     * The <q>planetodetic latitude</q> name used in astronomy.
      */
     public static final String PLANETODETIC_LATITUDE = "Planetodetic latitude";
 
     /**
-     * The ISO 19111 <cite>"spherical longitude"</cite> name, also called <cite>"azimuthal angle"</cite>.
+     * The ISO 19111 <q>spherical longitude</q> name, also called <q>azimuthal angle</q>.
      * Abbreviation used by SIS is "θ" (theta) for consistency with ISO 19111 and ISO 19162
      * <cite>Axis name and abbreviation</cite> section, but some other conventions use φ or Ω instead.
      * Direction in the EPSG database is "East", but "counterClockwise" may also be used.
      *
-     * <p>Axis name <cite>"Geocentric longitude"</cite> can also be used.
-     * In astronomy, <cite>"Planetocentric longitude"</cite> is sometimes used.</p>
+     * <p>Axis name <q>Geocentric longitude</q> can also be used.
+     * In astronomy, <q>Planetocentric longitude</q> is sometimes used.</p>
      *
      * @see <a href="https://en.wikipedia.org/wiki/Spherical_coordinate_system">Spherical coordinate system on Wikipedia</a>
      * @see <a href="https://mathworld.wolfram.com/SphericalCoordinates.html">Spherical coordinate system on MathWorld</a>
@@ -77,73 +77,73 @@ public final class AxisNames {
     public static final String SPHERICAL_LONGITUDE = "Spherical longitude";
 
     /**
-     * The ISO 19111 <cite>"spherical latitude"</cite> name, also called <cite>"polar (zenith) angle"</cite>.
+     * The ISO 19111 <q>spherical latitude</q> name, also called <q>polar (zenith) angle</q>.
      * Abbreviation used by SIS is "Ω" (omega) for consistency with ISO 19111
      * <cite>Axis name and abbreviation</cite> section, but some other conventions use θ, Ω or Ψ instead.
      * Direction in the EPSG database is "North", but the "Up" direction may also be used with a similar
      * axis named "elevation".
      *
-     * <p>Axis name <cite>"Geocentric latitude"</cite> can also be used.
-     * In astronomy, <cite>"Planetocentric latitude"</cite> is sometimes used.</p>
+     * <p>Axis name <q>Geocentric latitude</q> can also be used.
+     * In astronomy, <q>Planetocentric latitude</q> is sometimes used.</p>
      */
     public static final String SPHERICAL_LATITUDE = "Spherical latitude";
 
     /**
-     * The ISO 19111 <cite>"ellipsoidal height"</cite> name. Abbreviation is lower case <cite>"h"</cite>.
+     * The ISO 19111 <q>ellipsoidal height</q> name. Abbreviation is lower case <q>h</q>.
      */
     public static final String ELLIPSOIDAL_HEIGHT = "Ellipsoidal height";
 
     /**
-     * The ISO 19111 <cite>"gravity-related height"</cite> name. Abbreviation is upper case <cite>"H"</cite>.
+     * The ISO 19111 <q>gravity-related height</q> name. Abbreviation is upper case <q>H</q>.
      */
     public static final String GRAVITY_RELATED_HEIGHT = "Gravity-related height";
 
     /**
-     * The ISO 19111 <cite>"depth"</cite> name.
+     * The ISO 19111 <q>depth</q> name.
      */
     public static final String DEPTH = "Depth";
 
     /**
-     * The ISO 19111 <cite>"Geocentric X"</cite> name. Abbreviation is upper case <cite>"X"</cite>.
+     * The ISO 19111 <q>Geocentric X</q> name. Abbreviation is upper case <q>X</q>.
      */
     public static final String GEOCENTRIC_X = "Geocentric X";
 
     /**
-     * The ISO 19111 <cite>"Geocentric Y"</cite> name. Abbreviation is upper case <cite>"Y"</cite>.
+     * The ISO 19111 <q>Geocentric Y</q> name. Abbreviation is upper case <q>Y</q>.
      */
     public static final String GEOCENTRIC_Y = "Geocentric Y";
 
     /**
-     * The ISO 19111 <cite>"Geocentric Z"</cite> name. Abbreviation is upper case <cite>"Z"</cite>.
+     * The ISO 19111 <q>Geocentric Z</q> name. Abbreviation is upper case <q>Z</q>.
      */
     public static final String GEOCENTRIC_Z = "Geocentric Z";
 
     /**
-     * The ISO 19111 <cite>"geocentric radius"</cite> name. Abbreviation is lower case <cite>"r"</cite>
+     * The ISO 19111 <q>geocentric radius</q> name. Abbreviation is lower case <q>r</q>
      * for consistency with ISO 19111.
      *
-     * <div class="note"><b>Note:</b>Lower case <cite>"r"</cite> is also used for non-geocentric radius
+     * <div class="note"><b>Note:</b>Lower case <q>r</q> is also used for non-geocentric radius
      * or axes named "distance" with "awayFrom" direction.</div>
      */
     public static final String GEOCENTRIC_RADIUS = "Geocentric radius";
 
     /**
-     * The ISO 19111 <cite>"easting"</cite> name. Abbreviation is upper case <cite>"E"</cite>.
+     * The ISO 19111 <q>easting</q> name. Abbreviation is upper case <q>E</q>.
      */
     public static final String EASTING = "Easting";
 
     /**
-     * The ISO 19111 <cite>"westing"</cite> name. Abbreviation is upper case <cite>"W"</cite>.
+     * The ISO 19111 <q>westing</q> name. Abbreviation is upper case <q>W</q>.
      */
     public static final String WESTING = "Westing";
 
     /**
-     * The ISO 19111 <cite>"northing"</cite> name. Abbreviation is upper case <cite>"N"</cite>.
+     * The ISO 19111 <q>northing</q> name. Abbreviation is upper case <q>N</q>.
      */
     public static final String NORTHING = "Northing";
 
     /**
-     * The ISO 19111 <cite>"southing"</cite> name. Abbreviation is upper case <cite>"S"</cite>.
+     * The ISO 19111 <q>southing</q> name. Abbreviation is upper case <q>S</q>.
      */
     public static final String SOUTHING = "Southing";
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/NameMeaning.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/NameMeaning.java
index a5925e352f..c3e04cc161 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/NameMeaning.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/NameMeaning.java
@@ -101,7 +101,7 @@ public final class NameMeaning extends Static {
      * </ul>
      *
      * <b>Note on the case:</b>
-     * <cite>"Name type specification — definitions"</cite> (OGC 09-048) writes authorities in upper cases,
+     * <q>Name type specification — definitions</q> (OGC 09-048) writes authorities in upper cases,
      * while <a href="http://www.opengis.net/def/auth/">http://www.opengis.net/def/auth/</a> uses lower cases.
      * Apache SIS uses upper cases for now. The lower/upper case policy should be kept consistent with the policy
      * used by {@link org.apache.sis.referencing.factory.MultiAuthoritiesFactory} for its keys.
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ReferencingServices.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ReferencingServices.java
index b8ea92489e..cc0f7bf69f 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ReferencingServices.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ReferencingServices.java
@@ -39,7 +39,7 @@ import org.apache.sis.system.Modules;
 /**
  * Provides access to services defined in the {@code org.apache.sis.referencing} module.
  * This class also opportunistically defines some methods and constants related
- * to <cite>"referencing by coordinates"</cite> but needed by metadata.
+ * to <q>referencing by coordinates</q> but needed by metadata.
  *
  * @author  Martin Desruisseaux (Geomatys)
  */
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java
index 2280c074a2..bfcbf62017 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java
@@ -52,12 +52,12 @@ import org.apache.sis.metadata.iso.DefaultIdentifier;           // For javadoc
  * </ul>
  *
  * For example {@code "EPSG:4326"} is a widely-used identifier
- * for the <cite>“World Geodetic System (WGS) 1984”</cite> Coordinate Reference System (CRS).
+ * for the <cite>World Geodetic System (WGS) 1984</cite> Coordinate Reference System (CRS).
  * The {@code "4326"} part is the identifier {@linkplain DefaultIdentifier#getCode() code} and
  * the {@code "EPSG"} part is the identifier {@linkplain DefaultIdentifier#getCodeSpace() code space}.
  * The meaning of codes in that code space is controlled by an {@linkplain DefaultIdentifier#getAuthority() authority},
- * the <cite>“EPSG Geodetic Parameter Dataset”</cite>. The {@linkplain DefaultCitation#getCitedResponsibleParties() cited
- * responsible party} for the EPSG dataset is the <cite>“International Association of Oil &amp; Gas producers”</cite> (IOGP).
+ * the <cite>EPSG Geodetic Parameter Dataset</cite>. The {@linkplain DefaultCitation#getCitedResponsibleParties() cited
+ * responsible party} for the EPSG dataset is the <cite>International Association of Oil &amp; Gas producers</cite> (IOGP).
  *
  * <p>The constants defined in this class are typically values returned by:</p>
  * <ul>
@@ -142,11 +142,11 @@ public final class Citations extends Static {
      * EPSG is the default namespace of map projection method and parameter names in Apache SIS.
      *
      * <div class="note"><b>Historical note:</b>
-     * The EPSG acronym meaning was <cite>“European Petroleum Survey Group”</cite>.
+     * The EPSG acronym meaning was <cite>European Petroleum Survey Group</cite>.
      * But this meaning does not apply anymore since the European and American associations merged into
-     * the <cite>“Association of Oil &amp; Gas producers”</cite> (OGP), later renamed as IOGP.
+     * the <cite>Association of Oil &amp; Gas producers</cite> (OGP), later renamed as IOGP.
      * The legacy acronym now applies only to the database Coordinate Reference System definitions,
-     * known as <cite>“EPSG Geodetic Parameter Dataset”</cite>.</div>
+     * known as <cite>EPSG Geodetic Parameter Dataset</cite>.</div>
      *
      * The citation {@linkplain DefaultCitation#getCitedResponsibleParties() responsible party} is
      * the IOGP organization, but the {@linkplain IdentifierSpace#getName() namespace} is {@code "EPSG"}.
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
index 6f2ad67c62..1fc54b305b 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
@@ -81,7 +81,7 @@ public class DefaultConstraints extends ISOMetadata implements Constraints {
 
     /**
      * Limitation affecting the fitness for use of the resource.
-     * Example: <cite>"not to be used for navigation"</cite>.
+     * Example: <q>not to be used for navigation</q>.
      */
     @SuppressWarnings("serial")
     private Collection<InternationalString> useLimitations;
@@ -191,7 +191,7 @@ public class DefaultConstraints extends ISOMetadata implements Constraints {
 
     /**
      * Returns the limitation affecting the fitness for use of the resource.
-     * Example: <cite>"not to be used for navigation"</cite>.
+     * Example: <q>not to be used for navigation</q>.
      *
      * @return limitation affecting the fitness for use of the resource.
      */
@@ -203,7 +203,7 @@ public class DefaultConstraints extends ISOMetadata implements Constraints {
 
     /**
      * Sets the limitation affecting the fitness for use of the resource.
-     * Example: <cite>"not to be used for navigation"</cite>.
+     * Example: <q>not to be used for navigation</q>.
      *
      * @param  newValues  the new use limitations.
      */
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
index fcbbeda2b8..0ede0cd45a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
@@ -49,7 +49,7 @@ import org.apache.sis.metadata.iso.citation.DefaultCitation;
  * {@code       └─date………………………………………………………} Reference date for the cited resource.</div>
  *
  * Each {@code Format} instance should contain a {@linkplain #getFormatSpecificationCitation() reference
- * to the format specification}, for example <cite>"PNG (Portable Network Graphics) Specification"</cite>.
+ * to the format specification}, for example <q>PNG (Portable Network Graphics) Specification</q>.
  * The specification often has an abbreviation (for example "PNG") which can be stored as an
  * {@linkplain DefaultCitation#getAlternateTitles() alternate title}.
  *
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
index 0c03c23df9..92ea81f8c9 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
@@ -634,8 +634,8 @@ public class DefaultGeographicBoundingBox extends AbstractGeographicExtent imple
      * This class is stricter about NaN values than other classes like {@link org.apache.sis.geometry.GeneralEnvelope}.
      * The reason is that computations on {@code GeographicBoundingBox} instances are rare ({@code Envelope} instances
      * are preferred for this purpose). Usually, {@code GeographicBoundingBox} values come directly from some metadata
-     * structure. Consequently, NaN values in {@code GeographicBoundingBox} means <cite>"information is unknown"</cite>
-     * more often than <cite>"not yet calculated"</cite>.
+     * structure. Consequently, NaN values in {@code GeographicBoundingBox} means <q>information is unknown</q>
+     * more often than <q>not yet calculated</q>.
      *
      * @param  box  the geographic bounding box to add to this box.
      *
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java
index c0cbfe0609..46b05f40fe 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java
@@ -43,7 +43,7 @@ import org.apache.sis.util.iso.Types;
  *
  * <h2>Examples</h2>
  * A geographic area may be identified by the {@code 1731} code in the {@code EPSG} codespace.
- * The natural language description for {@code EPSG:1731} can be <cite>“France – mainland north of 48.15°N”</cite>.
+ * The natural language description for {@code EPSG:1731} can be <q>France – mainland north of 48.15°N</q>.
  *
  * <h2>Limitations</h2>
  * <ul>
@@ -91,7 +91,7 @@ public class DefaultGeographicDescription extends AbstractGeographicExtent imple
      *
      * <h4>Example</h4>
      * <code>new DefaultGeographicDescription({@link org.apache.sis.metadata.iso.citation.Citations#EPSG}, "1731")</code>
-     * can stand for <cite>“France – mainland north of 48.15°N”</cite>.
+     * can stand for <q>France – mainland north of 48.15°N</q>.
      *
      * @param authority  the authority of the identifier code, or {@code null} if none.
      * @param code       the identifier code used to represent a geographic area, or {@code null} if none.
@@ -185,7 +185,7 @@ public class DefaultGeographicDescription extends AbstractGeographicExtent imple
      * <ul>
      *   <li>the {@code "EPSG"} code space,</li>
      *   <li>the {@code "1731"} code, and</li>
-     *   <li>the <cite>“France – mainland north of 48.15°N”</cite> description.</li>
+     *   <li>the <q>France – mainland north of 48.15°N</q> description.</li>
      * </ul>
      *
      * @return the identifier used to represent a geographic area, or {@code null}.
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
index d3c913c0f0..73826f0565 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
@@ -387,8 +387,8 @@ public final class Extents extends Static {
      *   But this method is more useful if the returned ranges are close to a frequently used surface, like the
      *   Mean Sea Level. The same simplification is applied in the
      *   <a href="http://docs.opengeospatial.org/is/12-063r5/12-063r5.html#31">{@code VerticalExtent} element of
-     *   Well Known Text (WKT) format</a>, which specifies that <cite>“Vertical extent is an approximate description
-     *   of location; heights are relative to an unspecified mean sea level.”</cite></div></li>
+     *   Well Known Text (WKT) format</a>, which specifies that <q>Vertical extent is an approximate description
+     *   of location; heights are relative to an unspecified mean sea level.</q></div></li>
      *
      *   <li><p><b>Choice based on units of measurement</b><br>
      *   If, after the choice based on the vertical datum described above, there is still more than one vertical
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java
index 0d19f3ef5d..3a5f9d5a45 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java
@@ -74,7 +74,7 @@ import org.opengis.util.ControlledVocabulary;
  * </ul>
  *
  * <h2>Substituting a free text by a code list</h2>
- * The ISO standard allows to substitute some character strings in the <cite>"free text"</cite> domain
+ * The ISO standard allows to substitute some character strings in the <q>free text</q> domain
  * by a {@link CodeList} value. Such substitution can be done with:
  *
  * <ul>
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java
index af48f8dc0d..9f714f40f1 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java
@@ -403,7 +403,7 @@ public final class Context extends MarshalContext {
      * This method is static for the convenience of performing the check for null context.</div>
      *
      * @param  context        the current context, or {@code null} if none.
-     * @param  key            one of the value documented in the <cite>"Map key"</cite> column of
+     * @param  key            one of the value documented in the <q>Map key</q> column of
      *                        {@link org.apache.sis.xml.XML#SCHEMAS}.
      * @param  defaultSchema  the value to return if no schema is found for the given key.
      * @return the base URL of the schema, or an empty buffer if none were specified.
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeTest.java
index b06f3a8cdc..2f58894fc8 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeTest.java
@@ -145,7 +145,7 @@ public final class TreeNodeTest extends TestCase {
 
     /**
      * Tests {@link TreeNode#getName()} on a metadata with only one entry in collections.
-     * Those names shall <em>not</em> contain numbering like <cite>"(1 of 2)"</cite>.
+     * Those names shall <em>not</em> contain numbering like <q>(1 of 2)</q>.
      */
     @Test
     @DependsOnMethod("testRootNode")            // Because tested more basic methods than 'getValue(TableColumn)'.
@@ -162,7 +162,7 @@ public final class TreeNodeTest extends TestCase {
 
     /**
      * Tests {@link TreeNode#getName()} on a metadata with more than one entry in collections.
-     * Those names <em>shall</em> contain numbering like <cite>"(1 of 2)"</cite>.
+     * Those names <em>shall</em> contain numbering like <q>(1 of 2)</q>.
      */
     @Test
     @DependsOnMethod("testGetNameForSingleton")
@@ -235,7 +235,7 @@ public final class TreeNodeTest extends TestCase {
 
     /**
      * Tests {@link TreeNode#getIdentifier()} on a metadata with a hierarchy.
-     * Those names shall <em>not</em> contain numbering like <cite>"(1 of 2)"</cite>, even if the same
+     * Those names shall <em>not</em> contain numbering like <q>(1 of 2)</q>, even if the same
      * identifiers are repeated. Those identifiers are not intended to be unique in a list of children.
      * The repetition of the same identifier means that they shall be part of a collection.
      */
diff --git a/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java b/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
index 8450a53a09..d71fe23bda 100644
--- a/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
+++ b/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
@@ -273,8 +273,8 @@ public class ReferencingFunctions extends CalcAddins implements XReferencing {
 
     /**
      * Returns the axis name and units for the specified dimension in a coordinate reference system or coordinate system.
-     * This method returns a short axis name as used in Well Known Text (WKT) format, for example <cite>"Latitude"</cite>
-     * instead of <cite>"Geodetic latitude"</cite>.
+     * This method returns a short axis name as used in Well Known Text (WKT) format, for example <q>Latitude</q>
+     * instead of <q>Geodetic latitude</q>.
      *
      * @param  codeOrPath  the code allocated by an authority, or the path to a file.
      * @param  dimension   the dimension (1, 2, …).
diff --git a/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/XReferencing.java b/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/XReferencing.java
index c1957b5175..229b7e07c7 100644
--- a/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/XReferencing.java
+++ b/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/XReferencing.java
@@ -85,8 +85,8 @@ public interface XReferencing extends XInterface {
 
     /**
      * Returns the axis name and units for the specified dimension in a coordinate reference system or coordinate system.
-     * This method returns a short axis name as used in Well Known Text (WKT) format, for example <cite>"Latitude"</cite>
-     * instead of <cite>"Geodetic latitude"</cite>.
+     * This method returns a short axis name as used in Well Known Text (WKT) format, for example <q>Latitude</q>
+     * instead of <q>Geodetic latitude</q>.
      *
      * @param  codeOrPath  the code allocated by an authority, or the path to a file.
      * @param  dimension   the dimension (1, 2, …).
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/FinalLocationType.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/FinalLocationType.java
index 49a6ee5e87..44e799fcfd 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/FinalLocationType.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/FinalLocationType.java
@@ -238,11 +238,11 @@ final class FinalLocationType extends AbstractLocationType implements Serializab
      * Returns the property used as the defining characteristic of the location type.
      *
      * <h4>Examples</h4>
-     * <cite>“local administration”</cite> for administrative areas,
-     * <cite>“built environment”</cite> for towns or properties,
-     * <cite>“access”</cite> for streets,
-     * <cite>“electoral”</cite>,
-     * <cite>“postal”</cite>.
+     * <q>local administration</q> for administrative areas,
+     * <q>built environment</q> for towns or properties,
+     * <q>access</q> for streets,
+     * <q>electoral</q>,
+     * <q>postal</q>.
      *
      * @return property used as the defining characteristic of the location type.
      *
@@ -313,7 +313,7 @@ final class FinalLocationType extends AbstractLocationType implements Serializab
     /**
      * Returns the parent location types (location types of which this location type is a sub-division).
      * A location type can have more than one possible parent. For example, the parent of a location type named
-     * <cite>“street”</cite> could be <cite>“locality”</cite>, <cite>“town”</cite> or <cite>“administrative area”</cite>.
+     * <q>street</q> could be <q>locality</q>, <q>town</q> or <q>administrative area</q>.
      *
      * @return parent location types, or an empty collection if none.
      */
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
index fdc14257d3..9a10c6bf81 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
@@ -218,11 +218,11 @@ public class ModifiableLocationType extends AbstractLocationType {      // Not S
      * Sets the property used as the defining characteristic of the location type.
      *
      * <h4>Examples</h4>
-     * <cite>“local administration”</cite> for administrative areas,
-     * <cite>“built environment”</cite> for towns or properties,
-     * <cite>“access”</cite> for streets,
-     * <cite>“electoral”</cite>,
-     * <cite>“postal”</cite>.
+     * <q>local administration</q> for administrative areas,
+     * <q>built environment</q> for towns or properties,
+     * <q>access</q> for streets,
+     * <q>electoral</q>,
+     * <q>postal</q>.
      *
      * @param  value  the new theme, or {@code null} for inheriting a value from the parents.
      */
@@ -384,7 +384,7 @@ public class ModifiableLocationType extends AbstractLocationType {      // Not S
     /**
      * Returns the parent location types (location types of which this location type is a sub-division).
      * A location type can have more than one possible parent. For example, the parent of a location type named
-     * <cite>“street”</cite> could be <cite>“locality”</cite>, <cite>“town”</cite> or <cite>“administrative area”</cite>.
+     * <q>street</q> could be <q>locality</q>, <q>town</q> or <q>administrative area</q>.
      *
      * <p>The collection returned by this method is unmodifiable. For adding or removing a parent,
      * use {@link #addParent(ModifiableLocationType)} or {@link #removeParent(ModifiableLocationType)}.</p>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Convention.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Convention.java
index 7b563387b8..af42e146ae 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Convention.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Convention.java
@@ -157,7 +157,7 @@ public enum Convention {
      *   <li>The angular units of {@code PRIMEM} and {@code PARAMETER} elements are always degrees,
      *       no matter the units of the enclosing {@code GEOGCS} element.</li>
      *   <li>Unit names use American spelling instead of the international ones
-     *       (e.g. <cite>"meter"</cite> instead of <cite>"metre"</cite>).</li>
+     *       (e.g. <q>meter</q> instead of <q>metre</q>).</li>
      * </ul>
      */
     WKT1_COMMON_UNITS(true, true, true),
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
index 7da0b28d40..331581d591 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
@@ -494,9 +494,9 @@ public class Formatter implements Localized {
      * This is not necessarily the authority who created the object to format.
      *
      * <h4>Example</h4>
-     * The EPSG name of the {@code EPSG:6326} datum is <cite>"World Geodetic System 1984"</cite>.
+     * The EPSG name of the {@code EPSG:6326} datum is <q>World Geodetic System 1984</q>.
      * However if the preferred authority is OGC, then the formatted datum name will rather look like
-     * <cite>"WGS84"</cite> (the exact string depends on the object aliases).
+     * <q>WGS84</q> (the exact string depends on the object aliases).
      *
      * @return the authority for projection and parameter names.
      *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/MathTransformParser.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/MathTransformParser.java
index d58ec597f2..0fad72dcfb 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/MathTransformParser.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/MathTransformParser.java
@@ -211,9 +211,9 @@ class MathTransformParser extends AbstractParser {
      * Otherwise this method returns null.
      *
      * <h4>Standard compliance note</h4>
-     * This method is a slight departure of ISO 19162, which said <cite>"Should any attributes or values given
+     * This method is a slight departure of ISO 19162, which said <q>Should any attributes or values given
      * in the cited identifier be in conflict with attributes or values given explicitly in the WKT description,
-     * the WKT values shall prevail."</cite> But some units can hardly be expressed by the {@code UNIT} element,
+     * the WKT values shall prevail.</q> But some units can hardly be expressed by the {@code UNIT} element,
      * because the latter can contain only a conversion factor. For example, sexagesimal units (EPSG:9108, 9110
      * and 9111) can hardly be expressed in another way than by their EPSG code. Thankfully, identifiers in
      * {@code UNIT} elements are rare, so risk of conflicts should be low.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/StoredTree.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/StoredTree.java
index 0bf6557505..6d1d7f442a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/StoredTree.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/StoredTree.java
@@ -89,7 +89,7 @@ final class StoredTree implements Serializable {
 
         /**
          * Creates an anonymous node for an array of roots. This constructor is only for the corner
-         * case documented in <cite>"Multi roots"</cite> section of {@link StoredTree#root} javadoc.
+         * case documented in <q>Multi roots</q> section of {@link StoredTree#root} javadoc.
          *
          * @see StoredTree#StoredTree(List, Map)
          */
@@ -341,7 +341,7 @@ final class StoredTree implements Serializable {
 
     /**
      * Creates a new {@code StoredTree} with a snapshot of given trees of elements.
-     * This is for a corner case only; see <cite>"Multi roots"</cite> in {@link #root}.
+     * This is for a corner case only; see <q>Multi roots</q> in {@link #root}.
      *
      * @param  trees         roots of the trees of WKT elements.
      * @param  sharedValues  pool to use for sharing unique instances of values.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Transliterator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Transliterator.java
index a1b65b151e..a55e75e2f6 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Transliterator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Transliterator.java
@@ -82,8 +82,8 @@ import org.apache.sis.util.Characters;
  * is that φ is mapped to <var>U</var> and θ is mapped to <var>V</var>, regardless of their meaning.
  *
  * <h2>Replacement of names</h2>
- * The longitude and latitude axis names are explicitly fixed by ISO 19111:2007 to <cite>"Geodetic longitude"</cite>
- * and <cite>"Geodetic latitude"</cite>. But ISO 19162:2015 §7.5.3(ii) said that the <cite>"Geodetic"</cite> part in
+ * The longitude and latitude axis names are explicitly fixed by ISO 19111:2007 to <q>Geodetic longitude</q>
+ * and <q>Geodetic latitude</q>. But ISO 19162:2015 §7.5.3(ii) said that the <q>Geodetic</q> part in
  * those names shall be omitted at WKT formatting time.
  * The {@link #toShortAxisName toShortAxisName(…)} and {@link #toLongAxisName toLongAxisName(…)}
  * methods are responsible for doing the transliteration at formatting and parsing time, respectively.
@@ -121,7 +121,7 @@ public abstract class Transliterator implements Serializable {
             AxisDirection.GEOCENTRIC_Z, AxisNames.GEOCENTRIC_Z);
 
     /**
-     * A transliterator compliant with ISO 19162 on a <cite>"best effort"</cite> basis.
+     * A transliterator compliant with ISO 19162 on a <q>best effort</q> basis.
      * All methods perform the default implementation documented in this {@code Transliterator} class.
      */
     public static final Transliterator DEFAULT = new Default();
@@ -183,12 +183,12 @@ public abstract class Transliterator implements Serializable {
 
     /**
      * Returns the axis name to format in WKT, or {@code null} if none. This method performs the mapping
-     * between the names of axes in memory (designated by <cite>"long axis names"</cite> in this class)
-     * and the names to format in the WKT (designated by <cite>"short axis names"</cite>).
+     * between the names of axes in memory (designated by <q>long axis names</q> in this class)
+     * and the names to format in the WKT (designated by <q>short axis names</q>).
      *
      * <div class="note"><b>Note:</b>
-     * the <cite>"long axis names"</cite> are defined by ISO 19111 — <cite>referencing by coordinates</cite>
-     * while the <cite>"short axis names"</cite> are defined by ISO 19162 — <cite>Well-known text representation
+     * the <q>long axis names</q> are defined by ISO 19111 — <cite>referencing by coordinates</cite>
+     * while the <q>short axis names</q> are defined by ISO 19162 — <cite>Well-known text representation
      * of coordinate reference systems</cite>.</div>
      *
      * This method can return {@code null} if the name should be omitted.
@@ -196,8 +196,8 @@ public abstract class Transliterator implements Serializable {
      *
      * <p>The default implementation performs at least the following replacements:</p>
      * <ul>
-     *   <li>Replace <cite>“Geodetic latitude”</cite> (case insensitive) by <cite>“Latitude”</cite>.</li>
-     *   <li>Replace <cite>“Geodetic longitude”</cite> (case insensitive) by <cite>“Longitude”</cite>.</li>
+     *   <li>Replace <q>Geodetic latitude</q> (case insensitive) by <q>Latitude</q>.</li>
+     *   <li>Replace <q>Geodetic longitude</q> (case insensitive) by <q>Longitude</q>.</li>
      *   <li>Return {@code null} if the axis direction is {@link AxisDirection#GEOCENTRIC_X}, {@code GEOCENTRIC_Y}
      *       or {@code GEOCENTRIC_Z} and the name is the same than the axis direction (ignoring case).</li>
      * </ul>
@@ -241,18 +241,18 @@ public abstract class Transliterator implements Serializable {
      * This method is the converse of {@link #toShortAxisName(CoordinateSystem, AxisDirection, String)}.
      * The default implementation performs at least the following replacements:
      * <ul>
-     *   <li>Replace <cite>“Lat”</cite> or <cite>“Latitude”</cite>
-     *       (case insensitive) by <cite>“Geodetic latitude”</cite> or <cite>“Spherical latitude”</cite>,
+     *   <li>Replace <q>Lat</q> or <q>Latitude</q>
+     *       (case insensitive) by <q>Geodetic latitude</q> or <q>Spherical latitude</q>,
      *       depending on whether the axis is part of an ellipsoidal or spherical CS respectively.</li>
-     *   <li>Replace <cite>“Lon”</cite>, <cite>“Long”</cite> or <cite>“Longitude”</cite>
-     *       (case insensitive) by <cite>“Geodetic longitude”</cite> or <cite>“Spherical longitude”</cite>,
+     *   <li>Replace <q>Lon</q>, <q>Long</q> or <q>Longitude</q>
+     *       (case insensitive) by <q>Geodetic longitude</q> or <q>Spherical longitude</q>,
      *       depending on whether the axis is part of an ellipsoidal or spherical CS respectively.</li>
-     *   <li>Return <cite>“Geocentric X”</cite>, <cite>“Geocentric Y”</cite> and <cite>“Geocentric Z”</cite>
+     *   <li>Return <q>Geocentric X</q>, <q>Geocentric Y</q> and <q>Geocentric Z</q>
      *       for {@link AxisDirection#GEOCENTRIC_X}, {@link AxisDirection#GEOCENTRIC_Y GEOCENTRIC_Y}
      *       and {@link AxisDirection#GEOCENTRIC_Z GEOCENTRIC_Z} respectively in a Cartesian CS,
      *       if the given axis name is only an abbreviation.</li>
      *   <li>Use unique camel-case names for axis names defined by ISO 19111 and ISO 19162. For example, this method
-     *       replaces <cite>“<b>e</b>llipsoidal height”</cite> by <cite>“<b>E</b>llipsoidal height”</cite>.</li>
+     *       replaces <q><b>e</b>llipsoidal height</q> by <q><b>E</b>llipsoidal height</q>.</li>
      * </ul>
      *
      * <h4>Usage note</h4>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/package-info.java
index 934feec6a9..61d05c15c5 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/package-info.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/package-info.java
@@ -31,7 +31,7 @@
  *
  * <ul>
  *   <li>Format projection and parameters using the names of a chosen authority.
- *       For example, the <cite>"Mercator (variant A)"</cite> projection is named
+ *       For example, the <q>Mercator (variant A)</q> projection is named
  *       {@code "Mercator_1SP"} by OGC 01-009 and {@code "CT_Mercator"} by GeoTIFF.</li>
  *   <li>Format the elements with different quote characters or brackets style.
  *       For example, both {@code ID["EPSG",4326]} and {@code ID("EPSG",4326)} are legal WKT.</li>
@@ -71,7 +71,7 @@
  * The WKT of many Coordinate Reference System object can be viewed using the pattern below
  * (replace {@code 3395} by the EPSG code of the desired CRS):
  *
- * <blockquote><b>Example</b>: <cite>"WGS 84 / World Mercator"</cite>:
+ * <blockquote><b>Example</b>: <q>WGS 84 / World Mercator</q>:
  * <a href="https://epsg.org/crs/wkt/id/3395">https://epsg.org/crs/wkt/id/3395</a>
  * </blockquote>
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
index 1a6ab53354..1638b1082c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
@@ -174,8 +174,8 @@ public class DefaultParameterDescriptorGroup extends AbstractParameterDescriptor
      * operations that expect the same parameters than another operation, but perform a different process.
      *
      * <h4>Example</h4>
-     * The various <cite>"Coordinate Frame Rotation"</cite> variants (EPSG codes 1032, 1038 and 9607)
-     * expect the same parameters than their <cite>"Position Vector transformation"</cite> counterpart
+     * The various <q>Coordinate Frame Rotation</q> variants (EPSG codes 1032, 1038 and 9607)
+     * expect the same parameters than their <q>Position Vector transformation</q> counterpart
      * (EPSG codes 1033, 1037 and 9606) but perform the rotation in the opposite direction.
      *
      * @param properties  the properties to be given to the new parameter group.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java
index 0549d79cf4..c2de4c7c03 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java
@@ -955,9 +955,9 @@ convert:            if (componentType != null) {
      *
      * <h4>Example</h4>
      * The snippet below show WKT representations of the map projection parameters of a projected CRS
-     * (most other elements are omitted). The map projection uses a <cite>"Latitude of natural origin"</cite>
+     * (most other elements are omitted). The map projection uses a <q>Latitude of natural origin</q>
      * parameters which is set to 52 <strong>grads</strong>, as defined in the {@code UNIT[…]} element of the
-     * enclosing CRS. A similar rule applies to <cite>“False easting”</cite> and <cite>“False northing”</cite>
+     * enclosing CRS. A similar rule applies to <q>False easting</q> and <q>False northing</q>
      * parameters, which are in kilometres in this example.
      *
      * <p><b>WKT 1:</b></p>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterBuilder.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterBuilder.java
index 73c96fb29a..619449f3a0 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterBuilder.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterBuilder.java
@@ -58,11 +58,11 @@ import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
  * <h2>Usage example</h2>
  * Parameter descriptors are typically grouped in a {@link ParameterDescriptorGroup}.
  * All parameters usually have the same namespace, which can be declared only once.
- * The following example creates parameters for <cite>"Mercator (variant A)"</cite>
- * projection method (EPSG:9804), previously known as <cite>"Mercator (1SP)"</cite>,
+ * The following example creates parameters for <q>Mercator (variant A)</q>
+ * projection method (EPSG:9804), previously known as <q>Mercator (1SP)</q>,
  * centered by default on (0°,0°) with no scale factor and no false easting/northing.
  * The projection is valid from 80°S to 84°N and on all the longitude range (±180°).
- * In this example, the <cite>"Longitude of natural origin"</cite> parameter is giving different aliases
+ * In this example, the <q>Longitude of natural origin</q> parameter is giving different aliases
  * for illustrating the case of different software libraries or standards using different conventions.
  *
  * {@snippet lang="java" :
@@ -382,8 +382,8 @@ public class ParameterBuilder extends Builder<ParameterBuilder> {
      * for operations that expect the same parameters than another operation, but perform a different process.
      *
      * <h4>Example</h4>
-     * The various <cite>"Coordinate Frame Rotation"</cite> variants (EPSG codes 1032, 1038 and 9607)
-     * expect the same parameters than their <cite>"Position Vector transformation"</cite> counterpart
+     * The various <q>Coordinate Frame Rotation</q> variants (EPSG codes 1032, 1038 and 9607)
+     * expect the same parameters than their <q>Position Vector transformation</q> counterpart
      * (EPSG codes 1033, 1037 and 9606) but perform the rotation in the opposite direction.
      *
      * @param  parameters  the existing group from which to copy the parameters.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorParameters.java
index 93a22c1604..6939b03715 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorParameters.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorParameters.java
@@ -182,7 +182,7 @@ public class TensorParameters<E> implements Serializable {
      *
      * <h4>Relationship with EPSG</h4>
      * The above-cited group of parameters are close, but not identical, to the definitions provided
-     * by the <cite>"Affine parametric transformation"</cite> (EPSG:9624) operation method.
+     * by the <q>Affine parametric transformation</q> (EPSG:9624) operation method.
      * The differences are:
      *
      * <ul>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
index 037028c526..0d7b813902 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
@@ -80,9 +80,9 @@ import org.opengis.referencing.ObjectDomain;
 
 /**
  * Base class for objects identified by a name or a code. Those objects are typically
- * {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic datum}   (e.g. <cite>"World Geodetic System 1984"</cite>),
- * {@linkplain org.apache.sis.referencing.crs.AbstractCRS Coordinate Reference System} (e.g. <cite>"WGS 84 / World Mercator"</cite>) or
- * {@linkplain org.apache.sis.referencing.operation.DefaultConversion map projection}  (e.g. <cite>"Mercator (variant A)"</cite>).
+ * {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum geodetic datum}   (e.g. <q>World Geodetic System 1984</q>),
+ * {@linkplain org.apache.sis.referencing.crs.AbstractCRS Coordinate Reference System} (e.g. <q>WGS 84 / World Mercator</q>) or
+ * {@linkplain org.apache.sis.referencing.operation.DefaultConversion map projection}  (e.g. <q>Mercator (variant A)</q>).
  * Those names, or a code (e.g. {@code "EPSG:3395"}), can be used for fetching an object from a database.
  * However, it is not sufficient to know the object name. We also need to know who define that name
  * (the {@linkplain NamedIdentifier#getAuthority() authority}) since the same objects are often named differently
@@ -591,7 +591,7 @@ public class AbstractIdentifiedObject extends FormattableObject implements Ident
     /**
      * Returns comments on or information about this object, including data source information.
      * If this object {@linkplain #isDeprecated() is deprecated}, then the remarks should give
-     * indication about the replacement (e.g. <cite>"superceded by …"</cite>).
+     * indication about the replacement (e.g. <q>superceded by …</q>).
      *
      * @return the remarks, or {@code null} if none.
      */
@@ -605,7 +605,7 @@ public class AbstractIdentifiedObject extends FormattableObject implements Ident
      * Returns {@code true} if this object is deprecated. Deprecated objects exist in some
      * {@linkplain org.opengis.referencing.AuthorityFactory authority factories} like the EPSG database.
      * If this method returns {@code true}, then the {@linkplain #getRemarks() remarks} should give
-     * indication about the replacement (e.g. <cite>"superceded by …"</cite>).
+     * indication about the replacement (e.g. <q>superceded by …</q>).
      *
      * @return {@code true} if this object is deprecated.
      */
@@ -663,7 +663,7 @@ public class AbstractIdentifiedObject extends FormattableObject implements Ident
      *       This prefix appears in ESRI datum name (e.g. {@code "D_WGS_1984"}).</li>
      *   <li>{@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum#isHeuristicMatchForName(String)
      *       Comparisons of geodetic datum names} may ignore the prime meridian name, if any.
-     *       Example: <cite>"(Paris)"</cite> in <cite>"Nouvelle Triangulation Française (Paris)"</cite>.</li>
+     *       Example: <q>(Paris)</q> in <q>Nouvelle Triangulation Française (Paris)</q>.</li>
      * </ul>
      *
      * <h4>Future evolutions</h4>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Builder.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Builder.java
index b4ab262d15..abe67634e9 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Builder.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Builder.java
@@ -98,8 +98,8 @@ import static org.apache.sis.util.ArgumentChecks.*;
  * </ul>
  *
  * <h2>Example</h2>
- * The EPSG database defines a projection named <cite>"Mercator (variant A)"</cite> (EPSG:9804).
- * This projection was named <cite>"Mercator (1SP)"</cite> in older EPSG database versions.
+ * The EPSG database defines a projection named <q>Mercator (variant A)</q> (EPSG:9804).
+ * This projection was named <q>Mercator (1SP)</q> in older EPSG database versions.
  * The same projection was also named "{@code Mercator_1SP}" by OGC some specifications.
  * If we choose EPSG as our primary naming authority, then those three names can be declared as below:
  *
@@ -484,7 +484,7 @@ public abstract class Builder<B extends Builder<B>> {
      * If <code>{@linkplain #setDeprecated(boolean) setDeprecated}(true)</code> has been invoked, then this
      * method creates a deprecated alias with the current {@linkplain #setRemarks(CharSequence) remarks}.
      * The remark should suggest a replacement, for example with a sentence like
-     * <cite>"Superseded by {@literal <new-name>}"</cite>.
+     * <q>Superseded by {@literal <new-name>}</q>.
      *
      * <p>Note that deprecated names are always added as aliases, never as the primary name of an identified object.</p>
      *
@@ -510,7 +510,7 @@ public abstract class Builder<B extends Builder<B>> {
      * {@linkplain AbstractIdentifiedObject#getAlias() aliases} defined after the primary name.
      *
      * <h4>Example</h4>
-     * The <cite>"Longitude of natural origin"</cite> parameter defined by EPSG is named differently
+     * The <q>Longitude of natural origin</q> parameter defined by EPSG is named differently
      * by OGC and GeoTIFF. Those alternative names can be defined as below:
      *
      * {@snippet lang="java" :
@@ -624,7 +624,7 @@ public abstract class Builder<B extends Builder<B>> {
      * If <code>{@linkplain #setDeprecated(boolean) setDeprecated}(true)</code> has been invoked, then this
      * method creates a deprecated identifier with the current {@linkplain #setRemarks(CharSequence) remarks}.
      * The remark should suggest a replacement, for example with a sentence like
-     * <cite>"Superseded by {@literal <new-code>}"</cite>.
+     * <q>Superseded by {@literal <new-code>}</q>.
      *
      * <p><b>Lifetime:</b>
      * all identifiers are cleared after a {@code createXXX(…)} method has been invoked.</p>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
index 819133b88d..1dad08c7ac 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
@@ -198,7 +198,7 @@ public final class CRS extends Static {
      * For codes in above table, the EPSG geodetic database is used when available,
      * otherwise Apache SIS fallbacks on definitions from public sources with no EPSG metadata except the identifiers.
      * If the EPSG geodetic dataset has been used, the {@linkplain NamedIdentifier#getAuthority() authority} title
-     * will be something like <cite>"EPSG geodetic dataset"</cite>, otherwise it will be <cite>"Subset of EPSG"</cite>.
+     * will be something like <q>EPSG geodetic dataset</q>, otherwise it will be <q>Subset of EPSG</q>.
      *
      * <h4>URI forms</h4>
      * This method accepts also the URN and URL syntaxes.
@@ -372,8 +372,8 @@ public final class CRS extends Static {
      * In such cases, Apache SIS behavior in {@link #fromWKT(String)}, {@link #fromXML(String)} and other methods is
      * conform to the <a href="http://docs.opengeospatial.org/is/12-063r5/12-063r5.html">ISO 19162 specification</a>:
      *
-     * <blockquote><cite>"Should any attributes or values given in the cited identifier be in conflict with attributes
-     * or values given explicitly in the WKT description, the WKT values shall prevail."</cite></blockquote>
+     * <blockquote><q>Should any attributes or values given in the cited identifier be in conflict with attributes
+     * or values given explicitly in the WKT description, the WKT values shall prevail.</q></blockquote>
      *
      * In situations where the opposite behavior is desired (i.e. to make the authority identifier prevails),
      * this method can be invoked. This method performs the following actions:
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
index 985b52f159..c129d38eca 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
@@ -109,7 +109,7 @@ import static org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_D
  * The definitions used as fallbacks are available in public sources
  * and do not include EPSG metadata except the identifier.
  * If the EPSG geodetic dataset has been used, the {@linkplain NamedIdentifier#getAuthority() authority} title
- * will be something like <cite>"EPSG geodetic dataset"</cite>, otherwise it will be <cite>"Subset of EPSG"</cite>.
+ * will be something like <q>EPSG geodetic dataset</q>, otherwise it will be <q>Subset of EPSG</q>.
  *
  * <p>Referencing objects are cached after creation. Invoking the same method on the same {@code CommonCRS}
  * instance twice will return the same {@link IdentifiedObject} instance, unless the internal cache has been cleared
@@ -189,7 +189,7 @@ public enum CommonCRS {
 
     /**
      * North American Datum 1983.
-     * The ellipsoid is <cite>"GRS 1980"</cite>.
+     * The ellipsoid is <q>GRS 1980</q>.
      * This ellipsoid is very close, but not identical, to the {@linkplain #WGS84} one.
      *
      * <blockquote><table class="compact">
@@ -229,7 +229,7 @@ public enum CommonCRS {
 
     /**
      * European Terrestrial Reference System 1989.
-     * The ellipsoid is <cite>"GRS 1980"</cite>.
+     * The ellipsoid is <q>GRS 1980</q>.
      * This ellipsoid is very close, but not identical, to the {@linkplain #WGS84} one.
      *
      * <blockquote><table class="compact">
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
index 8bbd779010..ed537fe213 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
@@ -371,8 +371,8 @@ public final class IdentifiedObjects extends Static {
      * {@linkplain AbstractIdentifiedObject#getAlias() alias} or
      * {@linkplain AbstractIdentifiedObject#getIdentifiers() identifier}, in that order.
      * If the primary name seems to be the {@linkplain CharSequences#isAcronymForWords acronym} of an alias,
-     * then the alias is returned. For example if the name is <cite>"WGS 84"</cite> and an alias is
-     * <cite>"World Geodetic System 1984"</cite>, then that later alias is returned.
+     * then the alias is returned. For example if the name is <q>WGS 84</q> and an alias is
+     * <q>World Geodetic System 1984</q>, then that later alias is returned.
      *
      * <p>The name should never be missing, but this method nevertheless
      * fallbacks on identifiers as a safety against incomplete implementations.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NamedIdentifier.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NamedIdentifier.java
index 79af7f77a8..e5e4f0847d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NamedIdentifier.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NamedIdentifier.java
@@ -65,7 +65,7 @@ import org.apache.sis.util.iso.DefaultNameFactory;
  *     If there is no code space, then the scope is derived from the shortest {@linkplain #getAuthority() authority}'s
  *     {@linkplain Citation#getAlternateTitles() alternate titles}, or the {@linkplain Citation#getTitle() main title}
  *     if there are no alternate titles. This policy exploits the ISO 19115 comment saying that citation alternate titles
- *     often contain abbreviation (for example "DCW" as an alternative title for <cite>"Digital Chart of the World"</cite>).</li>
+ *     often contain abbreviation (for example "DCW" as an alternative title for <q>Digital Chart of the World</q>).</li>
  * </ul>
  *
  * <h3>Example</h3>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java
index 8f83f76329..bbf86cea10 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java
@@ -174,7 +174,7 @@ public class DefaultDerivedCRS extends AbstractDerivedCRS<Conversion> implements
     /**
      * Creates a derived CRS from a math transform. The given {@code MathTransform} shall transform coordinate
      * values specifically from the {@code baseCRS} to {@code this} CRS (optionally with an interpolation CRS);
-     * there is no consideration about <cite>“normalized CRS”</cite> in this constructor.
+     * there is no consideration about <q>normalized CRS</q> in this constructor.
      *
      * <h4>Conversion properties</h4>
      * The {@code properties} map given in argument can contain any entries documented in the
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AxesConvention.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AxesConvention.java
index ffd6ffb0e5..846e3ec515 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AxesConvention.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AxesConvention.java
@@ -211,7 +211,7 @@ public enum AxesConvention implements AxisFilter {
      * </table>
      *
      * <h4>API notes</h4>
-     * we do not provide a <cite>"longitude or <var>x</var> axis first"</cite> enumeration value because such criterion
+     * we do not provide a <q>longitude or <var>x</var> axis first</q> enumeration value because such criterion
      * is hard to apply to inter-cardinal directions and has no meaning for map projections over a pole.
      * The <cite>display oriented</cite> enumeration name applies to a wider range of cases,
      * but still have a loosely definition which may be adjusted in future Apache SIS versions.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AxisFilter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AxisFilter.java
index 3a8ae67ff9..6856dba1c0 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AxisFilter.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AxisFilter.java
@@ -28,8 +28,8 @@ import org.opengis.referencing.cs.CoordinateSystemAxis;
  * units and directions associated to the axes.
  *
  * <div class="note"><b>Terminology note</b>
- * the word <cite>“filter”</cite> is understood here as <cite>“a computer program or subroutine to process a stream,
- * producing another stream”</cite> (<a href="https://en.wikipedia.org/wiki/Filter_%28software%29">Wikipedia</a>).
+ * the word <q>filter</q> is understood here as <q>a computer program or subroutine to process a stream,
+ * producing another stream</q> (<a href="https://en.wikipedia.org/wiki/Filter_%28software%29">Wikipedia</a>).
  * </div>
  *
  * <p>Note that filtering one or more axes may result in a change of coordinate system type.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java
index af4cc47552..11342637ff 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java
@@ -85,10 +85,10 @@ public final class CoordinateSystems extends Static {
      * Names are case-insensitive. They may be:
      *
      * <ul>
-     *   <li>Cardinal directions like <cite>"north"</cite> and <cite>"east"</cite>.</li>
-     *   <li>Inter-cardinal directions <cite>"north-east"</cite> and <cite>"south-south-east"</cite>,
+     *   <li>Cardinal directions like <q>north</q> and <q>east</q>.</li>
+     *   <li>Inter-cardinal directions <q>north-east</q> and <q>south-south-east</q>,
      *       using either {@code '-'}, {@code '_'} or spaces as separator between the cardinal points.</li>
-     *   <li>Directions from a pole like <cite>"South along 180 deg"</cite> and <cite>"South along 90° East"</cite>,
+     *   <li>Directions from a pole like <q>South along 180 deg</q> and <q>South along 90° East</q>,
      *       using either the {@code "deg"} or {@code "°"} symbol. Note that the meridian is not necessarily relative
      *       to Greenwich (see {@link #directionAlongMeridian directionAlongMeridian(…)} for more information).</li>
      * </ul>
@@ -136,7 +136,7 @@ public final class CoordinateSystems extends Static {
      *
      * <h4>Example</h4>
      * {@code directionAlongMeridian(AxisDirection.SOUTH, -90)} returns an axis direction for
-     * <cite>“South along 90°W”</cite>.
+     * <q>South along 90°W</q>.
      *
      * @param  baseDirection  the base direction, which must be {@link AxisDirection#NORTH} or {@link AxisDirection#SOUTH}.
      * @param  meridian       the meridian in degrees, relative to a unspecified (usually Greenwich) prime meridian.
@@ -184,10 +184,10 @@ public final class CoordinateSystems extends Static {
      * <ul>
      *   <li>The angle from {@link AxisDirection#EAST EAST} to {@link AxisDirection#NORTH NORTH} is 90°</li>
      *   <li>The angle from {@link AxisDirection#SOUTH SOUTH} to {@link AxisDirection#WEST WEST} is -90°</li>
-     *   <li>The angle from <cite>"North along 90° East"</cite> to <cite>"North along 0°"</cite> is 90°.</li>
+     *   <li>The angle from <q>North along 90° East</q> to <q>North along 0°</q> is 90°.</li>
      * </ul>
      *
-     * In the case of directions like <cite>“South along 90°W”</cite>, the caller is responsible to make sure
+     * In the case of directions like <q>South along 90°W</q>, the caller is responsible to make sure
      * that the meridians are relative to the same prime meridian. This is the case if the axes are part of
      * the same {@code CoordinateSystem} instance.
      *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
index ef36a24ee9..a34e206858 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
@@ -77,8 +77,8 @@ import static org.apache.sis.referencing.util.NilReferencingObject.UNNAMED;
  * <h2>Axis names</h2>
  * In some case, the axis name is constrained by ISO 19111 depending on the
  * {@linkplain org.opengis.referencing.crs.CoordinateReferenceSystem coordinate reference system} type.
- * This constraint works in two directions. For example, the names <cite>"geodetic latitude"</cite> and
- * <cite>"geodetic longitude"</cite> shall be used to designate the coordinate axis names associated
+ * This constraint works in two directions. For example, the names <q>geodetic latitude</q> and
+ * <q>geodetic longitude</q> shall be used to designate the coordinate axis names associated
  * with a {@link org.opengis.referencing.crs.GeographicCRS}. Conversely, these names shall not be used
  * in any other context. See the GeoAPI {@link CoordinateSystemAxis} javadoc for more information.
  *
@@ -179,7 +179,7 @@ public class DefaultCoordinateSystemAxis extends AbstractIdentifiedObject implem
 
     /**
      * The abbreviation used for this coordinate system axes.
-     * Examples are <cite>"X"</cite> and <cite>"Y"</cite>.
+     * Examples are <q>X</q> and <q>Y</q>.
      *
      * <p><b>Consider this field as final!</b>
      * This field is modified only at unmarshalling time by {@link #setAbbreviation(String)}</p>
@@ -415,7 +415,7 @@ public class DefaultCoordinateSystemAxis extends AbstractIdentifiedObject implem
 
     /**
      * Returns the abbreviation used for this coordinate system axes.
-     * Examples are <cite>"X"</cite> and <cite>"Y"</cite>.
+     * Examples are <q>X</q> and <q>Y</q>.
      *
      * @return the coordinate system axis abbreviation.
      */
@@ -502,9 +502,9 @@ public class DefaultCoordinateSystemAxis extends AbstractIdentifiedObject implem
      *
      * The above special cases are needed in order to workaround a conflict in specifications:
      * ISO 19111 states explicitly that the latitude and longitude axis names shall be
-     * <cite>"Geodetic latitude"</cite> and <cite>"Geodetic longitude"</cite>, while the legacy
+     * <q>Geodetic latitude</q> and <q>Geodetic longitude</q>, while the legacy
      * OGC 01-009 (where version 1 of the WKT format is defined) said that the default values shall be
-     * <cite>"Lat"</cite> and <cite>"Lon"</cite>.
+     * <q>Lat</q> and <q>Lon</q>.
      *
      * <h4>Future evolutions</h4>
      * This method implements heuristic rules learned from experience while trying to provide inter-operability
@@ -711,8 +711,8 @@ public class DefaultCoordinateSystemAxis extends AbstractIdentifiedObject implem
      * The only actions (derived from ISO 19162 rules) taken by this method (by default) are:
      *
      * <ul>
-     *   <li>Replace <cite>“Geodetic latitude”</cite> and <cite>“Geodetic longitude”</cite> names (case insensitive)
-     *       by <cite>“latitude”</cite> and <cite>“longitude”</cite> respectively.</li>
+     *   <li>Replace <q>Geodetic latitude</q> and <q>Geodetic longitude</q> names (case insensitive)
+     *       by <q>latitude</q> and <q>longitude</q> respectively.</li>
      *   <li>For latitude and longitude axes, replace “φ” and “λ” abbreviations by <var>“B”</var> and <var>“L”</var>
      *       respectively (from German “Breite” and “Länge”, used in academic texts worldwide).
      *       Note that <var>“L”</var> is also the transliteration of Greek letter “lambda” (λ).</li>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DirectionAlongMeridian.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
index 14e0c059dc..e9dc4b4ec4 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
@@ -33,7 +33,7 @@ import org.apache.sis.util.resources.Errors;
 
 
 /**
- * Parses {@linkplain AxisDirection axis direction} of the kind <cite>"South along 90 deg East"</cite>.
+ * Parses {@linkplain AxisDirection axis direction} of the kind <q>South along 90 deg East</q>.
  * Those directions are used in the EPSG database for polar stereographic projections.
  *
  * <h2>Reference meridian</h2>
@@ -49,8 +49,8 @@ final class DirectionAlongMeridian extends FormattableObject implements Comparab
      * A parser for EPSG axis names. Examples:
      *
      * <ul>
-     *   <li><cite>"South along 180 deg"</cite></li>
-     *   <li><cite>"South along 90 deg East"</cite></li>
+     *   <li><q>South along 180 deg</q></li>
+     *   <li><q>South along 90 deg East</q></li>
      * </ul>
      */
     private static final Pattern EPSG = Pattern.compile(
@@ -183,7 +183,7 @@ final class DirectionAlongMeridian extends FormattableObject implements Comparab
      * A positive angle denote a right-handed system.
      *
      * <h4>Example</h4>
-     * The angle from <cite>"North along 90 deg East"</cite> to <cite>"North along 0 deg</cite> is 90°.
+     * The angle from <q>North along 90 deg East</q> to <q>North along 0 deg</cite> is 90°.
      */
     public double angle(final DirectionAlongMeridian other) {
         if (!baseDirection.equals(other.baseDirection)) {
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumShiftGrid.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumShiftGrid.java
index d9998237c9..b8053f860d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumShiftGrid.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumShiftGrid.java
@@ -693,7 +693,7 @@ public abstract class DatumShiftGrid<C extends Quantity<C>, T extends Quantity<T
      * {@link #getCellValue getCellValue(dim, …)}, but subclasses may override with more specific values.
      *
      * <h4>Example</h4>
-     * In the <cite>"France geocentric interpolation"</cite> (ESPG:9655) operation method, those "average" values
+     * In the <q>France geocentric interpolation</q> (ESPG:9655) operation method, those "average" values
      * are fixed by definition to -168, -60 and +320 metres for dimensions 0, 1 and 2 respectively
      * (geocentric <var>X</var>, <var>Y</var> and <var>Z</var>).
      *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
index a5809407a0..464d124ee0 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
@@ -522,8 +522,8 @@ public class DefaultGeodeticDatum extends AbstractDatum implements GeodeticDatum
      * compared by the {@link #equals(Object)} method.
      *
      * <h4>Example</h4>
-     * If the datum name is <cite>"Nouvelle Triangulation Française (Paris)"</cite> and the prime meridian name is
-     * <cite>"Paris"</cite>, then this method compares only the <cite>"Nouvelle Triangulation Française"</cite> part.
+     * If the datum name is <q>Nouvelle Triangulation Française (Paris)</q> and the prime meridian name is
+     * <q>Paris</q>, then this method compares only the <q>Nouvelle Triangulation Française</q> part.
      *
      * <h4>Future evolutions</h4>
      * This method implements heuristic rules learned from experience while trying to provide inter-operability
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityFactory.java
index 57890117f9..3b0874918e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityFactory.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityFactory.java
@@ -288,7 +288,7 @@ public class CommonAuthorityFactory extends GeodeticAuthorityFactory implements
      * of that authority is set to {@code "OGC"}. Apache SIS does that for consistency with the namespace used
      * in URNs (for example {@code "urn:ogc:def:crs:OGC:1.3:CRS84"}).</p>
      *
-     * @return the <cite>"Web Map Service"</cite> authority.
+     * @return the <q>Web Map Service</q> authority.
      *
      * @see #getCodeSpaces()
      * @see Citations#WMS
@@ -379,7 +379,7 @@ public class CommonAuthorityFactory extends GeodeticAuthorityFactory implements
      * are quite different than the {@linkplain #getAuthority() authority} title or identifier:
      *
      * <ul>
-     *   <li><b>Authority:</b> {@code "WMS"} (for <cite>"Web Map Services"</cite>)</li>
+     *   <li><b>Authority:</b> {@code "WMS"} (for <q>Web Map Services</q>)</li>
      *   <li><b>Namespaces:</b> {@code "CRS"}, {@code "AUTO"}, {@code "AUTO2"}.
      *       The {@code "OGC"} namespace is also accepted for compatibility reason,
      *       but its scope is wider than the above-cited namespaces.</li>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java
index 03b196cf75..78aaaa489d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java
@@ -100,7 +100,7 @@ public class IdentifiedObjectFinder {
          * <h4>Example</h4>
          * If {@link IdentifiedObjectFinder#find(IdentifiedObject)} is invoked with an object equivalent to the
          * {@linkplain org.apache.sis.referencing.CommonCRS#WGS84 WGS84} geographic CRS but does not declare the
-         * {@code "4326"} identifier and does not have the <cite>"WGS 84"</cite> name, then the search based on
+         * {@code "4326"} identifier and does not have the <q>WGS 84</q> name, then the search based on
          * {@link #DECLARATION} will give no result. The {@code find(…)} method will then scan the dataset for
          * geographic CRS using equivalent datum and coordinate system. This may be a costly operation.
          *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectSet.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectSet.java
index 9c8cfa67db..1c6111fd7b 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectSet.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectSet.java
@@ -61,7 +61,7 @@ import org.apache.sis.util.collection.CheckedContainer;
  * {@code IdentifiedObjectSet} can be used as the set returned by implementations of the
  * {@link GeodeticAuthorityFactory#createFromCoordinateReferenceSystemCodes(String, String)} method.
  * Deferred creation can have great performance impact since some set may contain as much as 40 entries
- * (e.g. transformations from <cite>"ED50"</cite> (EPSG:4230) to <cite>"WGS 84"</cite> (EPSG:4326))
+ * (e.g. transformations from <q>ED50</q> (EPSG:4230) to <q>WGS 84</q> (EPSG:4326))
  * while some users only want to look for the first entry.
  *
  * <h2>Exception handling</h2>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
index e72cd4ddf4..1b6be08688 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
@@ -130,12 +130,12 @@ import org.opengis.metadata.Identifier;
  * Current version of this class requires EPSG database version 6.6 or above.
  *
  * <h2>Object identifier (code or name)</h2>
- * EPSG codes are numerical identifiers. For example, code 3395 stands for <cite>"WGS 84 / World Mercator"</cite>.
+ * EPSG codes are numerical identifiers. For example, code 3395 stands for <q>WGS 84 / World Mercator</q>.
  * Coordinate Reference Objects are normally created from their numerical codes, but this factory accepts also names.
  * For example, {@code createProjectedCRS("3395")} and {@code createProjectedCRS("WGS 84 / World Mercator")} both fetch
  * the same object.
  * However, names may be ambiguous since the same name may be used for more than one object.
- * This is the case of <cite>"WGS 84"</cite> for instance.
+ * This is the case of <q>WGS 84</q> for instance.
  * If such an ambiguity is found, an exception will be thrown.
  *
  * <h2>Life cycle and caching</h2>
@@ -657,7 +657,7 @@ addURIs:    for (int i=0; ; i++) {
      *
      * <p>When this method returns {@code false}, {@code createFoo(String)} methods
      * may look for the code in the name column instead of the primary key column.
-     * This allows to accept the <cite>"WGS 84 / World Mercator"</cite> string (for example)
+     * This allows to accept the <q>WGS 84 / World Mercator</q> string (for example)
      * in addition to the {@code "3395"} primary key. Both string values should fetch the same object.</p>
      *
      * <p>If this method returns {@code true}, then this factory does not search for matching names.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/package-info.java
index d94e97d28f..31db366080 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/package-info.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/package-info.java
@@ -46,7 +46,7 @@
  * <h2>The EPSG dataset</h2>
  * A widely-used factory is the <a href="https://epsg.org/">EPSG geodetic dataset</a>.
  * EPSG codes are numerical identifiers.
- * For example, {@code "EPSG:4326"} is the EPSG identifier for the <cite>"WGS 84"</cite> geographic CRS.
+ * For example, {@code "EPSG:4326"} is the EPSG identifier for the <q>WGS 84</q> geographic CRS.
  * As an extension, the Apache SIS implementation accepts names as well as numeric identifiers.
  * For example, the two following method calls fetch the same object:
  *
@@ -56,7 +56,7 @@
  * </ul>
  *
  * Note that names may be ambiguous since the same name may be used for more than one object.
- * This is the case of <cite>"WGS 84"</cite> for example.
+ * This is the case of <q>WGS 84</q> for example.
  * If such an ambiguity is found, an exception will be thrown.
  * For more determinism, the numerical codes are preferred.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/DeprecatedCode.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/DeprecatedCode.java
index 320cd27dda..54cb6629bc 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/DeprecatedCode.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/DeprecatedCode.java
@@ -86,7 +86,7 @@ public final class DeprecatedCode extends ImmutableIdentifier implements Depreca
 
     /**
      * Returns {@code null}, since we used the description for the superseded information.
-     * See <cite>"Implementation note"</cite> in class javadoc.
+     * See <q>Implementation note</q> in class javadoc.
      *
      * @return {@code null}.
      */
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/DeprecatedName.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/DeprecatedName.java
index 966cd5e5f1..d4b25f677f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/DeprecatedName.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/DeprecatedName.java
@@ -78,7 +78,7 @@ public final class DeprecatedName extends NamedIdentifier implements Deprecable
 
     /**
      * Returns {@code null}, since we used the description for the superseded information.
-     * See <cite>"Implementation note"</cite> in class javadoc.
+     * See <q>Implementation note</q> in class javadoc.
      *
      * @return {@code null}.
      */
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationContext.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationContext.java
index cdffe12a24..759b6d56ec 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationContext.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationContext.java
@@ -79,7 +79,7 @@ public class CoordinateOperationContext implements Serializable {
 
     /**
      * The desired accuracy in metres, or 0 for the best accuracy available.
-     * See {@link #getDesiredAccuracy()} for more details about what we mean by <cite>"best accuracy"</cite>.
+     * See {@link #getDesiredAccuracy()} for more details about what we mean by <q>best accuracy</q>.
      */
     private double desiredAccuracy;
 
@@ -94,7 +94,7 @@ public class CoordinateOperationContext implements Serializable {
      *
      * @param area      the area of interest, or {@code null} if none.
      * @param accuracy  the desired accuracy in metres, or 0 for the best accuracy available.
-     * See {@link #getDesiredAccuracy()} for more details about what we mean by <cite>"best accuracy"</cite>.
+     * See {@link #getDesiredAccuracy()} for more details about what we mean by <q>best accuracy</q>.
      */
     public CoordinateOperationContext(final Extent area, final double accuracy) {
         ArgumentChecks.ensurePositive("accuracy", accuracy);
@@ -206,7 +206,7 @@ public class CoordinateOperationContext implements Serializable {
     /**
      * Sets the desired accuracy in metres.
      * A value of 0 means to search for the most accurate operation.
-     * See {@link #getDesiredAccuracy()} for more details about what we mean by <cite>"most accurate"</cite>.
+     * See {@link #getDesiredAccuracy()} for more details about what we mean by <q>most accurate</q>.
      *
      * @param  accuracy  the desired accuracy in metres.
      */
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
index c4a09767ea..c0ffadcae9 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
@@ -981,7 +981,7 @@ class CoordinateOperationRegistry {
      * in the target coordinates or both. If there is an ellipsoidal transform, then this method updates the
      * transforms in order to use the ellipsoidal height (it has an impact on the transformed values).
      *
-     * <p>This method requires that the EPSG factory insert explicit <cite>"Geographic3D to 2D conversion"</cite>
+     * <p>This method requires that the EPSG factory insert explicit <q>Geographic3D to 2D conversion</q>
      * operations (EPSG:9659) in the operations chain, or an equivalent operation (recognized by its matrix shape).
      * This method tries to locate and remove EPSG:9659 or equivalent operation from the operation chain in order
      * to get three-dimensional domains.</p>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
index 673b0efef9..112647c2ac 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
@@ -263,7 +263,7 @@ public class DefaultCoordinateOperationFactory extends AbstractFactory implement
 
     /**
      * Returns the operation method of the given name. The given argument shall be either a method
-     * {@linkplain DefaultOperationMethod#getName() name} (e.g. <cite>"Transverse Mercator"</cite>)
+     * {@linkplain DefaultOperationMethod#getName() name} (e.g. <q>Transverse Mercator</q>)
      * or one of its {@linkplain DefaultOperationMethod#getIdentifiers() identifiers} (e.g. {@code "EPSG:9807"}).
      * The search is case-insensitive and comparisons against method names can be
      * {@linkplain DefaultOperationMethod#isHeuristicMatchForName(String) heuristic}.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/LooselyDefinedMethod.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/LooselyDefinedMethod.java
index dbe03a70e2..e60f56ebad 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/LooselyDefinedMethod.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/LooselyDefinedMethod.java
@@ -46,15 +46,15 @@ import org.apache.sis.parameter.DefaultParameterDescriptorGroup;
  */
 final class LooselyDefinedMethod {
     /**
-     * The <cite>"Affine parametric transformation in geocentric domain"</cite> method.
+     * The <q>Affine parametric transformation in geocentric domain</q> method.
      * It could be done by a concatenation of the following standard methods:
      *
      * <ol>
-     *   <li><cite>"Geographic 2D to 3D conversion"</cite></li>
-     *   <li><cite>"Geographic/geocentric conversions"</cite> (EPSG:9602)</li>
-     *   <li><cite>"Affine parametric transformation"</cite> (EPSG:9624)</li>
-     *   <li>Inverse of <cite>"Geographic/geocentric conversions"</cite></li>
-     *   <li><cite>"Geographic 3D to 2D conversion"</cite> (EPSG:9659)</li>
+     *   <li><q>Geographic 2D to 3D conversion</q></li>
+     *   <li><q>Geographic/geocentric conversions</q> (EPSG:9602)</li>
+     *   <li><q>Affine parametric transformation</q> (EPSG:9624)</li>
+     *   <li>Inverse of <q>Geographic/geocentric conversions</q></li>
+     *   <li><q>Geographic 3D to 2D conversion</q> (EPSG:9659)</li>
      * </ol>
      *
      * It is not implemented that way for now because we need more work for analyzing the source and target
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LocalizationGridException.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LocalizationGridException.java
index 1c19d0c157..fdb57dbf6a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LocalizationGridException.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LocalizationGridException.java
@@ -47,7 +47,7 @@ public class LocalizationGridException extends FactoryDataException {
 
     /**
      * Additional information about what may be the cause of this exception.
-     * Example: <cite>"The grid spans more than 180° of longitude"</cite>,
+     * Example: <q>The grid spans more than 180° of longitude</q>,
      * which may be a cause of map projection failures.
      *
      * @see #getPotentialCause()
@@ -93,7 +93,7 @@ public class LocalizationGridException extends FactoryDataException {
 
     /**
      * Specifies additional information about what may be the cause of this exception.
-     * Example: <cite>"The grid spans more than 180° of longitude"</cite>,
+     * Example: <q>The grid spans more than 180° of longitude</q>,
      * which may be a cause of map projection failures.
      *
      * @param  details  a potential cause, or {@code null} if none.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/ProjectedTransformTry.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/ProjectedTransformTry.java
index 9a050f822d..2b794027b5 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/ProjectedTransformTry.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/ProjectedTransformTry.java
@@ -46,7 +46,7 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
  * {@link LocalizationGridBuilder} first computes a linear (affine) approximation of a localization grid, then stores the residuals.
  * This approach works well when the residuals are small. However if the localization grid is non-linear, then the affine transform
  * is a poor approximation of that grid and the residuals are high. High residuals make inverse transforms hard to compute, which
- * sometimes cause a {@link TransformException} with <cite>"no convergence"</cite> error message.</p>
+ * sometimes cause a {@link TransformException} with <q>no convergence</q> error message.</p>
  *
  * <p>In practice, localization grids in netCDF files are often used for storing the results of a map projection, e.g. Mercator.
  * This class allows {@link LocalizationGridBuilder} to try to transform the grid using a given list of map projections and see
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java
index 8892d88a61..fe5af4b49c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java
@@ -1194,7 +1194,7 @@ public final class Matrices extends Static {
      *
      * <p>The current implementation formats ±0 and ±1 without trailing {@code ".0"}, and all other values with
      * a per-column uniform number of fraction digits. The ±0 and ±1 values are treated especially because they
-     * usually imply a <cite>"no scale"</cite>, <cite>"no translation"</cite> or <cite>"orthogonal axes"</cite>
+     * usually imply a <q>no scale</q>, <q>no translation</q> or <q>orthogonal axes</q>
      * meaning. A matrix in SIS is often populated mostly by ±0 and ±1 values, with a few "interesting" values.
      * The simpler ±0 and ±1 formatting makes easier to spot the "interesting" values.</p>
      *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AzimuthalEquidistant.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AzimuthalEquidistant.java
index b293dfd1b5..243e12d406 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AzimuthalEquidistant.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AzimuthalEquidistant.java
@@ -99,7 +99,7 @@ public class AzimuthalEquidistant extends NormalizedProjection {
      * The {@code method} argument can be the description of one of the following:
      *
      * <ul>
-     *   <li><cite>"Azimuthal Equidistant (Spherical)"</cite>.</li>
+     *   <li><q>Azimuthal Equidistant (Spherical)</q>.</li>
      * </ul>
      *
      * @param method      description of the projection parameters.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CassiniSoldner.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CassiniSoldner.java
index 0f5229f430..9fe4a8a4dd 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CassiniSoldner.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CassiniSoldner.java
@@ -69,12 +69,12 @@ public class CassiniSoldner extends MeridianArcBased {
         DEFAULT(null, IDENTIFIER_OF_BASE),
 
         /**
-         * The <cite>"Hyperbolic Cassini-Soldner"</cite> variant, which is non-invertible.
+         * The <q>Hyperbolic Cassini-Soldner</q> variant, which is non-invertible.
          */
         HYPERBOLIC(Pattern.compile(".*\\bHyperbolic\\b.*", Pattern.CASE_INSENSITIVE), HyperbolicCassiniSoldner.IDENTIFIER),
 
         /**
-         * The special case of <cite>"Vanua Levu Grid"</cite> at φ₀=16°15′S.
+         * The special case of <q>Vanua Levu Grid</q> at φ₀=16°15′S.
          * This is the only hyperbolic variant for which reverse projection is supported.
          * This special case is detected by checking the value of the latitude of origin.
          */
@@ -130,8 +130,8 @@ public class CassiniSoldner extends MeridianArcBased {
      * The {@code method} argument can be the description of one of the following:
      *
      * <ul>
-     *   <li><cite>"Cassini-Soldner"</cite>.</li>
-     *   <li><cite>"Hyperbolic Cassini-Soldner"</cite>.</li>
+     *   <li><q>Cassini-Soldner</q>.</li>
+     *   <li><q>Hyperbolic Cassini-Soldner</q>.</li>
      * </ul>
      *
      * @param  method      description of the projection parameters.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ConformalProjection.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ConformalProjection.java
index 9a24c0aa39..d10058874a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ConformalProjection.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ConformalProjection.java
@@ -33,8 +33,8 @@ import static java.lang.Math.*;
  *
  * <p>This base class can be seen as a generalization of <cite>Lambert Conic Conformal</cite> projection,
  * which includes some other projections like Mercator and Polar Stereographic as special cases.
- * For this base class, the Mercator projection is considered as <cite>"a special limiting case of the
- * Lambert Conic Conformal map projection with the equator as the single standard parallel."</cite>
+ * For this base class, the Mercator projection is considered as <q>a special limiting case of the
+ * Lambert Conic Conformal map projection with the equator as the single standard parallel.</q>
  * (Source: §1.3.3 in IOGP Publication 373-7-2 – Geomatics Guidance Note number 7, part 2 – April 2015).
  * Indeed, those two projections have some equation in commons which are provided in this base class.</p>
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
index 5defebb45d..431d3d1c6a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
@@ -84,19 +84,19 @@ public class LambertConicConformal extends ConformalProjection {
     private enum Variant implements ProjectionVariant {
         // Declaration order matter. Patterns are matched in that order.
 
-        /** The <cite>"Lambert Conic Conformal (2SP Belgium)"</cite> projection. */
+        /** The <q>Lambert Conic Conformal (2SP Belgium)</q> projection. */
         BELGIUM(".*\\bBelgium\\b.*", LambertConformalBelgium.IDENTIFIER, false),
 
-        /** The <cite>"Lambert Conic Conformal (2SP Michigan)"</cite> projection. */
+        /** The <q>Lambert Conic Conformal (2SP Michigan)</q> projection. */
         MICHIGAN(".*\\bMichigan\\b.*", LambertConformalMichigan.IDENTIFIER, false),
 
-        /** The <cite>"Lambert Conic Conformal (West Orientated)"</cite> projection. */
+        /** The <q>Lambert Conic Conformal (West Orientated)</q> projection. */
         WEST(".*\\bWest\\b.*", LambertConformalWest.IDENTIFIER, true),
 
-        /** The <cite>"Lambert Conic Conformal (1SP)"</cite> projection. */
+        /** The <q>Lambert Conic Conformal (1SP)</q> projection. */
         ONE_PARALLEL(".*\\b1SP\\b.*", LambertConformal1SP.IDENTIFIER, true),
 
-        /** The  <cite>"Lambert Conic Conformal (2SP)"</cite> projection. */
+        /** The  <q>Lambert Conic Conformal (2SP)</q> projection. */
         TWO_PARALLELS(".*\\b2SP\\b.*", LambertConformal2SP.IDENTIFIER, false);
 
         /** Name pattern for this variant.    */ private final Pattern operationName;
@@ -166,11 +166,11 @@ public class LambertConicConformal extends ConformalProjection {
      * The {@code method} argument can be the description of one of the following:
      *
      * <ul>
-     *   <li><cite>"Lambert Conic Conformal (1SP)"</cite>.</li>
-     *   <li><cite>"Lambert Conic Conformal (West Orientated)"</cite>.</li>
-     *   <li><cite>"Lambert Conic Conformal (2SP)"</cite>.</li>
-     *   <li><cite>"Lambert Conic Conformal (2SP Belgium)"</cite>.</li>
-     *   <li><cite>"Lambert Conic Conformal (2SP Michigan)"</cite>.</li>
+     *   <li><q>Lambert Conic Conformal (1SP)</q>.</li>
+     *   <li><q>Lambert Conic Conformal (West Orientated)</q>.</li>
+     *   <li><q>Lambert Conic Conformal (2SP)</q>.</li>
+     *   <li><q>Lambert Conic Conformal (2SP Belgium)</q>.</li>
+     *   <li><q>Lambert Conic Conformal (2SP Michigan)</q>.</li>
      * </ul>
      *
      * @param method      description of the projection parameters.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java
index 5aed0d0a05..a77fe5a387 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java
@@ -101,22 +101,22 @@ public class Mercator extends ConformalProjection {
     private enum Variant implements ProjectionVariant {
         // Declaration order matter. Patterns are matched in that order.
 
-        /** The <cite>"Mercator (variant A)"</cite> projection (one standard parallel). */
+        /** The <q>Mercator (variant A)</q> projection (one standard parallel). */
         ONE_PARALLEL(".*\\bvariant\\s*A\\b.*", Mercator1SP.IDENTIFIER, false),
 
-        /** The <cite>"Mercator (variant B)"</cite> projection (two standard parallels). */
+        /** The <q>Mercator (variant B)</q> projection (two standard parallels). */
         TWO_PARALLELS(".*\\bvariant\\s*B\\b.*", Mercator2SP.IDENTIFIER, false),
 
-        /** The <cite>"Mercator (variant C)"</cite> projection. */
+        /** The <q>Mercator (variant C)</q> projection. */
         REGIONAL(".*\\bvariant\\s*C\\b.*", RegionalMercator.IDENTIFIER, false),
 
-        /** The <cite>"Mercator (Spherical)"</cite> projection. */
+        /** The <q>Mercator (Spherical)</q> projection. */
         SPHERICAL(".*\\bSpherical\\b.*", MercatorSpherical.IDENTIFIER, true),
 
-        /** The <cite>"Popular Visualisation Pseudo Mercator"</cite> projection. */
+        /** The <q>Popular Visualisation Pseudo Mercator</q> projection. */
         PSEUDO(".*\\bPseudo.*", PseudoMercator.IDENTIFIER, true),
 
-        /** The <cite>"Mercator Auxiliary Sphere"</cite> projection. */
+        /** The <q>Mercator Auxiliary Sphere</q> projection. */
         AUXILIARY(".*\\bAuxiliary\\s*Sphere\\b.*", null, true),
 
         /** Miller projection. */
@@ -164,13 +164,13 @@ public class Mercator extends ConformalProjection {
      * The {@code method} argument can be the description of one of the following:
      *
      * <ul>
-     *   <li><cite>"Mercator (variant A)"</cite>, also known as <cite>"Mercator (1SP)"</cite>.</li>
-     *   <li><cite>"Mercator (variant B)"</cite>, also known as <cite>"Mercator (2SP)"</cite>.</li>
-     *   <li><cite>"Mercator (variant C)"</cite>.</li>
-     *   <li><cite>"Mercator (Spherical)"</cite>.</li>
-     *   <li><cite>"Mercator Auxiliary Sphere"</cite>.</li>
-     *   <li><cite>"Popular Visualisation Pseudo Mercator"</cite>.</li>
-     *   <li><cite>"Miller Cylindrical"</cite>.</li>
+     *   <li><q>Mercator (variant A)</q>, also known as <q>Mercator (1SP)</q>.</li>
+     *   <li><q>Mercator (variant B)</q>, also known as <q>Mercator (2SP)</q>.</li>
+     *   <li><q>Mercator (variant C)</q>.</li>
+     *   <li><q>Mercator (Spherical)</q>.</li>
+     *   <li><q>Mercator Auxiliary Sphere</q>.</li>
+     *   <li><q>Popular Visualisation Pseudo Mercator</q>.</li>
+     *   <li><q>Miller Cylindrical</q>.</li>
      * </ul>
      *
      * @param method      description of the projection parameters.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistant.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistant.java
index 18295eb503..5a0e02c869 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistant.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistant.java
@@ -98,7 +98,7 @@ public class ModifiedAzimuthalEquidistant extends AzimuthalEquidistant {
      * The {@code method} argument can be the description of one of the following:
      *
      * <ul>
-     *   <li><cite>"Modified Azimuthal Equidistant"</cite>.</li>
+     *   <li><q>Modified Azimuthal Equidistant</q>.</li>
      * </ul>
      *
      * @param method      description of the projection parameters.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mollweide.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mollweide.java
index f8ec6e6fcc..ceddaa77ca 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mollweide.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mollweide.java
@@ -99,8 +99,8 @@ public class Mollweide extends NormalizedProjection {
      * The {@code method} argument can be the description of one of the following:
      *
      * <ul>
-     *   <li><cite>"Mollweide"</cite>, also known as
-     *       <cite>"Homalographic"</cite> or <cite>"Homolographic"</cite>.</li>
+     *   <li><q>Mollweide</q>, also known as
+     *       <q>Homalographic</q> or <q>Homolographic</q>.</li>
      * </ul>
      *
      * @param method      description of the projection parameters.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/NormalizedProjection.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
index 372d8f0165..93f4733922 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
@@ -282,7 +282,7 @@ public abstract class NormalizedProjection extends AbstractMathTransform2D imple
          *
          * <h4>When to use</h4>
          * This enumeration value should be used only when the user requested explicitly the spherical formulas
-         * of a conformal projection, for example the <cite>"Mercator (Spherical)"</cite> projection (EPSG:1026),
+         * of a conformal projection, for example the <q>Mercator (Spherical)</q> projection (EPSG:1026),
          * but the figure of the Earth may be an ellipsoid rather than a sphere.
          * This enumeration value can also be used for other kinds of projection except Equal Area, in which case
          * the {@linkplain org.apache.sis.referencing.datum.DefaultEllipsoid#getAuthalicRadius() authalic radius}
@@ -336,7 +336,7 @@ public abstract class NormalizedProjection extends AbstractMathTransform2D imple
          * This is the same <var>x</var> translation than {@link #FALSE_EASTING}, but of opposite sign.
          *
          * <p>Actually, there is usually no parameter named "false westing" in a map projection.
-         * But some projections like <cite>"Lambert Conic Conformal (West Orientated)"</cite> are
+         * But some projections like <q>Lambert Conic Conformal (West Orientated)</q> are
          * defined in such a way that their "false easting" parameter is effectively a "false westing".
          * This enumeration value can be used for informing {@link NormalizedProjection} about that fact.</p>
          */
@@ -360,7 +360,7 @@ public abstract class NormalizedProjection extends AbstractMathTransform2D imple
          * This is the same <var>y</var> translation than {@link #FALSE_NORTHING}, but of opposite sign.
          *
          * <p>Actually, there is usually no parameter named "false southing" in a map projection.
-         * But some projections like <cite>"Transverse Mercator (South Orientated)"</cite> are
+         * But some projections like <q>Transverse Mercator (South Orientated)</q> are
          * defined in such a way that their "false northing" parameter is effectively a "false southing".
          * This enumeration value can be used for informing {@link NormalizedProjection} about that fact.</p>
          */
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueMercator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueMercator.java
index 06e78cee44..ca8077fefd 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueMercator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueMercator.java
@@ -137,11 +137,11 @@ public class ObliqueMercator extends ConformalProjection {
      * The {@code method} argument can be the description of one of the following:
      *
      * <ul>
-     *   <li><cite>"Hotine Oblique Mercator (variant A)"</cite>.</li>
-     *   <li><cite>"Hotine Oblique Mercator (variant B)"</cite>.</li>
-     *   <li><cite>"Hotine Oblique Mercator two point center"</cite> (from ESRI).</li>
-     *   <li><cite>"Hotine Oblique Mercator two point natural origin"</cite> (from ESRI).</li>
-     *   <li><cite>"Rectified Skew Orthomorphic"</cite>.</li>
+     *   <li><q>Hotine Oblique Mercator (variant A)</q>.</li>
+     *   <li><q>Hotine Oblique Mercator (variant B)</q>.</li>
+     *   <li><q>Hotine Oblique Mercator two point center</q> (from ESRI).</li>
+     *   <li><q>Hotine Oblique Mercator two point natural origin</q> (from ESRI).</li>
+     *   <li><q>Rectified Skew Orthomorphic</q>.</li>
      * </ul>
      *
      * @param  method      description of the projection parameters.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
index 96cdc83b10..10f7f7f36d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
@@ -52,11 +52,11 @@ import static org.apache.sis.referencing.operation.provider.ObliqueStereographic
  *
  * <p>This projection involves two steps: first a conversion of <em>geodetic</em> coordinates to <em>conformal</em>
  * coordinates (i.e. latitudes and longitudes on a conformal sphere), then a spherical stereographic projection.
- * For this reason this projection method is sometimes known as <cite>"Double Stereographic"</cite>.</p>
+ * For this reason this projection method is sometimes known as <q>Double Stereographic</q>.</p>
  *
  * <h2>Related methods</h2>
- * There is another method known as <cite>"Oblique Stereographic Alternative"</cite> or sometimes just
- * <cite>"Stereographic"</cite>. That alternative uses a simplified conversion computing the conformal latitude
+ * There is another method known as <q>Oblique Stereographic Alternative</q> or sometimes just
+ * <q>Stereographic</q>. That alternative uses a simplified conversion computing the conformal latitude
  * of each point on the ellipsoid. Both methods are considered valid but produce slightly different results.
  * For this reason EPSG considers them as different projection methods.
  *
@@ -96,7 +96,7 @@ public class ObliqueStereographic extends NormalizedProjection {
      * The {@code method} argument can be the description of one of the following:
      *
      * <ul>
-     *   <li><cite>"Oblique Stereographic"</cite>, also known as <cite>"Roussilhe"</cite>.</li>
+     *   <li><q>Oblique Stereographic</q>, also known as <q>Roussilhe</q>.</li>
      * </ul>
      *
      * @param  method      description of the projection parameters.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Orthographic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Orthographic.java
index 63787b061f..6e9432a22a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Orthographic.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Orthographic.java
@@ -82,7 +82,7 @@ public class Orthographic extends NormalizedProjection {
      * The {@code method} argument can be the description of one of the following:
      *
      * <ul>
-     *   <li><cite>"Orthographic"</cite>.</li>
+     *   <li><q>Orthographic</q>.</li>
      * </ul>
      *
      * @param method      description of the projection parameters.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java
index 9aaa1881a1..bb20812251 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java
@@ -51,9 +51,9 @@ import static org.apache.sis.referencing.util.Formulas.fastHypot;
  * This is a special case of {@link ObliqueStereographic} when the projection origin is at a pole.
  *
  * <p>EPSG defines three variants for this projection, <cite>A</cite>, <cite>B</cite> and <cite>C</cite>,
- * which differ by the way the parameters are specified. The <cite>"Polar Stereographic (variant B)"</cite>
- * projection includes a <cite>"Latitude of standard parallel"</cite> parameter where is effective the scale factor
- * (normally 1). The <cite>"Polar Stereographic (variant A)"</cite> forces its <cite>"Latitude of natural origin"</cite>
+ * which differ by the way the parameters are specified. The <q>Polar Stereographic (variant B)</q>
+ * projection includes a <q>Latitude of standard parallel</q> parameter where is effective the scale factor
+ * (normally 1). The <q>Polar Stereographic (variant A)</q> forces its <q>Latitude of natural origin</q>
  * parameter to ±90°, depending on the hemisphere.</p>
  *
  * @author  Gerald Evenden (USGS)
@@ -81,19 +81,19 @@ public class PolarStereographic extends ConformalProjection {
      * <p>The default case is {@link #B}.</p>
      */
     private enum Variant implements ProjectionVariant {
-        /** The <cite>"Polar Stereographic (Variant A)"</cite> projection. */
+        /** The <q>Polar Stereographic (Variant A)</q> projection. */
         A(".*\\bvariant\\s*A\\b.*",  PolarStereographicA.IDENTIFIER),
 
-        /** The <cite>"Polar Stereographic (Variant B)"</cite> projection. */
+        /** The <q>Polar Stereographic (Variant B)</q> projection. */
         B(".*\\bvariant\\s*B\\b.*",  PolarStereographicB.IDENTIFIER),
 
-        /** The <cite>"Polar Stereographic (Variant C)"</cite> projection. */
+        /** The <q>Polar Stereographic (Variant C)</q> projection. */
         C(".*\\bvariant\\s*C\\b.*",  PolarStereographicC.IDENTIFIER),
 
-        /** <cite>"Stereographic North Pole"</cite> projection (ESRI). */
+        /** <q>Stereographic North Pole</q> projection (ESRI). */
         NORTH(".*\\bNorth\\b.*", null),
 
-        /** <cite>"Stereographic South Pole"</cite> projection (ESRI). */
+        /** <q>Stereographic South Pole</q> projection (ESRI). */
         SOUTH(".*\\bSouth\\b.*", null);
 
         /** Name pattern for this variant.    */ private final Pattern operationName;
@@ -120,11 +120,11 @@ public class PolarStereographic extends ConformalProjection {
      * The {@code method} argument can be the description of one of the following:
      *
      * <ul>
-     *   <li><cite>"Polar Stereographic (Variant A)"</cite> (EPSG:9810).</li>
-     *   <li><cite>"Polar Stereographic (Variant B)"</cite> (EPSG:9829).</li>
-     *   <li><cite>"Polar Stereographic (Variant C)"</cite> (EPSG:9830).</li>
-     *   <li><cite>"Stereographic North Pole"</cite> (ESRI).</li>
-     *   <li><cite>"Stereographic South Pole"</cite> (ESRI).</li>
+     *   <li><q>Polar Stereographic (Variant A)</q> (EPSG:9810).</li>
+     *   <li><q>Polar Stereographic (Variant B)</q> (EPSG:9829).</li>
+     *   <li><q>Polar Stereographic (Variant C)</q> (EPSG:9830).</li>
+     *   <li><q>Stereographic North Pole</q> (ESRI).</li>
+     *   <li><q>Stereographic South Pole</q> (ESRI).</li>
      * </ul>
      *
      * @param method      description of the projection parameters.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Polyconic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Polyconic.java
index 9fd33184d8..d46f485a7f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Polyconic.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Polyconic.java
@@ -104,7 +104,7 @@ public class Polyconic extends MeridianArcBased {
      * The {@code method} argument can be the description of one of the following:
      *
      * <ul>
-     *   <li><cite>"American Polyconic"</cite>.</li>
+     *   <li><q>American Polyconic</q>.</li>
      * </ul>
      *
      * @param method      description of the projection parameters.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Sinusoidal.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Sinusoidal.java
index e980f3d8f7..0c8931bd47 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Sinusoidal.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Sinusoidal.java
@@ -34,7 +34,7 @@ import static org.apache.sis.referencing.operation.provider.Sinusoidal.*;
 
 
 /**
- * <cite>Sinusoidal equal-area</cite> projection, also known as <cite>"Sanson-Flamsteed"</cite>.
+ * <cite>Sinusoidal equal-area</cite> projection, also known as <q>Sanson-Flamsteed</q>.
  * See the following references for an overview:
  * <ul>
  *   <li><a href="https://en.wikipedia.org/wiki/Sinusoidal_projection">Sinusoidal projection on Wikipedia</a></li>
@@ -59,7 +59,7 @@ public class Sinusoidal extends MeridianArcBased {
     private enum Variant implements ProjectionVariant {
         // Declaration order matter. Patterns are matched in that order.
 
-        /** The <cite>"Pseudo sinusoidal equal-area"</cite> projection. */
+        /** The <q>Pseudo sinusoidal equal-area</q> projection. */
         PSEUDO(".*\\bPseudo.*");
 
         /** Name pattern for this variant. */
@@ -111,7 +111,7 @@ public class Sinusoidal extends MeridianArcBased {
      * The {@code method} argument can be the description of one of the following:
      *
      * <ul>
-     *   <li><cite>"Sinusoidal"</cite>, also known as <cite>"Sanson-Flamsteed"</cite>.</li>
+     *   <li><q>Sinusoidal</q>, also known as <q>Sanson-Flamsteed</q>.</li>
      * </ul>
      *
      * @param method      description of the projection parameters.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java
index efc60bee60..1a006e0e89 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java
@@ -186,8 +186,8 @@ public class TransverseMercator extends NormalizedProjection {
      * The {@code method} argument can be the description of one of the following:
      *
      * <ul>
-     *   <li><cite>"Transverse Mercator"</cite>.</li>
-     *   <li><cite>"Transverse Mercator (South Orientated)"</cite>.</li>
+     *   <li><q>Transverse Mercator</q>.</li>
+     *   <li><q>Transverse Mercator (South Orientated)</q>.</li>
      * </ul>
      *
      * @param  method      description of the projection parameters.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ZonedGridSystem.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ZonedGridSystem.java
index 2d3b291ba4..0c391b5925 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ZonedGridSystem.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ZonedGridSystem.java
@@ -110,7 +110,7 @@ public class ZonedGridSystem extends AbstractMathTransform2D implements Serializ
      * The {@code method} argument can be the description of one of the following:
      *
      * <ul>
-     *   <li><cite>"Transverse Mercator Zoned Grid System"</cite>.</li>
+     *   <li><q>Transverse Mercator Zoned Grid System</q>.</li>
      * </ul>
      *
      * Contrarily to other map projections in this package, there is no {@code createMapProjection(MathTransformFactory)}
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/package-info.java
index cd70f90b48..15b8d4a05c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/package-info.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/package-info.java
@@ -121,12 +121,12 @@
  *   <li>A {@linkplain org.apache.sis.referencing.operation.transform.ContextualParameters#getMatrix denormalization} affine transform</li>
  * </ul>
  *
- * The first step (<cite>"normalization"</cite>) converts longitude and latitude values from degrees to radians
+ * The first step (<q>normalization</q>) converts longitude and latitude values from degrees to radians
  * and removes the <cite>central meridian</cite> from the longitude.
- * The last step (<cite>"denormalization"</cite>) multiplies the result of the middle step by the global scale factor
+ * The last step (<q>denormalization</q>) multiplies the result of the middle step by the global scale factor
  * (typically the product of the <cite>scale factor</cite> with the <cite>semi-major</cite> axis length),
  * then adds the <cite>false easting</cite> and <cite>false northing</cite>.
- * This means that the middle step (<cite>"normalized projection"</cite>) is performed on an ellipse (or sphere)
+ * This means that the middle step (<q>normalized projection</q>) is performed on an ellipse (or sphere)
  * having a semi-major axis of 1.
  *
  * <p>In other words, the
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbridgedMolodensky.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbridgedMolodensky.java
index e2b2ae2623..06318f8275 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbridgedMolodensky.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbridgedMolodensky.java
@@ -28,7 +28,7 @@ import org.apache.sis.parameter.Parameters;
 
 
 /**
- * The provider for <cite>"Abridged Molodensky transformation"</cite> (EPSG:9605).
+ * The provider for <q>Abridged Molodensky transformation</q> (EPSG:9605).
  * This provider constructs transforms between two geographic reference systems without passing though a geocentric one.
  * This class nevertheless extends {@link GeocentricAffineBetweenGeographic} because it is an approximation of
  * {@link GeocentricTranslation3D}.
@@ -37,8 +37,8 @@ import org.apache.sis.parameter.Parameters;
  * But remaining parameters are specified in different ways depending on the authority:</p>
  *
  * <ul>
- *   <li>EPSG defines <cite>"Semi-major axis length difference"</cite>
- *       and <cite>"Flattening difference"</cite> parameters.</li>
+ *   <li>EPSG defines <q>Semi-major axis length difference</q>
+ *       and <q>Flattening difference</q> parameters.</li>
  *   <li>OGC rather defines "{@code src_semi_major}", "{@code src_semi_minor}",
  *       "{@code tgt_semi_major}", "{@code tgt_semi_minor}" and "{@code dim}" parameters.</li>
  * </ul>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractProvider.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractProvider.java
index 4fbce6ded9..9dd0014a2f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractProvider.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractProvider.java
@@ -263,7 +263,7 @@ public abstract class AbstractProvider extends DefaultOperationMethod implements
      * Otherwise returns {@code null}. The ambiguities that need to be resolved are:
      *
      * <ul>
-     *   <li>Method <cite>"Geographic/geocentric conversions"</cite> (EPSG:9602) can be either:
+     *   <li>Method <q>Geographic/geocentric conversions</q> (EPSG:9602) can be either:
      *     <ul>
      *       <li>{@code "Ellipsoid_To_Geocentric"} (implemented by {@link GeographicToGeocentric}</li>
      *       <li>{@code "Geocentric_To_Ellipsoid"} (implemented by {@link GeocentricToGeographic}</li>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractStereographic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractStereographic.java
index 3ce741249d..2af44d643c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractStereographic.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractStereographic.java
@@ -82,7 +82,7 @@ abstract class AbstractStereographic extends MapProjection {
     /**
      * {@inheritDoc}
      *
-     * The default implementation creates a projection for the <cite>"Polar Stereographic"</cite> case only.
+     * The default implementation creates a projection for the <q>Polar Stereographic</q> case only.
      * Subclasses need to override if they want to support other cases (oblique and equatorial).
      *
      * @return the map projection created from the given parameter values.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Affine.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Affine.java
index 943a48b262..d337b56c7d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Affine.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Affine.java
@@ -36,7 +36,7 @@ import org.apache.sis.referencing.operation.transform.LinearTransform;
 
 
 /**
- * The provider for <cite>"Affine parametric transformation"</cite> (EPSG:9624).
+ * The provider for <q>Affine parametric transformation</q> (EPSG:9624).
  * The set of available parameters depends on the matrix size, which is 3×3 by default.
  *
  * <table class="sis">
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AlbersEqualArea.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AlbersEqualArea.java
index e21f417836..aaf3a764e5 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AlbersEqualArea.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AlbersEqualArea.java
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.operation.projection.NormalizedProjection;
 
 
 /**
- * The provider for <cite>"Albers Equal Area"</cite> projection (EPSG:9822).
+ * The provider for <q>Albers Equal Area</q> projection (EPSG:9822).
  *
  * @author  Rueben Schulz (UBC)
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AxisOrderReversal.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AxisOrderReversal.java
index f6bddabd31..5e5c0da1c7 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AxisOrderReversal.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AxisOrderReversal.java
@@ -29,7 +29,7 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
 
 
 /**
- * The provider for <cite>"axis order reversal (2D)"</cite> (EPSG:9843).
+ * The provider for <q>axis order reversal (2D)</q> (EPSG:9843).
  * This is a trivial operation that just swap the two first axes.
  * The inverse operation is this operation itself.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AxisOrderReversal3D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AxisOrderReversal3D.java
index 8611937729..f3b6b5404b 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AxisOrderReversal3D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AxisOrderReversal3D.java
@@ -21,7 +21,7 @@ import org.opengis.parameter.ParameterDescriptorGroup;
 
 
 /**
- * The provider for <cite>"axis order reversal (geographic3D horizontal)"</cite> (EPSG:9844).
+ * The provider for <q>axis order reversal (geographic3D horizontal)</q> (EPSG:9844).
  * This is a trivial operation that just swap the two first axes.
  * The inverse operation is this operation itself.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AzimuthalEquidistantSpherical.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AzimuthalEquidistantSpherical.java
index a7e3d2b913..1f332c8b47 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AzimuthalEquidistantSpherical.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AzimuthalEquidistantSpherical.java
@@ -24,7 +24,7 @@ import org.apache.sis.referencing.operation.projection.NormalizedProjection;
 
 
 /**
- * The provider for <cite>"Azimuthal Equidistant (Spherical)"</cite> projection.
+ * The provider for <q>Azimuthal Equidistant (Spherical)</q> projection.
  * This projection method has no EPSG code.
  *
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CassiniSoldner.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CassiniSoldner.java
index 5b5b00b530..536610fd2e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CassiniSoldner.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CassiniSoldner.java
@@ -26,7 +26,7 @@ import org.apache.sis.parameter.Parameters;
 
 
 /**
- * The provider for <cite>"Cassini-Soldner"</cite> projection (EPSG:9806).
+ * The provider for <q>Cassini-Soldner</q> projection (EPSG:9806).
  * This projection is similar to {@link TransverseMercator}.
  *
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CoordinateFrameRotation.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CoordinateFrameRotation.java
index db85356973..fdced6e551 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CoordinateFrameRotation.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CoordinateFrameRotation.java
@@ -21,7 +21,7 @@ import org.opengis.parameter.ParameterDescriptorGroup;
 
 
 /**
- * The provider for <cite>"Coordinate Frame rotation (geocentric domain)"</cite> (EPSG:1032).
+ * The provider for <q>Coordinate Frame rotation (geocentric domain)</q> (EPSG:1032).
  * This is the same transformation than "{@link PositionVector7Param}"
  * except that the rotation angles have the opposite sign.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CoordinateFrameRotation2D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CoordinateFrameRotation2D.java
index 7884c47b8a..5a8f8c664e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CoordinateFrameRotation2D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CoordinateFrameRotation2D.java
@@ -22,7 +22,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
 
 
 /**
- * The provider for <cite>"Coordinate Frame rotation (geog2D domain)"</cite> (EPSG:9607).
+ * The provider for <q>Coordinate Frame rotation (geog2D domain)</q> (EPSG:9607).
  * This is the same transformation than "{@link PositionVector7Param}"
  * except that the rotation angles have the opposite sign.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CoordinateFrameRotation3D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CoordinateFrameRotation3D.java
index 20b208f818..fd56a34553 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CoordinateFrameRotation3D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/CoordinateFrameRotation3D.java
@@ -22,7 +22,7 @@ import org.opengis.parameter.ParameterDescriptorGroup;
 
 
 /**
- * The provider for <cite>"Coordinate Frame rotation (geog3D domain)"</cite> (EPSG:1038).
+ * The provider for <q>Coordinate Frame rotation (geog3D domain)</q> (EPSG:1038).
  * This is the same transformation than "{@link PositionVector7Param}"
  * except that the rotation angles have the opposite sign.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Equirectangular.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Equirectangular.java
index 15ec73ed12..02556ab862 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Equirectangular.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Equirectangular.java
@@ -42,10 +42,10 @@ import static java.lang.Math.*;
 
 
 /**
- * The provider for <cite>"Equidistant Cylindrical (Spherical)"</cite> projection
+ * The provider for <q>Equidistant Cylindrical (Spherical)</q> projection
  * (EPSG:1029, <span class="deprecated">EPSG:9823</span>).
  * In the particular case where the longitude of origin and the standard parallel are 0°,
- * this projection is also known as <cite>"Plate Carrée"</cite>.
+ * this projection is also known as <q>Plate Carrée</q>.
  *
  * <p>At the difference of most other map projection providers, this class does not extend {@link MapProjection}
  * because it does not create non-liner kernel. Instead, the projection created by this class is implemented
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java
index d30f4e86f9..ce0123d5ea 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java
@@ -61,16 +61,16 @@ import static org.apache.sis.util.internal.Constants.DIM;
 
 
 /**
- * The provider for <cite>"Geocentric translation by Grid Interpolation (IGN)"</cite> (EPSG:1087).
- * This method replaces the deprecated <cite>"France geocentric interpolation"</cite> (ESPG:9655).
+ * The provider for <q>Geocentric translation by Grid Interpolation (IGN)</q> (EPSG:1087).
+ * This method replaces the deprecated <q>France geocentric interpolation</q> (ESPG:9655).
  * This operation requires a grid file provided by the French mapping agency.
  *
  * <p><b>Source:</b> IGN document {@code NTG_88.pdf},
- * <cite>"Grille de paramètres de transformation de coordonnées"</cite>
+ * <q>Grille de paramètres de transformation de coordonnées</q>
  * at <a href="http://www.ign.fr">http://www.ign.fr</a>.</p>
  *
  * In principle, this operation method is designed specifically for the French mapping
- * (e.g. EPSG:1053 <cite>"NTF to RGF93 (1)"</cite>) using the following hard-coded parameters:
+ * (e.g. EPSG:1053 <q>NTF to RGF93 (1)</q>) using the following hard-coded parameters:
  * <ul>
  *   <li>Source ellipsoid: Clarke 1880</li>
  *   <li>Target ellipsoid: RGF93</li>
@@ -264,7 +264,7 @@ public final class FranceGeocentricInterpolation extends GeodeticOperation {
 
     /**
      * Returns {@code true} if the given path seems to be a grid published by the French mapping agency for France.
-     * In principle this <cite>"France geocentric interpolation"</cite> is designed specifically for use with the
+     * In principle this <q>France geocentric interpolation</q> is designed specifically for use with the
      * {@code "gr3df97a.txt"} grid, but in fact the Apache SIS implementation should be flexible enough for use
      * with other area.
      *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricToGeographic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricToGeographic.java
index fae4b5e854..9315623d72 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricToGeographic.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricToGeographic.java
@@ -30,7 +30,7 @@ import org.apache.sis.parameter.Parameters;
 
 
 /**
- * The provider for the <strong>inverse</strong> of <cite>"Geographic/geocentric conversions"</cite> (EPSG:9602).
+ * The provider for the <strong>inverse</strong> of <q>Geographic/geocentric conversions</q> (EPSG:9602).
  * This provider creates transforms from geocentric to geographic coordinate reference systems.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricToTopocentric.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricToTopocentric.java
index fdd73f77c3..852892acb1 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricToTopocentric.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricToTopocentric.java
@@ -41,7 +41,7 @@ import static java.lang.Math.toRadians;
 
 
 /**
- * The provider for the <cite>"Geocentric/topocentric conversions"</cite> (EPSG:9836).
+ * The provider for the <q>Geocentric/topocentric conversions</q> (EPSG:9836).
  * This operation is implemented using existing {@link MathTransform} implementations;
  * there is no need for a class specifically for this transform.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricTranslation.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricTranslation.java
index 39e938f91b..d078d711a1 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricTranslation.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricTranslation.java
@@ -21,7 +21,7 @@ import org.opengis.parameter.ParameterDescriptorGroup;
 
 
 /**
- * The provider for <cite>"Geocentric translations (geocentric domain)"</cite> (EPSG:1031).
+ * The provider for <q>Geocentric translations (geocentric domain)</q> (EPSG:1031).
  * This is a special case of {@link PositionVector7Param} where only the translation terms
  * can be set to a non-null value.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricTranslation2D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricTranslation2D.java
index cc18bf31c7..145146d9cc 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricTranslation2D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricTranslation2D.java
@@ -22,7 +22,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
 
 
 /**
- * The provider for <cite>"Geocentric translations (geog2D domain)"</cite> (EPSG:9603).
+ * The provider for <q>Geocentric translations (geog2D domain)</q> (EPSG:9603).
  * This is a special case of {@link PositionVector7Param2D} where only the translation
  * terms can be set to a non-null value.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricTranslation3D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricTranslation3D.java
index 619ea1a64f..7b7b471765 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricTranslation3D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricTranslation3D.java
@@ -22,7 +22,7 @@ import org.opengis.parameter.ParameterDescriptorGroup;
 
 
 /**
- * The provider for <cite>"Geocentric translations (geog3D domain)"</cite> (EPSG:1035).
+ * The provider for <q>Geocentric translations (geog3D domain)</q> (EPSG:1035).
  * This is a special case of {@link PositionVector7Param3D} where only the translation
  * terms can be set to a non-null value.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic2Dto3D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic2Dto3D.java
index a2c1adb7bc..3327ffc251 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic2Dto3D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic2Dto3D.java
@@ -32,7 +32,7 @@ import org.apache.sis.parameter.Parameters;
 
 
 /**
- * The provider for <cite>"Geographic 2D to 3D conversion"</cite>.
+ * The provider for <q>Geographic 2D to 3D conversion</q>.
  * The default operation sets the ellipsoidal height to zero.
  *
  * <p>This operation is a SIS extension; the EPSG dataset defines only the 3D to 2D case.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic3Dto2D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic3Dto2D.java
index 091dd650c1..483ee3f2d2 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic3Dto2D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic3Dto2D.java
@@ -34,7 +34,7 @@ import org.apache.sis.referencing.util.WKTUtilities;
 
 
 /**
- * The provider for <cite>"Geographic 3D to 2D conversion"</cite> (EPSG:9659).
+ * The provider for <q>Geographic 3D to 2D conversion</q> (EPSG:9659).
  * This is a trivial operation that just drop the height in a geographic coordinate.
  * The inverse operation arbitrarily sets the ellipsoidal height to zero.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicAndVerticalOffsets.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicAndVerticalOffsets.java
index 29748c2d4a..200f0c7311 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicAndVerticalOffsets.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicAndVerticalOffsets.java
@@ -25,8 +25,8 @@ import org.apache.sis.measure.Units;
 
 
 /**
- * The provider for <cite>"Geographic2D with Height Offsets"</cite> (EPSG:9618).
- * This is not the same than a <cite>"Geographic3D offsets"</cite> because this
+ * The provider for <q>Geographic2D with Height Offsets</q> (EPSG:9618).
+ * This is not the same than a <q>Geographic3D offsets</q> because this
  * operation also performs a simplified transformation from ellipsoidal height
  * to geoidal height, as can be seen from the difference in parameter name.
  * For a "Geographic3D offsets" with ellipsoidal heights, see the parent class.
@@ -48,7 +48,7 @@ public final class GeographicAndVerticalOffsets extends GeographicOffsets {
     private static final long serialVersionUID = 7822664525013018023L;
 
     /**
-     * The operation parameter descriptor for the <cite>"Geoid undulation"</cite> parameter value.
+     * The operation parameter descriptor for the <q>Geoid undulation</q> parameter value.
      *
      * @see #TZ
      *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicOffsets.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicOffsets.java
index 87c15e341c..372ea31c97 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicOffsets.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicOffsets.java
@@ -34,7 +34,7 @@ import org.apache.sis.measure.Units;
 
 /**
  * Base class for all transformations that perform a translation in the geographic domain.
- * This base class defines a provider for <cite>"Geographic3D offsets"</cite> (EPSG:9660),
+ * This base class defines a provider for <q>Geographic3D offsets</q> (EPSG:9660),
  * but subclasses will provide different operations.
  *
  * @author  Martin Desruisseaux (Geomatys)
@@ -47,7 +47,7 @@ public class GeographicOffsets extends GeodeticOperation {
     private static final long serialVersionUID = -6246011184175753328L;
 
     /**
-     * The operation parameter descriptor for the <cite>"Longitude offset"</cite> parameter value.
+     * The operation parameter descriptor for the <q>Longitude offset</q> parameter value.
      *
      * <!-- Generated by ParameterNameTableGenerator -->
      * <table class="sis">
@@ -58,7 +58,7 @@ public class GeographicOffsets extends GeodeticOperation {
     static final ParameterDescriptor<Double> TX;
 
     /**
-     * The operation parameter descriptor for the <cite>"Latitude offset"</cite> parameter value.
+     * The operation parameter descriptor for the <q>Latitude offset</q> parameter value.
      *
      * <!-- Generated by ParameterNameTableGenerator -->
      * <table class="sis">
@@ -69,7 +69,7 @@ public class GeographicOffsets extends GeodeticOperation {
     static final ParameterDescriptor<Double> TY;
 
     /**
-     * The operation parameter descriptor for the <cite>"Vertical Offset"</cite> parameter value.
+     * The operation parameter descriptor for the <q>Vertical Offset</q> parameter value.
      *
      * <!-- Generated by ParameterNameTableGenerator -->
      * <table class="sis">
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicOffsets2D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicOffsets2D.java
index b0c3b40bf8..f53ae2e8e2 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicOffsets2D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicOffsets2D.java
@@ -27,7 +27,7 @@ import org.apache.sis.parameter.Parameters;
 
 
 /**
- * The provider for <cite>"Geographic2D offsets"</cite> (EPSG:9619).
+ * The provider for <q>Geographic2D offsets</q> (EPSG:9619).
  *
  * @author  Martin Desruisseaux (Geomatys)
  */
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicToGeocentric.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicToGeocentric.java
index 4e5f5da4e4..b330540f86 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicToGeocentric.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicToGeocentric.java
@@ -37,7 +37,7 @@ import org.apache.sis.util.internal.Constants;
 
 
 /**
- * The provider for <cite>"Geographic/geocentric conversions"</cite> (EPSG:9602).
+ * The provider for <q>Geographic/geocentric conversions</q> (EPSG:9602).
  * This provider creates transforms from geographic to geocentric coordinate reference systems.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
@@ -135,7 +135,7 @@ public final class GeographicToGeocentric extends GeodeticOperation {
     }
 
     /**
-     * If the user asked for the <cite>"Geographic/geocentric conversions"</cite> operation but the parameter types
+     * If the user asked for the <q>Geographic/geocentric conversions</q> operation but the parameter types
      * suggest that (s)he intended to convert in the opposite direction, return the name of operation method to use.
      * We need this check because EPSG defines a single operation method for both {@code "Ellipsoid_To_Geocentric"}
      * and {@code "Geocentric_To_Ellipsoid"} methods.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicToTopocentric.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicToTopocentric.java
index 20972a7dce..340b67c95a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicToTopocentric.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicToTopocentric.java
@@ -32,7 +32,7 @@ import org.apache.sis.measure.Units;
 
 
 /**
- * The provider for the <cite>"Geographic/topocentric conversions"</cite> (EPSG:9837).
+ * The provider for the <q>Geographic/topocentric conversions</q> (EPSG:9837).
  * This operation is implemented using existing {@link MathTransform} implementations;
  * there is no need for a class specifically for this transform.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/HyperbolicCassiniSoldner.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/HyperbolicCassiniSoldner.java
index 6274d91670..eec05b0e6c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/HyperbolicCassiniSoldner.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/HyperbolicCassiniSoldner.java
@@ -21,7 +21,7 @@ import org.opengis.parameter.ParameterDescriptorGroup;
 
 
 /**
- * The provider for <cite>"Hyperbolic Cassini-Soldner"</cite> projection (EPSG:9833).
+ * The provider for <q>Hyperbolic Cassini-Soldner</q> projection (EPSG:9833).
  * This is a slight modification of {@link CassiniSoldner} and shares the same parameters.
  *
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Interpolation1D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Interpolation1D.java
index f9acfc6713..e3c949e6a5 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Interpolation1D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Interpolation1D.java
@@ -43,7 +43,7 @@ public final class Interpolation1D extends AbstractProvider {
     private static final long serialVersionUID = -2571645687075958970L;
 
     /**
-     * The operation parameter descriptor for the <cite>"preimage"</cite> parameter value.
+     * The operation parameter descriptor for the <q>preimage</q> parameter value.
      * This parameter is optional and often omitted.
      *
      * @see <a href="https://en.wikipedia.org/wiki/Image_%28mathematics%29#Inverse_image">Preimage on Wikipedia</a>
@@ -52,7 +52,7 @@ public final class Interpolation1D extends AbstractProvider {
     private static final ParameterDescriptor<double[]> PREIMAGE;
 
     /**
-     * The operation parameter descriptor for the <cite>"values"</cite> parameter value.
+     * The operation parameter descriptor for the <q>values</q> parameter value.
      */
     private static final ParameterDescriptor<double[]> VALUES;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertAzimuthalEqualArea.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertAzimuthalEqualArea.java
index e5a940e800..d16276e27d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertAzimuthalEqualArea.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertAzimuthalEqualArea.java
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.operation.projection.NormalizedProjection;
 
 
 /**
- * The provider for <cite>"Lambert Azimuthal Equal Area"</cite> projection (EPSG:9820).
+ * The provider for <q>Lambert Azimuthal Equal Area</q> projection (EPSG:9820).
  *
  * @author  Martin Desruisseaux (Geomatys)
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertAzimuthalEqualAreaSpherical.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertAzimuthalEqualAreaSpherical.java
index d0ba4c4de1..6dcdfaec6e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertAzimuthalEqualAreaSpherical.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertAzimuthalEqualAreaSpherical.java
@@ -23,7 +23,7 @@ import org.apache.sis.parameter.ParameterBuilder;
 
 
 /**
- * The provider for <cite>"Lambert Azimuthal Equal Area (Spherical)"</cite> projection (EPSG:1027).
+ * The provider for <q>Lambert Azimuthal Equal Area (Spherical)</q> projection (EPSG:1027).
  *
  * @author  Martin Desruisseaux (Geomatys)
  */
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformal1SP.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformal1SP.java
index dc50534884..a035844a72 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformal1SP.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformal1SP.java
@@ -24,7 +24,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
 
 
 /**
- * The provider for <cite>"Lambert Conic Conformal (1SP)"</cite> projection (EPSG:9801).
+ * The provider for <q>Lambert Conic Conformal (1SP)</q> projection (EPSG:9801).
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @author  Rueben Schulz (UBC)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformal2SP.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformal2SP.java
index 0b425f926a..b9d1cf7caf 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformal2SP.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformal2SP.java
@@ -25,7 +25,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
 
 
 /**
- * The provider for <cite>"Lambert Conic Conformal (2SP)"</cite> projection (EPSG:9802).
+ * The provider for <q>Lambert Conic Conformal (2SP)</q> projection (EPSG:9802).
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @author  Rueben Schulz (UBC)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformalBelgium.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformalBelgium.java
index 193d283ae3..9a32fe9b68 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformalBelgium.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformalBelgium.java
@@ -22,7 +22,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
 
 
 /**
- * The provider for <cite>"Lambert Conic Conformal (2SP Belgium)"</cite> projection (EPSG:9803).
+ * The provider for <q>Lambert Conic Conformal (2SP Belgium)</q> projection (EPSG:9803).
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @author  Rueben Schulz (UBC)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformalMichigan.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformalMichigan.java
index 5a13f07fbe..293d3df310 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformalMichigan.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformalMichigan.java
@@ -24,7 +24,7 @@ import org.apache.sis.measure.Units;
 
 
 /**
- * The provider for <cite>"Lambert Conic Conformal (2SP Michigan)"</cite> projection (EPSG:1051).
+ * The provider for <q>Lambert Conic Conformal (2SP Michigan)</q> projection (EPSG:1051).
  *
  * @author  Martin Desruisseaux (Geomatys)
  */
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformalWest.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformalWest.java
index 68e94550cf..a933357d7c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformalWest.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformalWest.java
@@ -24,11 +24,11 @@ import org.apache.sis.parameter.ParameterBuilder;
 
 
 /**
- * The provider for <cite>"Lambert Conic Conformal (West Orientated)"</cite> projection (EPSG:9826).
+ * The provider for <q>Lambert Conic Conformal (West Orientated)</q> projection (EPSG:9826).
  * In this projection method, the <var>x</var> values increase toward West. However, the projection
  * is defined in such a way that the sign of <var>x</var> values are reversed before to apply the
- * <cite>"false easting"</cite> translation. As a consequence of this operation order, despite its
- * name the <cite>"false easting"</cite> is effectively a <cite>"false westing"</cite> (FW) parameter.
+ * <q>false easting</q> translation. As a consequence of this operation order, despite its
+ * name the <q>false easting</q> is effectively a <q>false westing</q> (FW) parameter.
  * See §1.3.1.3 in <i>Geomatics Guidance Note number 7, part 2 – April 2015</i>.
  *
  * <p>In Apache SIS implementation, this operation method does <strong>not</strong> reverse the sign of
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertCylindricalEqualArea.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertCylindricalEqualArea.java
index e1369421e8..11060b8207 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertCylindricalEqualArea.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertCylindricalEqualArea.java
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.operation.projection.CylindricalEqualArea;
 
 
 /**
- * The provider for <cite>"Lambert Cylindrical Equal Area"</cite> projection (EPSG:9835).
+ * The provider for <q>Lambert Cylindrical Equal Area</q> projection (EPSG:9835).
  *
  * @author  Martin Desruisseaux (Geomatys)
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertCylindricalEqualAreaSpherical.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertCylindricalEqualAreaSpherical.java
index 33441eb4bf..7610dd0d4c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertCylindricalEqualAreaSpherical.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertCylindricalEqualAreaSpherical.java
@@ -25,7 +25,7 @@ import org.apache.sis.referencing.operation.projection.CylindricalEqualArea;
 
 
 /**
- * The provider for <cite>"Lambert Cylindrical Equal Area (Spherical)"</cite> projection (EPSG:9834).
+ * The provider for <q>Lambert Cylindrical Equal Area (Spherical)</q> projection (EPSG:9834).
  *
  * @author  Martin Desruisseaux (Geomatys)
  */
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LongitudeRotation.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LongitudeRotation.java
index c5a84c5be3..d2aa9475f3 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LongitudeRotation.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LongitudeRotation.java
@@ -28,7 +28,7 @@ import org.apache.sis.parameter.Parameters;
 
 
 /**
- * The provider for <cite>"Longitude rotation"</cite> (EPSG:9601).
+ * The provider for <q>Longitude rotation</q> (EPSG:9601).
  * The "Longitude rotation" is created as an affine transform containing only a translation term in degrees.
  * Advantage of using an affine transform for such simple operation is that this {@code AffineTransform} can
  * be efficiently concatenated with other affine transform instances.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mercator1SP.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mercator1SP.java
index 62d293a9fa..8a02e29fff 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mercator1SP.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mercator1SP.java
@@ -25,7 +25,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
 
 
 /**
- * The provider for <cite>"Mercator (variant A)"</cite> projection (EPSG:9804).
+ * The provider for <q>Mercator (variant A)</q> projection (EPSG:9804).
  * EPSG defines two projections with the same parameters, 1026 being the spherical case and 9804 the ellipsoidal case.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mercator2SP.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mercator2SP.java
index 2a34edc893..b4dd9f1f5b 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mercator2SP.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mercator2SP.java
@@ -25,7 +25,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
 
 
 /**
- * The provider for <cite>"Mercator (variant B)"</cite> projection (EPSG:9805).
+ * The provider for <q>Mercator (variant B)</q> projection (EPSG:9805).
  *
  * <p>This provider reuses some of the parameters defined in {@link Mercator2SP}.</p>
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MercatorAuxiliarySphere.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MercatorAuxiliarySphere.java
index bb128b43f1..87129c0d00 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MercatorAuxiliarySphere.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MercatorAuxiliarySphere.java
@@ -24,7 +24,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
 
 
 /**
- * The provider for <cite>"Mercator Auxiliary Sphere"</cite> projection (defined by ESRI).
+ * The provider for <q>Mercator Auxiliary Sphere</q> projection (defined by ESRI).
  * This is often equivalent to {@link PseudoMercator}.
  *
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MercatorSpherical.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MercatorSpherical.java
index eaf7e09147..079d290174 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MercatorSpherical.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MercatorSpherical.java
@@ -24,7 +24,7 @@ import org.apache.sis.parameter.ParameterBuilder;
 
 
 /**
- * The provider for <cite>"Mercator (Spherical)"</cite> projection (EPSG:1026, <span class="deprecated">EPSG:9841</span>).
+ * The provider for <q>Mercator (Spherical)</q> projection (EPSG:1026, <span class="deprecated">EPSG:9841</span>).
  * This provider reuses all parameters defined in {@link Mercator2SP}, except that the standard parallel is made optional
  * since it is not formally a parameter of this projection.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MillerCylindrical.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MillerCylindrical.java
index bf1b9dd7d4..893c2333c5 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MillerCylindrical.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MillerCylindrical.java
@@ -23,7 +23,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
 
 
 /**
- * The provider for <cite>"Miller Cylindrical"</cite> projection.
+ * The provider for <q>Miller Cylindrical</q> projection.
  * This is a {@link Mercator1SP} projection with the following modifications:
  *
  * <ol>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ModifiedAzimuthalEquidistant.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ModifiedAzimuthalEquidistant.java
index 34f8605234..085cc5718d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ModifiedAzimuthalEquidistant.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ModifiedAzimuthalEquidistant.java
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.operation.projection.NormalizedProjection;
 
 
 /**
- * The provider for <cite>"Modified Azimuthal Equidistant"</cite> projection (EPSG:9832).
+ * The provider for <q>Modified Azimuthal Equidistant</q> projection (EPSG:9832).
  *
  * <h2>Relationship with "Azimuthal Equidistant"</h2>
  * The <cite>Modified Azimuthal Equidistant</cite> projection is an approximation of a theoretically
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mollweide.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mollweide.java
index 63a077526b..6fd95c4b2a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mollweide.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mollweide.java
@@ -26,7 +26,7 @@ import org.apache.sis.referencing.operation.projection.NormalizedProjection;
 
 
 /**
- * The provider for <cite>"Mollweide"</cite> (also known as <cite>"Homalographic"</cite>) projection.
+ * The provider for <q>Mollweide</q> (also known as <q>Homalographic</q>) projection.
  * As of version 9.4 of EPSG geodetic dataset, there is no known EPSG code for this projection.
  *
  * @author  Johann Sorel (Geomatys)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Molodensky.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Molodensky.java
index d825c79b8e..03e2b1faaa 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Molodensky.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Molodensky.java
@@ -42,7 +42,7 @@ import org.apache.sis.util.resources.Errors;
 
 
 /**
- * The provider for <cite>"Molodensky transformation"</cite> (EPSG:9604).
+ * The provider for <q>Molodensky transformation</q> (EPSG:9604).
  * This provider constructs transforms between two geographic reference systems without passing though a geocentric one.
  * This class nevertheless extends {@link GeocentricAffineBetweenGeographic} because it is an approximation of
  * {@link GeocentricTranslation3D}.
@@ -51,8 +51,8 @@ import org.apache.sis.util.resources.Errors;
  * But remaining parameters are specified in different ways depending on the authority:</p>
  *
  * <ul>
- *   <li>EPSG defines <cite>"Semi-major axis length difference"</cite>
- *       and <cite>"Flattening difference"</cite> parameters.</li>
+ *   <li>EPSG defines <q>Semi-major axis length difference</q>
+ *       and <q>Flattening difference</q> parameters.</li>
  *   <li>OGC rather defines "{@code src_semi_major}", "{@code src_semi_minor}",
  *       "{@code tgt_semi_major}", "{@code tgt_semi_minor}" and "{@code dim}" parameters.</li>
  * </ul>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NADCON.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NADCON.java
index 24bed0b613..967ab4462b 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NADCON.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NADCON.java
@@ -44,7 +44,7 @@ import org.apache.sis.measure.Units;
 
 
 /**
- * The provider for <cite>"North American Datum Conversion"</cite> (EPSG:9613).
+ * The provider for <q>North American Datum Conversion</q> (EPSG:9613).
  * This transform requires data that are not bundled by default with Apache SIS.
  *
  * <p>The files given in parameters are theoretically binary files. However, this provider accepts also ASCII files.
@@ -64,7 +64,7 @@ public final class NADCON extends AbstractProvider {
     private static final long serialVersionUID = -4707304160205218546L;
 
     /**
-     * The operation parameter descriptor for the <cite>"Latitude difference file"</cite> parameter value.
+     * The operation parameter descriptor for the <q>Latitude difference file</q> parameter value.
      * The default value is {@code "conus.las"}.
      *
      * <!-- Generated by ParameterNameTableGenerator -->
@@ -80,7 +80,7 @@ public final class NADCON extends AbstractProvider {
     private static final ParameterDescriptor<URI> LATITUDE;
 
     /**
-     * The operation parameter descriptor for the <cite>"Longitude difference file"</cite> parameter value.
+     * The operation parameter descriptor for the <q>Longitude difference file</q> parameter value.
      * The default value is {@code "conus.los"}.
      *
      * <!-- Generated by ParameterNameTableGenerator -->
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv1.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv1.java
index 2a57771f4e..41d4391273 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv1.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv1.java
@@ -29,7 +29,7 @@ import org.apache.sis.parameter.ParameterBuilder;
 
 
 /**
- * The provider for <cite>"National Transformation version 1"</cite> (EPSG:9614).
+ * The provider for <q>National Transformation version 1</q> (EPSG:9614).
  * This transform requires data that are not bundled by default with Apache SIS.
  *
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java
index e7d8bd01b0..cc93bc84ae 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java
@@ -55,7 +55,7 @@ import org.apache.sis.measure.Units;
 
 
 /**
- * The provider for <cite>"National Transformation version 2"</cite> (EPSG:9615).
+ * The provider for <q>National Transformation version 2</q> (EPSG:9615).
  * This transform requires data that are not bundled by default with Apache SIS.
  *
  * @author  Simon Reynard (Geomatys)
@@ -69,7 +69,7 @@ public final class NTv2 extends AbstractProvider {
     private static final long serialVersionUID = -4027618007780159180L;
 
     /**
-     * The operation parameter descriptor for the <cite>"Latitude and longitude difference file"</cite> parameter value.
+     * The operation parameter descriptor for the <q>Latitude and longitude difference file</q> parameter value.
      * The file extension is typically {@code ".gsb"}. There is no default value.
      *
      * <!-- Generated by ParameterNameTableGenerator -->
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercator.java
index 70d5507739..e2c8d54b87 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercator.java
@@ -27,7 +27,7 @@ import org.apache.sis.measure.Units;
 
 
 /**
- * The provider for <cite>"Hotine Oblique Mercator (variant A)"</cite> projection (EPSG:9812).
+ * The provider for <q>Hotine Oblique Mercator (variant A)</q> projection (EPSG:9812).
  * Also the parent class for all variants.
  *
  * @author  Rueben Schulz (UBC)
@@ -43,7 +43,7 @@ public class ObliqueMercator extends AbstractMercator {
     private static final long serialVersionUID = 9100327311220773612L;
 
     /**
-     * The {@value} EPSG identifier for <cite>"Hotine Oblique Mercator (variant A)"</cite>.
+     * The {@value} EPSG identifier for <q>Hotine Oblique Mercator (variant A)</q>.
      * Should be preferred to the name when available.
      * The {@code IDENTIFIER_OF_BASE} name is for avoiding confusion with
      * the {@code IDENTIFIER} name used in subclasses.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorCenter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorCenter.java
index 8392039946..027013eb9b 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorCenter.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorCenter.java
@@ -26,7 +26,7 @@ import static org.apache.sis.referencing.IdentifiedObjects.getIdentifier;
 
 
 /**
- * The provider for <cite>"Hotine Oblique Mercator (variant B)"</cite> projection (EPSG:9815).
+ * The provider for <q>Hotine Oblique Mercator (variant B)</q> projection (EPSG:9815).
  *
  * @author  Rueben Schulz (UBC)
  * @author  Martin Desruisseaux (Geomatys)
@@ -41,7 +41,7 @@ public final class ObliqueMercatorCenter extends ObliqueMercator {
     private static final long serialVersionUID = 1404490143062736127L;
 
     /**
-     * The {@value} EPSG identifier for <cite>"Hotine Oblique Mercator (variant B)"</cite>.
+     * The {@value} EPSG identifier for <q>Hotine Oblique Mercator (variant B)</q>.
      * Should be preferred to the name when available.
      */
     public static final String IDENTIFIER = "9815";
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorTwoPoints.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorTwoPoints.java
index a3803cedb6..4f4af29d81 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorTwoPoints.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorTwoPoints.java
@@ -27,7 +27,7 @@ import org.apache.sis.measure.Units;
 
 
 /**
- * The provider for <cite>"Oblique Mercator"</cite> projection specified by two points on the central line.
+ * The provider for <q>Oblique Mercator</q> projection specified by two points on the central line.
  * This is different than the classical {@linkplain ObliqueMercator Oblique Mercator}, which uses a central
  * point and azimuth. This projection is specific to ESRI software.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorTwoPointsCenter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorTwoPointsCenter.java
index a95231fdf8..a5ebc68bf3 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorTwoPointsCenter.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorTwoPointsCenter.java
@@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlTransient;
 
 
 /**
- * The provider for <cite>"Oblique Mercator"</cite> projection specified by two points on the central line,
+ * The provider for <q>Oblique Mercator</q> projection specified by two points on the central line,
  * with easting/northing specified at projection center instead of coordinate system natural origin.
  * This projection is specific to ESRI software.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueStereographic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueStereographic.java
index e88a80037f..52ed356294 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueStereographic.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueStereographic.java
@@ -26,7 +26,7 @@ import org.apache.sis.referencing.operation.projection.NormalizedProjection;
 
 
 /**
- * The provider for <cite>"Oblique Stereographic"</cite> projection (EPSG:9809).
+ * The provider for <q>Oblique Stereographic</q> projection (EPSG:9809).
  *
  * @author  Rueben Schulz (UBC)
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Orthographic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Orthographic.java
index 463c982384..13441cf90e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Orthographic.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Orthographic.java
@@ -29,7 +29,7 @@ import static org.apache.sis.referencing.operation.provider.AbstractProvider.bui
 
 
 /**
- * The provider for <cite>"Orthographic"</cite> projection (EPSG:9840).
+ * The provider for <q>Orthographic</q> projection (EPSG:9840).
  *
  * @author  Rueben Schulz (UBC)
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicA.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicA.java
index 80d1b7ab0c..c56ce9b9c3 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicA.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicA.java
@@ -31,7 +31,7 @@ import org.apache.sis.measure.Units;
 
 
 /**
- * The provider for <cite>"Polar Stereographic (variant A)"</cite> projection (EPSG:9810).
+ * The provider for <q>Polar Stereographic (variant A)</q> projection (EPSG:9810).
  * Also used for the definition of Universal Polar Stereographic (UPS) projection.
  *
  * @author  Rueben Schulz (UBC)
@@ -169,7 +169,7 @@ public final class PolarStereographicA extends AbstractStereographic {
      *
      * @param  group  the parameters for which to set the values.
      * @param  north  {@code true} for North pole, or {@code false} for South pole.
-     * @return a name like <cite>"Universal Polar Stereographic North"</cite>,
+     * @return a name like <q>Universal Polar Stereographic North</q>,
      *         depending on the arguments given to this method.
      */
     public static String setParameters(final ParameterValueGroup group, final boolean north) {
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicB.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicB.java
index 4e6619bdd3..51031304ce 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicB.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicB.java
@@ -24,8 +24,8 @@ import org.apache.sis.parameter.ParameterBuilder;
 
 
 /**
- * The provider for <cite>"Polar Stereographic (variant B)"</cite> projection (EPSG:9829).
- * This provider includes a <cite>"Latitude of standard parallel"</cite> parameter and
+ * The provider for <q>Polar Stereographic (variant B)</q> projection (EPSG:9829).
+ * This provider includes a <q>Latitude of standard parallel</q> parameter and
  * determines the hemisphere of the projection from that parameter value.
  *
  * @author  Rueben Schulz (UBC)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicC.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicC.java
index 58ad9f1ec2..2970f2dbb5 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicC.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicC.java
@@ -22,7 +22,7 @@ import org.opengis.parameter.ParameterDescriptorGroup;
 
 
 /**
- * The provider for <cite>"Polar Stereographic (Variant C)"</cite> projection (EPSG:9830).
+ * The provider for <q>Polar Stereographic (Variant C)</q> projection (EPSG:9830).
  * This is very similar to variant B except in the way to use the false northing.
  *
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicNorth.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicNorth.java
index c891b71d0a..3b6f232125 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicNorth.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicNorth.java
@@ -28,7 +28,7 @@ import org.apache.sis.measure.Units;
 
 
 /**
- * The provider for <cite>"Stereographic North Pole"</cite> projection (ESRI).
+ * The provider for <q>Stereographic North Pole</q> projection (ESRI).
  *
  * @author  Rueben Schulz (UBC)
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicSouth.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicSouth.java
index 23a2d44778..c5e9837941 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicSouth.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicSouth.java
@@ -26,7 +26,7 @@ import org.apache.sis.measure.Units;
 
 
 /**
- * The provider for <cite>"Stereographic North South"</cite> projection (ESRI).
+ * The provider for <q>Stereographic North South</q> projection (ESRI).
  *
  * @author  Rueben Schulz (UBC)
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Polyconic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Polyconic.java
index a7710d3f29..c94f5488cd 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Polyconic.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Polyconic.java
@@ -26,7 +26,7 @@ import org.apache.sis.referencing.operation.projection.NormalizedProjection;
 
 
 /**
- * The provider for <cite>"American Polyconic"</cite> projection (EPSG:9818).
+ * The provider for <q>American Polyconic</q> projection (EPSG:9818).
  *
  * @author  Simon Reynard (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PositionVector7Param.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PositionVector7Param.java
index 4fc0fc559f..18d9e1811d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PositionVector7Param.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PositionVector7Param.java
@@ -21,7 +21,7 @@ import org.opengis.parameter.ParameterDescriptorGroup;
 
 
 /**
- * The provider for <cite>"Position Vector transformation (geocentric domain)"</cite> (EPSG:1033).
+ * The provider for <q>Position Vector transformation (geocentric domain)</q> (EPSG:1033).
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  */
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PositionVector7Param2D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PositionVector7Param2D.java
index 26f68680bc..20b050a25e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PositionVector7Param2D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PositionVector7Param2D.java
@@ -22,7 +22,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
 
 
 /**
- * The provider for <cite>"Position Vector transformation (geog2D domain)"</cite> (EPSG:9606).
+ * The provider for <q>Position Vector transformation (geog2D domain)</q> (EPSG:9606).
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  */
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PositionVector7Param3D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PositionVector7Param3D.java
index 4ba6415a4b..cf00d4da9f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PositionVector7Param3D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PositionVector7Param3D.java
@@ -22,7 +22,7 @@ import org.opengis.parameter.ParameterDescriptorGroup;
 
 
 /**
- * The provider for <cite>"Position Vector transformation (geog3D domain)"</cite> (EPSG:1037).
+ * The provider for <q>Position Vector transformation (geog3D domain)</q> (EPSG:1037).
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  */
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PseudoMercator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PseudoMercator.java
index 04f30feb02..a0f1762258 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PseudoMercator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PseudoMercator.java
@@ -21,7 +21,7 @@ import org.opengis.parameter.ParameterDescriptorGroup;
 
 
 /**
- * The provider for <cite>"Popular Visualisation Pseudo Mercator"</cite> projection (EPSG:1024).
+ * The provider for <q>Popular Visualisation Pseudo Mercator</q> projection (EPSG:1024).
  * This is also known as the "Google projection", defined by popular demand but not considered
  * a valid projection method.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PseudoPlateCarree.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PseudoPlateCarree.java
index e6fb8cc506..faf7f175c0 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PseudoPlateCarree.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PseudoPlateCarree.java
@@ -28,7 +28,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
 
 
 /**
- * The <cite>"Pseudo Plate Carrée"</cite> pseudo-projection (EPSG:9825). This is only the identity transform.
+ * The <q>Pseudo Plate Carrée</q> pseudo-projection (EPSG:9825). This is only the identity transform.
  * The semi-major and semi-minor axis lengths are ignored (they could be fixed to 1) but nevertheless declared
  * for allowing netCDF file encoding to declare the ellipsoid in pseudo-projection parameters.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PseudoSinusoidal.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PseudoSinusoidal.java
index b7847aaf83..dedb47d2e2 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PseudoSinusoidal.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PseudoSinusoidal.java
@@ -21,7 +21,7 @@ import org.opengis.parameter.ParameterDescriptorGroup;
 
 
 /**
- * The provider for <cite>"Pseudo sinusoidal equal-area"</cite> projection.
+ * The provider for <q>Pseudo sinusoidal equal-area</q> projection.
  * This is similar to Pseudo-Mercator: uses spherical formulas but apply the result on an ellipsoid.
  * This is sometimes used with remote sensing data.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/RegionalMercator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/RegionalMercator.java
index 776925b36f..4bddb0107d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/RegionalMercator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/RegionalMercator.java
@@ -24,7 +24,7 @@ import org.apache.sis.parameter.ParameterBuilder;
 
 
 /**
- * The provider for <cite>"Mercator (variant C)"</cite> projection (EPSG:1044).
+ * The provider for <q>Mercator (variant C)</q> projection (EPSG:1044).
  *
  * <h2>Note on naming</h2>
  * The "Regional Mercator" class name is inspired by MapInfo practice, while not exactly the same projection.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/SatelliteTracking.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/SatelliteTracking.java
index 7d22963979..9c4e154413 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/SatelliteTracking.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/SatelliteTracking.java
@@ -30,7 +30,7 @@ import org.apache.sis.measure.Units;
 
 
 /**
- * The provider for <cite>"Satellite-Tracking"</cite> projections.
+ * The provider for <q>Satellite-Tracking</q> projections.
  * We are not aware of authoritative source for parameter definitions, except the Snyder book.
  * See {@link org.apache.sis.referencing.operation.projection.SatelliteTracking here for more
  * details}.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Sinusoidal.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Sinusoidal.java
index cae5bc01b1..02a3dac435 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Sinusoidal.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Sinusoidal.java
@@ -28,7 +28,7 @@ import org.apache.sis.referencing.operation.projection.NormalizedProjection;
 
 
 /**
- * The provider for <cite>"sinusoidal equal-area"</cite> projection.
+ * The provider for <q>sinusoidal equal-area</q> projection.
  * This is a pseudo-cylindrical (or "false cylindrical") projection.
  * This projection method has no associated EPSG code.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/TransverseMercator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/TransverseMercator.java
index 69dbb71804..5e847a2259 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/TransverseMercator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/TransverseMercator.java
@@ -33,7 +33,7 @@ import org.apache.sis.math.MathFunctions;
 
 
 /**
- * The provider for <cite>"Transverse Mercator"</cite> projection (EPSG:9807).
+ * The provider for <q>Transverse Mercator</q> projection (EPSG:9807).
  *
  * @author  Martin Desruisseaux (MPO, IRD, Geomatys)
  * @author  Rueben Schulz (UBC)
@@ -300,7 +300,7 @@ public final class TransverseMercator extends AbstractMercator {
          * @param  group      the parameters for which to set the values.
          * @param  latitude   the latitude in the center of the desired projection.
          * @param  longitude  the longitude in the center of the desired projection.
-         * @return a name like <cite>"Transverse Mercator"</cite> or <cite>"UTM zone 10N"</cite>,
+         * @return a name like <q>Transverse Mercator</q> or <q>UTM zone 10N</q>,
          *         depending on the arguments given to this method.
          */
         public final String setParameters(final ParameterValueGroup group, double latitude, double longitude) {
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/TransverseMercatorSouth.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/TransverseMercatorSouth.java
index c048d9bc04..f94449bc71 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/TransverseMercatorSouth.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/TransverseMercatorSouth.java
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.operation.projection.NormalizedProjection;
 
 
 /**
- * The provider for <cite>"Transverse Mercator (South Orientated)"</cite> projection (EPSG:9808).
+ * The provider for <q>Transverse Mercator (South Orientated)</q> projection (EPSG:9808).
  * The terms <cite>false easting</cite> (FE) and <cite>false northing</cite> (FN) increase
  * the Westing and Southing value at the natural origin. In other words they are effectively
  * <cite>false westing</cite> (FW) and <cite>false southing</cite> (FS) respectively.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/VerticalOffset.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/VerticalOffset.java
index bb1edc956b..cf3b162b15 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/VerticalOffset.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/VerticalOffset.java
@@ -32,7 +32,7 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
 
 
 /**
- * The provider for <cite>"Vertical Offset"</cite> (EPSG:9616).
+ * The provider for <q>Vertical Offset</q> (EPSG:9616).
  * The Apache SIS implementation of this operation method always perform the vertical offset in metres.
  * The vertical axis of source and target CRS shall be converted to metres before this operation is applied.
  *
@@ -45,7 +45,7 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
  * Consequently, the <var>offset</var> value is always applied in the direction of the target axis. This is different
  * than the Apache SIS design, which always interpret the parameter in the direction of a normalized coordinate axis
  * (up in this case, regardless the source and target coordinate systems). Consequently, the sign of the
- * <cite>"Vertical Offset"</cite> parameter value needs to be reversed if the target coordinate system axis is down.
+ * <q>Vertical Offset</q> parameter value needs to be reversed if the target coordinate system axis is down.
  *
  * @author  Martin Desruisseaux (Geomatys)
  */
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ZonedTransverseMercator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ZonedTransverseMercator.java
index 6071dcf318..18424350ec 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ZonedTransverseMercator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ZonedTransverseMercator.java
@@ -34,7 +34,7 @@ import org.apache.sis.referencing.operation.projection.ZonedGridSystem;
 
 
 /**
- * The provider for <cite>"Transverse Mercator Zoned Grid System"</cite> projection (EPSG:9824).
+ * The provider for <q>Transverse Mercator Zoned Grid System</q> projection (EPSG:9824).
  *
  * @author  Martin Desruisseaux (Geomatys)
  */
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ContextualParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ContextualParameters.java
index bc5f95b4f5..42e1270097 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ContextualParameters.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ContextualParameters.java
@@ -91,7 +91,7 @@ import static org.apache.sis.referencing.util.WKTUtilities.LOGGER;
  * <ol class="verbose">
  *   <li>A {@link MathTransformProvider} instantiates a non-linear transform working in a predefined coordinate system.
  *     Note that different providers may instantiate the same transform class but with different parameters.
- *     For example, both <cite>"Mercator (variant A)"</cite> and <cite>"Mercator (variant B)"</cite> operation methods
+ *     For example, both <q>Mercator (variant A)</q> and <q>Mercator (variant B)</q> operation methods
  *     instantiate the same Mercator projection class, but with different ways to represent the parameters.</li>
  *
  *   <li>The map projection constructor fetches all parameters that it needs from the user supplied
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
index 4370c1c070..e634c53788 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
@@ -108,8 +108,8 @@ import org.apache.sis.util.resources.Errors;
  *
  * <p>Each descriptor has many aliases, and those aliases may vary between different projections.
  * For example, the <cite>false easting</cite> parameter is usually called {@code "false_easting"}
- * by OGC, while EPSG uses various names like <cite>"False easting"</cite> or <cite>"Easting at
- * false origin"</cite>.</p>
+ * by OGC, while EPSG uses various names like <q>False easting</q> or <q>Easting at
+ * false origin</q>.</p>
  *
  * <h2>Dynamic parameters</h2>
  * A few non-standard parameters are defined for compatibility reasons,
@@ -443,7 +443,7 @@ public class DefaultMathTransformFactory extends AbstractFactory implements Math
 
     /**
      * Returns the operation method for the specified name or identifier. The given argument shall be either
-     * a method {@linkplain DefaultOperationMethod#getName() name} (e.g. <cite>"Transverse Mercator"</cite>)
+     * a method {@linkplain DefaultOperationMethod#getName() name} (e.g. <q>Transverse Mercator</q>)
      * or one of its {@linkplain DefaultOperationMethod#getIdentifiers() identifiers} (e.g. {@code "EPSG:9807"}).
      *
      * <p>The search is case-insensitive. Comparisons against method names can be
@@ -541,7 +541,7 @@ public class DefaultMathTransformFactory extends AbstractFactory implements Math
      * This class does <strong>not</strong> handle change of
      * {@linkplain org.apache.sis.referencing.datum.DefaultGeodeticDatum#getPrimeMeridian() prime meridian}
      * or anything else related to datum. Datum changes have dedicated {@link OperationMethod},
-     * for example <cite>"Longitude rotation"</cite> (EPSG:9601) for changing the prime meridian.
+     * for example <q>Longitude rotation</q> (EPSG:9601) for changing the prime meridian.
      *
      * <h2>Scope</h2>
      * Instances of this class should be short-lived
@@ -1498,9 +1498,9 @@ public class DefaultMathTransformFactory extends AbstractFactory implements Math
      * This method does not accept separated ellipsoid arguments for {@code source} and {@code target} because
      * this method should not be used for datum shifts. If the two given coordinate systems are ellipsoidal,
      * then they are assumed to use the same ellipsoid. If different ellipsoids are desired, then a
-     * {@linkplain #createParameterizedTransform parameterized transform} like <cite>"Molodensky"</cite>,
-     * <cite>"Geocentric translations"</cite>, <cite>"Coordinate Frame Rotation"</cite> or
-     * <cite>"Position Vector transformation"</cite> should be used instead.
+     * {@linkplain #createParameterizedTransform parameterized transform} like <q>Molodensky</q>,
+     * <q>Geocentric translations</q>, <q>Coordinate Frame Rotation</q> or
+     * <q>Position Vector transformation</q> should be used instead.
      *
      * @param  source     the source coordinate system.
      * @param  target     the target coordinate system.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java
index 68135b8bf1..30e9aa785a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java
@@ -43,7 +43,7 @@ import org.apache.sis.referencing.internal.Resources;
 
 /**
  * Transforms between two geographic CRS by performing geocentric translations interpolated from a grid file.
- * This transform is used mainly for <cite>"France geocentric interpolation"</cite> (ESPG:9655) datum shifts,
+ * This transform is used mainly for <q>France geocentric interpolation</q> (ESPG:9655) datum shifts,
  * but Apache SIS implementation allows the use for other regions.
  *
  * <h2>Algorithm</h2>
@@ -65,7 +65,7 @@ import org.apache.sis.referencing.internal.Resources;
  *
  * <h3>Reference</h3>
  * IGN document {@code NTG_88.pdf},
- * <cite>"Grille de paramètres de transformation de coordonnées"</cite>
+ * <q>Grille de paramètres de transformation de coordonnées</q>
  * at <a href="http://www.ign.fr">http://www.ign.fr</a>.
  * Note however that the signs of (ΔX, ΔY, ΔZ) values expected by this class are the opposite of the
  * signs used in NTG_88 document. This is because NTG_88 grid defines shifts from target to source,
@@ -90,7 +90,7 @@ public class InterpolatedGeocentricTransform extends DatumShiftTransform {
 
     /**
      * Parameter descriptor to use with the contextual parameters for the forward transformation.
-     * We do not use the <cite>"France geocentric interpolation"</cite> (ESPG:9655) descriptor
+     * We do not use the <q>France geocentric interpolation</q> (ESPG:9655) descriptor
      * because their "forward" transformation is our "inverse" transformation, and conversely.
      * The {@code DESCRIPTOR} defined here is non-standard, but allows this class to be used
      * for other geographic areas than France.
@@ -99,7 +99,7 @@ public class InterpolatedGeocentricTransform extends DatumShiftTransform {
 
     /**
      * Parameter descriptor to use with the contextual parameters for the inverse transformation.
-     * We do not use the <cite>"France geocentric interpolation"</cite> (ESPG:9655) descriptor
+     * We do not use the <q>France geocentric interpolation</q> (ESPG:9655) descriptor
      * because it is specific to a single country, has hard-coded parameters and uses a sign
      * convention for (ΔX,ΔY,ΔZ) translations different than the one used in this class.
      * The {@code INVERSE} descriptor defined here is non-standard, but allows this class
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
index 1da137f1ec..ee42e3f124 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
@@ -49,7 +49,7 @@ import org.apache.sis.referencing.util.DirectPositionView;
  * <p>This transform is used for example with NADCON and NTv2 datum shift grids.</p>
  *
  * <h2>Input and output coordinates</h2>
- * First, <cite>"real world"</cite> input coordinates (<var>x</var>,<var>y</var>) are converted to
+ * First, <q>real world</q> input coordinates (<var>x</var>,<var>y</var>) are converted to
  * <cite>grid</cite> coordinates (<var>gridX</var>, <var>gridY</var>), which are zero-based indices
  * in the two-dimensional grid. This conversion is applied by an affine transform <em>before</em>
  * to be passed to the {@code transform} methods of this {@code InterpolatedTransform} class.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MolodenskyTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MolodenskyTransform.java
index 7ea6805057..d4f1aa2769 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MolodenskyTransform.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MolodenskyTransform.java
@@ -77,7 +77,7 @@ import static java.lang.Math.*;
  * </ul>
  *
  * <h2>Comparison of Molodensky and geocentric translation</h2>
- * Compared to the <cite>"Geocentric translation (geographic domain)"</cite> method,
+ * Compared to the <q>Geocentric translation (geographic domain)</q> method,
  * the Molodensky method has errors usually within a few centimetres.
  * The Abridged Molodensky method has more noticeable errors, of a few tenths of centimetres.
  *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/AxisDirections.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/AxisDirections.java
index cbf550efe4..bef4577fa1 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/AxisDirections.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/AxisDirections.java
@@ -576,7 +576,7 @@ next:       for (int i=0; i <= limit; i++) {
      * Returns the indices of {@code cs} axes presumed covariant with {@code subCS} axes.
      * The mapping is based on axis directions only, with colinear axes mapped in priority.
      * If some axes cannot be mapped using collinearity criterion, then directions from poles
-     * (e.g. <cite>"South along 90°E"</cite>) are arbitrarily handled as if they were covariant
+     * (e.g. <q>South along 90°E</q>) are arbitrarily handled as if they were covariant
      * with East and North directions, in that order.
      *
      * @param  cs     the coordinate system which contains all axes, or {@code null}.
@@ -625,7 +625,7 @@ next:       for (int i=0; i <= limit; i++) {
     /**
      * Searches predefined {@link AxisDirection} for a given name. This method searches for a match in the set
      * of known axis directions as returned by {@link AxisDirection#values()}, plus a few special cases like
-     * <cite>"Geocentre &gt; equator/90°E"</cite>. The latter are used in the EPSG database for geocentric CRS.
+     * <q>Geocentre &gt; equator/90°E</q>. The latter are used in the EPSG database for geocentric CRS.
      *
      * <p>This method does not know about {@code org.apache.sis.referencing.cs.DirectionAlongMeridian}.
      * The latter is a parser which may create new directions, while this method searches only in a set
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/CoordinateOperations.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/CoordinateOperations.java
index 0372322038..127a4f3c26 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/CoordinateOperations.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/CoordinateOperations.java
@@ -140,7 +140,7 @@ public final class CoordinateOperations extends Static {
 
     /**
      * Returns the operation method for the specified name or identifier. The given argument shall be either a
-     * method name (e.g. <cite>"Transverse Mercator"</cite>) or one of its identifiers (e.g. {@code "EPSG:9807"}).
+     * method name (e.g. <q>Transverse Mercator</q>) or one of its identifiers (e.g. {@code "EPSG:9807"}).
      *
      * @param  methods     the method candidates.
      * @param  identifier  the name or identifier of the operation method to search.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/DefinitionVerifier.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/DefinitionVerifier.java
index ce1415e998..0e361cb96f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/DefinitionVerifier.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/DefinitionVerifier.java
@@ -55,9 +55,9 @@ import org.apache.sis.util.logging.Logging;
  *   <li>Warnings if the given CRS does not match the authoritative description.</li>
  * </ul>
  *
- * <b>Note:</b> ISO 19162 said about the {@code Identifier} keyword:  <cite>"In the event of conflict in values given
+ * <b>Note:</b> ISO 19162 said about the {@code Identifier} keyword:  <q>In the event of conflict in values given
  * in the CRS WKT string and given by an authority through an object’s name or an identifier, reading software should
- * throw an exception or give users a warning message. The WKT values should be assumed to prevail."</cite>
+ * throw an exception or give users a warning message. The WKT values should be assumed to prevail.</q>
  * In practice when such conflicts happen, we often see that the given WKT string contains mistakes and the
  * provider intended to use the authoritative description. We nevertheless comply with ISO 19162 requirement,
  * but provide a "recommended CRS" field for what we think is the intended CRS.
@@ -81,8 +81,8 @@ public final class DefinitionVerifier {
      * or an instance created from the authority factory. May also be {@code null} if all CRS given to the
      * {@link #compare(CoordinateReferenceSystem, CoordinateReferenceSystem, Locale) compare(…)} method were null.
      *
-     * Note that ISO 19162 said <cite>"Should any attributes or values given in the cited identifier be in conflict
-     * with attributes or values given explicitly in the WKT description, the WKT values shall prevail."</cite>
+     * Note that ISO 19162 said <q>Should any attributes or values given in the cited identifier be in conflict
+     * with attributes or values given explicitly in the WKT description, the WKT values shall prevail.</q>
      * So we normally do not use this field.
      */
     public final CoordinateReferenceSystem recommendation;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/Formulas.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/Formulas.java
index 90f3d2f64c..f22b882404 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/Formulas.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/Formulas.java
@@ -84,8 +84,8 @@ public final class Formulas extends Static {
 
     /**
      * The length of a <cite>Julian year</cite> in milliseconds.
-     * From Wikipedia, <cite>"In astronomy, a Julian year (symbol: <b>a</b>) is a unit of measurement of time
-     * defined as exactly 365.25 days of 86,400 SI seconds each."</cite>.
+     * From Wikipedia, <q>In astronomy, a Julian year (symbol: <b>a</b>) is a unit of measurement of time
+     * defined as exactly 365.25 days of 86,400 SI seconds each.</q>.
      *
      * @see <a href="https://en.wikipedia.org/wiki/Julian_year_%28astronomy%29">Wikipedia: Julian year (astronomy)</a>
      */
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/GeodeticObjectBuilder.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/GeodeticObjectBuilder.java
index 80a529a474..2c9e055f64 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/GeodeticObjectBuilder.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/GeodeticObjectBuilder.java
@@ -363,8 +363,8 @@ public class GeodeticObjectBuilder extends Builder<GeodeticObjectBuilder> {
      * This convenience method delegates to the following methods:
      *
      * <ul>
-     *   <li>{@link #setConversionName(String)} with a name like <cite>"Transverse Mercator"</cite>
-     *       or <cite>"UTM zone 10N"</cite>, depending on the arguments given to this method.</li>
+     *   <li>{@link #setConversionName(String)} with a name like <q>Transverse Mercator</q>
+     *       or <q>UTM zone 10N</q>, depending on the arguments given to this method.</li>
      *   <li>{@link #setConversionMethod(String)} with the name of the Transverse Mercator projection method.</li>
      *   <li>{@link #setParameter(String, double, Unit)} for each of the parameters enumerated below:</li>
      * </ul>
@@ -409,7 +409,7 @@ public class GeodeticObjectBuilder extends Builder<GeodeticObjectBuilder> {
      * This convenience method delegates to the following methods:
      *
      * <ul>
-     *   <li>{@link #setConversionName(String)} with a name like <cite>"Universal Polar Stereographic North"</cite>,
+     *   <li>{@link #setConversionName(String)} with a name like <q>Universal Polar Stereographic North</q>,
      *       depending on the argument given to this method.</li>
      *   <li>{@link #setConversionMethod(String)} with the name of the Polar Stereographic (variant A) projection method.</li>
      *   <li>{@link #setParameter(String, double, Unit)} for each of the parameters enumerated below:</li>
@@ -440,7 +440,7 @@ public class GeodeticObjectBuilder extends Builder<GeodeticObjectBuilder> {
      * Creates a projected CRS using a conversion built from the values given by the {@code setParameter(…)} calls.
      *
      * <h4>Example</h4>
-     * The following example creates a projected CRS for the <cite>"NTF (Paris) / Lambert zone II"</cite> projection,
+     * The following example creates a projected CRS for the <q>NTF (Paris) / Lambert zone II</q> projection,
      * from a base CRS which is presumed to already exists in this example.
      *
      * {@snippet lang="java" :
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/ReferencingUtilities.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/ReferencingUtilities.java
index bbec564e84..bc78e61497 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/ReferencingUtilities.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/ReferencingUtilities.java
@@ -418,15 +418,15 @@ public final class ReferencingUtilities extends Static {
      * <ul>
      *   <li>If the character is {@code '('} and the content until the closing {@code ')'} is a valid
      *       Unicode identifier, then that part is included. The intent is to keep the prime meridian
-     *       name in names like <cite>"NTF (Paris)"</cite>.</li>
+     *       name in names like <q>NTF (Paris)</q>.</li>
      * </ul>
      *
      * <p>Examples:</p>
      * <ul>
-     *   <li><cite>"NTF (Paris)"</cite> is left unchanged.</li>
-     *   <li><cite>"WGS 84 (3D)"</cite> is truncated as <cite>"WGS 84"</cite>.</li>
-     *   <li><cite>"Ellipsoidal 2D CS. Axes: latitude, longitude. Orientations: north, east. UoM: degree"</cite>
-     *       is truncated as <cite>"Ellipsoidal 2D CS"</cite>.</li>
+     *   <li><q>NTF (Paris)</q> is left unchanged.</li>
+     *   <li><q>WGS 84 (3D)</q> is truncated as <q>WGS 84</q>.</li>
+     *   <li><q>Ellipsoidal 2D CS. Axes: latitude, longitude. Orientations: north, east. UoM: degree</q>
+     *       is truncated as <q>Ellipsoidal 2D CS</q>.</li>
      * </ul>
      *
      * @param  object    the identified object to view as a properties map.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/Tile.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/Tile.java
index 44dc8c9a2f..ccbee6a32a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/Tile.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/Tile.java
@@ -191,7 +191,7 @@ public class Tile implements Serializable {
     }
 
     /**
-     * Creates a tile for the given region and <cite>"grid to real world"</cite> transform.
+     * Creates a tile for the given region and <q>grid to real world</q> transform.
      * This constructor can be used when the {@linkplain #getLocation() location} of the tile is unknown.
      * The location and subsampling will be computed automatically when this tile will be processed by a
      * {@link TileOrganizer}.
@@ -204,7 +204,7 @@ public class Tile implements Serializable {
      * @param region     the tile region, or {@code null} if unknown.
      *                   The (<var>x</var>,<var>y</var> location of this region is typically (0,0).
      *                   The final location will be computed when this tile will be given to a {@link TileOrganizer}.
-     * @param gridToCRS  the <cite>"grid to real world"</cite> transform mapping pixel
+     * @param gridToCRS  the <q>grid to real world</q> transform mapping pixel
      *                   {@linkplain PixelOrientation#UPPER_LEFT upper left} corner.
      */
     public Tile(final Rectangle region, final AffineTransform gridToCRS) {
@@ -421,7 +421,7 @@ public class Tile implements Serializable {
     }
 
     /**
-     * Returns the <cite>"grid to real world"</cite> transform, or {@code null} if unknown.
+     * Returns the <q>grid to real world</q> transform, or {@code null} if unknown.
      * This transform is derived from the value given to the constructor, but may not be identical
      * since it may have been {@linkplain AffineTransform#translate(double, double) translated}
      * in order to get a uniform grid geometry for every tiles.
@@ -437,7 +437,7 @@ public class Tile implements Serializable {
      *     gridToCRS.translate(location.x, location.y);
      *     }
      *
-     * @return the <cite>"grid to real world"</cite> transform mapping pixel
+     * @return the <q>grid to real world</q> transform mapping pixel
      *         {@linkplain PixelOrientation#UPPER_LEFT upper left} corner, or {@code null} if undefined.
      * @throws IllegalStateException if this tile has been {@linkplain #Tile(Rectangle, AffineTransform)
      *         created without location} and has not yet been processed by {@link TileOrganizer}.
@@ -454,10 +454,10 @@ public class Tile implements Serializable {
     }
 
     /**
-     * Sets the new <cite>"grid to real world"</cite> transform to use after the translation performed by
+     * Sets the new <q>grid to real world</q> transform to use after the translation performed by
      * {@link #translate(int, int)}, if any. The given instance should be immutable; it will not be cloned.
      *
-     * @param  at  the <cite>"grid to real world"</cite> transform mapping pixel
+     * @param  at  the <q>grid to real world</q> transform mapping pixel
      *             {@linkplain PixelOrientation#UPPER_LEFT upper left} corner.
      * @throws IllegalStateException if another transform was already assigned to this tile.
      */
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameter.java
index d4059c2de3..57366a788e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameter.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameter.java
@@ -194,9 +194,9 @@ public final class CC_GeneralOperationParameter extends PropertyType<CC_GeneralO
      * This constraint exists in some predefined map projections.
      *
      * <h4>Example</h4>
-     * The <cite>"Latitude of natural origin"</cite> parameter of <cite>"Mercator (1SP)"</cite> projection
+     * The <q>Latitude of natural origin</q> parameter of <q>Mercator (1SP)</q> projection
      * is provided for completeness, but should never be different than zero in this particular projection
-     * (otherwise it would be a <cite>"Mercator (variant C)"</cite> projection).  But if this parameter is
+     * (otherwise it would be a <q>Mercator (variant C)</q> projection).  But if this parameter is
      * nevertheless provided, the SIS implementation will use it. From this point of view, SIS is tolerant
      * to non-zero value.
      *
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/ComparisonWithEPSG.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/ComparisonWithEPSG.java
index dcf7841815..5b543c1742 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/ComparisonWithEPSG.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/ComparisonWithEPSG.java
@@ -72,7 +72,7 @@ public final class ComparisonWithEPSG extends TestCase {
 
     /**
      * Tests "Campo Inchauspe / Argentina 7" (EPSG:22197).
-     * This projection has a <cite>"Latitude of natural origin"</cite> at the south pole.
+     * This projection has a <q>Latitude of natural origin</q> at the south pole.
      *
      * @throws FactoryException if an error occurred while creating the CRS.
      *
@@ -100,7 +100,7 @@ public final class ComparisonWithEPSG extends TestCase {
 
     /**
      * Tests "Pulkovo 1942 / 3-degree Gauss-Kruger CM 180E" (EPSG:2636).
-     * This projection has a <cite>"Longitude of natural origin"</cite> at the anti-meridian.
+     * This projection has a <q>Longitude of natural origin</q> at the anti-meridian.
      *
      * @throws FactoryException if an error occurred while creating the CRS.
      *
@@ -128,7 +128,7 @@ public final class ComparisonWithEPSG extends TestCase {
 
     /**
      * Tests "Belge 1950 (Brussels) / Belge Lambert 50" (EPSG:21500).
-     * This projection has a <cite>"Latitude of false origin"</cite> at the anti-meridian.
+     * This projection has a <q>Latitude of false origin</q> at the anti-meridian.
      *
      * @throws FactoryException if an error occurred while creating the CRS.
      *
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
index 9af63fdc75..b2df92b44d 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
@@ -157,7 +157,7 @@ public final class GeodeticObjectParserTest extends TestCase {
 
     /**
      * Asserts that the given axis is a longitude axis. This method expects the name to be
-     * <cite>"Geodetic longitude"</cite> even if the WKT string contained a different name,
+     * <q>Geodetic longitude</q> even if the WKT string contained a different name,
      * because {@link GeodeticObjectParser} should have done the replacement.
      */
     private static void assertLongitudeAxisEquals(final CoordinateSystemAxis axis) {
@@ -166,7 +166,7 @@ public final class GeodeticObjectParserTest extends TestCase {
 
     /**
      * Asserts that the given axis is a latitude axis. This method expects the name to be
-     * <cite>"Geodetic latitude"</cite> even if the WKT string contained a different name,
+     * <q>Geodetic latitude</q> even if the WKT string contained a different name,
      * because {@link GeodeticObjectParser} should have done the replacement.
      */
     private static void assertLatitudeAxisEquals(final CoordinateSystemAxis axis) {
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
index 8dad75f7ac..8e9d7b4c67 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
@@ -71,7 +71,7 @@ public final class WKTParserTest extends CRSParserTest {
 
     /**
      * Verifies the axis names of a geographic CRS. This method is invoked when the parsed object is
-     * expected to have <cite>"Geodetic latitude"</cite> and <cite>"Geodetic longitude"</cite> names.
+     * expected to have <q>Geodetic latitude</q> and <q>Geodetic longitude</q> names.
      */
     @SuppressWarnings("fallthrough")
     private void verifyEllipsoidalCS() {
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParameterBuilderTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParameterBuilderTest.java
index 5eef2b4674..b1f1fdd97e 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParameterBuilderTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParameterBuilderTest.java
@@ -76,7 +76,7 @@ public final class ParameterBuilderTest extends TestCase {
     }
 
     /**
-     * Tests the <cite>"Mercator (variant A)"</cite> example given in Javadoc.
+     * Tests the <q>Mercator (variant A)</q> example given in Javadoc.
      */
     @Test
     @DependsOnMethod("testCreate")
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/BuilderTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/BuilderTest.java
index 63da65d3c9..b746db48eb 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/BuilderTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/BuilderTest.java
@@ -137,7 +137,7 @@ public final class BuilderTest extends TestCase {
     }
 
     /**
-     * Creates a {@link Builder} with <cite>"Mercator (variant A)"</cite> projection (EPSG:9804) names and identifiers.
+     * Creates a {@link Builder} with <q>Mercator (variant A)</q> projection (EPSG:9804) names and identifiers.
      * This method uses scopes for differentiating the EPSG names from the OGC and GeoTIFF ones.
      *
      * @param  withNames       {@code true} for adding the names in the builder.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
index f16875f73e..d5726cf514 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
@@ -153,7 +153,7 @@ public final class DefaultDerivedCRSTest extends TestCase {
      * Note that in the particular case of {@code DerivedCRS}, WKT 1 and WKT 2 formats are very different.
      *
      * The CRS formatted by this test is a dummy CRS which should not exist in the reality.
-     * In particular, we use <cite>"Longitude rotation"</cite> (EPSG:9601) as if it was a conversion,
+     * In particular, we use <q>Longitude rotation</q> (EPSG:9601) as if it was a conversion,
      * while in reality it is a transformation. We do that only because this operation is so simple,
      * it is easy to create and test.
      */
@@ -183,7 +183,7 @@ public final class DefaultDerivedCRSTest extends TestCase {
      * Note that in the particular case of {@code DerivedCRS}, WKT 1 and WKT 2 formats are very different.
      *
      * The CRS formatted by this test is a dummy CRS which should not exist in the reality.
-     * In particular, we use <cite>"Longitude rotation"</cite> (EPSG:9601) as if it was a conversion,
+     * In particular, we use <q>Longitude rotation</q> (EPSG:9601) as if it was a conversion,
      * while in reality it is a transformation. We do that only because this operation is so simple,
      * it is easy to create and test.
      */
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
index 17ab56dc7f..91d3a74064 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
@@ -396,7 +396,7 @@ public final class DefaultProjectedCRSTest extends TestCase {
     /**
      * Tests WKT 1 formatting of a pseudo-projection with explicit {@code "semi-major"} and {@code "semi-minor"}
      * parameter values. This was a way to define the Google pseudo-projection using standard projection method
-     * name before EPSG introduced the <cite>"Popular Visualisation Pseudo Mercator"</cite> projection method.
+     * name before EPSG introduced the <q>Popular Visualisation Pseudo Mercator</q> projection method.
      * The approach tested in this method is now deprecated at least for the Google projection (while it may
      * still be useful for other projections), but we still test it for compatibility reasons.
      *
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/HardCodedAxes.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/HardCodedAxes.java
index f23f634c46..c9efd0a522 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/HardCodedAxes.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/HardCodedAxes.java
@@ -38,7 +38,7 @@ public final class HardCodedAxes {
      * Axis for geodetic longitudes in a {@linkplain org.apache.sis.referencing.crs.DefaultGeographicCRS geographic CRS}.
      * Increasing coordinate values go {@linkplain AxisDirection#EAST East}
      * and units are {@linkplain Units#DEGREE degrees}.
-     * The ISO 19111 name is <cite>"geodetic longitude"</cite> and the abbreviation is "λ" (lambda).
+     * The ISO 19111 name is <q>geodetic longitude</q> and the abbreviation is "λ" (lambda).
      *
      * <p>This axis is usually part of a {@link #GEODETIC_LONGITUDE}, {@link #GEODETIC_LATITUDE},
      * {@link #ELLIPSOIDAL_HEIGHT} set. The EPSG code depends on axis order; consequently it is
@@ -54,7 +54,7 @@ public final class HardCodedAxes {
      * Axis for geodetic latitudes in a {@linkplain org.apache.sis.referencing.crs.DefaultGeographicCRS geographic CRS}.
      * Increasing coordinate values go {@linkplain AxisDirection#NORTH North}
      * and units are {@linkplain Units#DEGREE degrees}.
-     * The ISO 19111 name is <cite>"geodetic latitude"</cite> and the abbreviation is "φ" (phi).
+     * The ISO 19111 name is <q>geodetic latitude</q> and the abbreviation is "φ" (phi).
      *
      * <p>This axis is usually part of a {@link #GEODETIC_LONGITUDE}, {@link #GEODETIC_LATITUDE},
      * {@link #ELLIPSOIDAL_HEIGHT} set. The EPSG code depends on axis order; consequently it is
@@ -100,7 +100,7 @@ public final class HardCodedAxes {
      * Axis for height values above the ellipsoid in a
      * {@linkplain org.apache.sis.referencing.crs.DefaultGeographicCRS geographic CRS}.
      * Increasing coordinate values go {@linkplain AxisDirection#UP up} and units are {@linkplain Units#METRE metres}.
-     * The ISO 19111 name is <cite>"ellipsoidal height"</cite> and the abbreviation is lower case <cite>"h"</cite>.
+     * The ISO 19111 name is <q>ellipsoidal height</q> and the abbreviation is lower case <q>h</q>.
      *
      * <p>This axis is usually part of a {@link #GEODETIC_LONGITUDE}, {@link #GEODETIC_LATITUDE},
      * {@link #ELLIPSOIDAL_HEIGHT} set. The EPSG code depends on axis order; consequently it is
@@ -125,7 +125,7 @@ public final class HardCodedAxes {
     /**
      * Axis for height values measured from gravity.
      * Increasing coordinate values go {@linkplain AxisDirection#UP up} and units are {@linkplain Units#METRE metres}.
-     * The ISO 19111 name is <cite>"gravity-related height"</cite> and the abbreviation is upper case <cite>"H"</cite>.
+     * The ISO 19111 name is <q>gravity-related height</q> and the abbreviation is upper case <q>H</q>.
      *
      * @see #ALTITUDE
      * @see #ELLIPSOIDAL_HEIGHT
@@ -144,7 +144,7 @@ public final class HardCodedAxes {
     /**
      * Axis for altitude values.
      * Increasing coordinate values go {@linkplain AxisDirection#UP up} and units are {@linkplain Units#METRE metres}.
-     * The abbreviation is lower case <cite>"h"</cite>.
+     * The abbreviation is lower case <q>h</q>.
      *
      * <p>This axis is usually part of a {@link #GEODETIC_LONGITUDE}, {@link #GEODETIC_LATITUDE},
      * {@link #ALTITUDE} tuple.</p>
@@ -160,7 +160,7 @@ public final class HardCodedAxes {
     /**
      * Axis for depth.
      * Increasing coordinate values go {@linkplain AxisDirection#DOWN down} and units are {@linkplain Units#METRE metres}.
-     * The ISO 19111 name is <cite>"depth"</cite>.
+     * The ISO 19111 name is <q>depth</q>.
      *
      * @see #ALTITUDE
      * @see #ELLIPSOIDAL_HEIGHT
@@ -174,13 +174,13 @@ public final class HardCodedAxes {
      * Axis for radius in a {@linkplain org.apache.sis.referencing.crs.DefaultGeocentricCRS geocentric CRS}
      * using {@linkplain org.apache.sis.referencing.cs.DefaultSphericalCS spherical CS}.
      * Increasing coordinate values go {@linkplain AxisDirection#UP up} and units are {@linkplain Units#METRE metres}.
-     * The ISO 19111 name is <cite>"geocentric radius"</cite> and the abbreviation is lower-case <cite>"r"</cite>.
+     * The ISO 19111 name is <q>geocentric radius</q> and the abbreviation is lower-case <q>r</q>.
      *
      * <div class="note"><b>Note:</b>
-     * EPSG dataset 8.9 uses upper-case <cite>"R"</cite>.
-     * ISO 19111 and 19162 use lower-case <cite>"r"</cite> instead,
+     * EPSG dataset 8.9 uses upper-case <q>R</q>.
+     * ISO 19111 and 19162 use lower-case <q>r</q> instead,
      * but with "awayFrom" direction instead of "geocentricRadius".
-     * In this class, <cite>"r"</cite> is also used by {@link #DISTANCE}.</div>
+     * In this class, <q>r</q> is also used by {@link #DISTANCE}.</div>
      *
      * <p>This axis is usually part of a {@link #SPHERICAL_LONGITUDE}, {@link #SPHERICAL_LATITUDE},
      * {@link #GEOCENTRIC_RADIUS} set.</p>
@@ -199,7 +199,7 @@ public final class HardCodedAxes {
      * using {@linkplain org.apache.sis.referencing.cs.DefaultSphericalCS spherical CS}.
      * Increasing coordinate values go {@linkplain AxisDirection#EAST East}
      * and units are {@linkplain Units#DEGREE degrees}.
-     * The ISO 19111 name is <cite>"spherical longitude"</cite> (also called <cite>"azimuthal angle"</cite>)
+     * The ISO 19111 name is <q>spherical longitude</q> (also called <q>azimuthal angle</q>)
      * and the abbreviation is "θ" (theta).
      *
      * <p>This axis is close to the definition found in the EPSG database, except for the "long" abbreviation which
@@ -223,7 +223,7 @@ public final class HardCodedAxes {
      * using {@linkplain org.apache.sis.referencing.cs.DefaultSphericalCS spherical CS}.
      * Increasing coordinate values go {@linkplain AxisDirection#NORTH North}
      * and units are {@linkplain Units#DEGREE degrees}.
-     * The ISO 19111 name is <cite>"spherical latitude"</cite> (also called <cite>"polar (zenith) angle"</cite>)
+     * The ISO 19111 name is <q>spherical latitude</q> (also called <q>polar (zenith) angle</q>)
      * and the abbreviation is "Ω".
      *
      * <p>This axis is close to the definition found in the EPSG database, except for the "lat" abbreviation
@@ -244,7 +244,7 @@ public final class HardCodedAxes {
     /**
      * Axis for <var>x</var> values in a {@linkplain org.apache.sis.referencing.cs.DefaultCartesianCS Cartesian CS}.
      * Increasing coordinate values go {@linkplain AxisDirection#EAST East} and units are {@linkplain Units#METRE metres}.
-     * The abbreviation is lower case <cite>"x"</cite>.
+     * The abbreviation is lower case <q>x</q>.
      *
      * <p>This axis is usually part of a {@link #X}, {@link #Y}, {@link #Z} set.</p>
      *
@@ -260,7 +260,7 @@ public final class HardCodedAxes {
     /**
      * Axis for <var>y</var> values in a {@linkplain org.apache.sis.referencing.cs.DefaultCartesianCS Cartesian CS}.
      * Increasing coordinate values go {@linkplain AxisDirection#NORTH North} and units are {@linkplain Units#METRE metres}.
-     * The abbreviation is lower case <cite>"y"</cite>.
+     * The abbreviation is lower case <q>y</q>.
      *
      * <p>This axis is usually part of a {@link #X}, {@link #Y}, {@link #Z} set.</p>
      *
@@ -276,7 +276,7 @@ public final class HardCodedAxes {
     /**
      * Axis for <var>z</var> values in a {@linkplain org.apache.sis.referencing.cs.DefaultCartesianCS Cartesian CS}.
      * Increasing coordinate values go {@linkplain AxisDirection#UP up} and units are {@linkplain Units#METRE metres}.
-     * The abbreviation is lower case <cite>"z"</cite>.
+     * The abbreviation is lower case <q>z</q>.
      *
      * <p>This axis is usually part of a {@link #X}, {@link #Y}, {@link #Z} set.</p>
      */
@@ -288,7 +288,7 @@ public final class HardCodedAxes {
      * using {@linkplain org.apache.sis.referencing.cs.DefaultCartesianCS Cartesian CS}.
      * Increasing coordinate values goes typically toward prime meridian, but the actual axis direction
      * is {@link AxisDirection#GEOCENTRIC_X GEOCENTRIC_X}. The units are {@linkplain Units#METRE metres}.
-     * The ISO 19111 name is <cite>"Geocentric X"</cite> and the abbreviation is upper case <cite>"X"</cite>.
+     * The ISO 19111 name is <q>Geocentric X</q> and the abbreviation is upper case <q>X</q>.
      *
      * <p>In legacy OGC 01-009 specification (still in use for WKT 1 format),
      * the direction was {@link AxisDirection#OTHER OTHER}).</p>
@@ -303,7 +303,7 @@ public final class HardCodedAxes {
      * using {@linkplain org.apache.sis.referencing.cs.DefaultCartesianCS Cartesian CS}.
      * Increasing coordinate values goes typically toward East, but the actual axis direction is
      * {@link AxisDirection#GEOCENTRIC_Y GEOCENTRIC_Y}. The units are {@linkplain Units#METRE metres}.
-     * The ISO 19111 name is <cite>"Geocentric Y"</cite> and the abbreviation is upper case <cite>"Y"</cite>.
+     * The ISO 19111 name is <q>Geocentric Y</q> and the abbreviation is upper case <q>Y</q>.
      *
      * <p>In legacy OGC 01-009 specification (still in use for WKT 1 format),
      * the direction was {@link AxisDirection#EAST EAST}).</p>
@@ -318,7 +318,7 @@ public final class HardCodedAxes {
      * using {@linkplain org.apache.sis.referencing.cs.DefaultCartesianCS Cartesian CS}.
      * Increasing coordinate values goes typically toward North, but the actual axis direction is
      * {@link AxisDirection#GEOCENTRIC_Z GEOCENTRIC_Z}. The units are {@linkplain Units#METRE metres}.
-     * The ISO 19111 name is <cite>"Geocentric Z"</cite> and the abbreviation is upper case <cite>"Z"</cite>.
+     * The ISO 19111 name is <q>Geocentric Z</q> and the abbreviation is upper case <q>Z</q>.
      *
      * <p>In legacy OGC 01-009 specification (still in use for WKT 1 format),
      * the direction was {@link AxisDirection#NORTH NORTH}).</p>
@@ -331,7 +331,7 @@ public final class HardCodedAxes {
     /**
      * Axis for Easting values in a {@linkplain org.apache.sis.referencing.crs.DefaultProjectedCRS projected CRS}.
      * Increasing coordinate values go {@linkplain AxisDirection#EAST East} and units are {@linkplain Units#METRE metres}.
-     * The ISO 19111 name is <cite>"easting"</cite> and the abbreviation is upper case <cite>"E"</cite>.
+     * The ISO 19111 name is <q>easting</q> and the abbreviation is upper case <q>E</q>.
      *
      * <p>This axis is usually part of a {@link #EASTING}, {@link #NORTHING} set.</p>
      *
@@ -345,7 +345,7 @@ public final class HardCodedAxes {
     /**
      * Axis for Westing values in a {@linkplain org.apache.sis.referencing.crs.DefaultProjectedCRS projected CRS}.
      * Increasing coordinate values go {@linkplain AxisDirection#WEST West} and units are {@linkplain Units#METRE metres}.
-     * The ISO 19111 name is <cite>"westing"</cite> and the abbreviation is upper case <cite>"W"</cite>.
+     * The ISO 19111 name is <q>westing</q> and the abbreviation is upper case <q>W</q>.
      *
      * @see #X
      * @see #EASTING
@@ -357,7 +357,7 @@ public final class HardCodedAxes {
     /**
      * Axis for Northing values in a {@linkplain org.apache.sis.referencing.crs.DefaultProjectedCRS projected CRS}.
      * Increasing coordinate values go {@linkplain AxisDirection#NORTH North} and units are {@linkplain Units#METRE metres}.
-     * The ISO 19111 name is <cite>"northing"</cite> and the abbreviation is upper case <cite>"N"</cite>.
+     * The ISO 19111 name is <q>northing</q> and the abbreviation is upper case <q>N</q>.
      *
      * <p>This axis is usually part of a {@link #EASTING}, {@link #NORTHING} set.</p>
      *
@@ -371,7 +371,7 @@ public final class HardCodedAxes {
     /**
      * Axis for Southing values in a {@linkplain org.apache.sis.referencing.crs.DefaultProjectedCRS projected CRS}.
      * Increasing coordinate values go {@linkplain AxisDirection#SOUTH South} and units are {@linkplain Units#METRE metres}.
-     * The ISO 19111 name is <cite>"southing"</cite> and the abbreviation is upper case <cite>"S"</cite>.
+     * The ISO 19111 name is <q>southing</q> and the abbreviation is upper case <q>S</q>.
      *
      * @see #Y
      * @see #NORTHING
@@ -421,7 +421,7 @@ public final class HardCodedAxes {
     /**
      * Axis for time values in a {@linkplain org.apache.sis.referencing.cs.DefaultTimeCS time CS}.
      * Increasing time go toward {@linkplain AxisDirection#FUTURE future} and units are {@linkplain Units#DAY days}.
-     * The abbreviation is lower case <cite>"t"</cite>.
+     * The abbreviation is lower case <q>t</q>.
      */
     public static final DefaultCoordinateSystemAxis TIME = create("Time", "t",
             AxisDirection.FUTURE, Units.DAY, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, null);
@@ -436,7 +436,7 @@ public final class HardCodedAxes {
     /**
      * Axis for column indices in a {@linkplain org.apache.sis.coverage.grid.GridCoverage grid coverage}.
      * Increasing values go toward {@linkplain AxisDirection#COLUMN_POSITIVE positive column number}.
-     * The abbreviation is lower case <cite>"i"</cite>.
+     * The abbreviation is lower case <q>i</q>.
      */
     public static final DefaultCoordinateSystemAxis COLUMN = create("Column", "i",
             AxisDirection.COLUMN_POSITIVE, Units.UNITY, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, null);
@@ -444,7 +444,7 @@ public final class HardCodedAxes {
     /**
      * Axis for row indices in a {@linkplain org.apache.sis.coverage.grid.GridCoverage grid coverage}.
      * Increasing values go toward {@linkplain AxisDirection#ROW_POSITIVE positive row number}.
-     * The abbreviation is lower case <cite>"j"</cite>.
+     * The abbreviation is lower case <q>j</q>.
      */
     public static final DefaultCoordinateSystemAxis ROW = create("Row", "j",
             AxisDirection.ROW_POSITIVE, Units.UNITY, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, null);
@@ -452,7 +452,7 @@ public final class HardCodedAxes {
     /**
      * Axis for <var>x</var> values in a display device.
      * Increasing values go toward {@linkplain AxisDirection#DISPLAY_RIGHT display right}.
-     * The abbreviation is lower case <cite>"x"</cite>.
+     * The abbreviation is lower case <q>x</q>.
      */
     public static final DefaultCoordinateSystemAxis DISPLAY_X = create("x", "x",
             AxisDirection.DISPLAY_RIGHT, Units.UNITY, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, null);
@@ -460,7 +460,7 @@ public final class HardCodedAxes {
     /**
      * Axis for <var>y</var> values in a display device.
      * Increasing values go toward {@linkplain AxisDirection#DISPLAY_DOWN display down}.
-     * The abbreviation is lower case <cite>"y"</cite>.
+     * The abbreviation is lower case <q>y</q>.
      */
     public static final DefaultCoordinateSystemAxis DISPLAY_Y = create("y", "y",
             AxisDirection.DISPLAY_DOWN, Units.UNITY, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, null);
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
index 126cb6641b..b09c8f838e 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
@@ -312,7 +312,7 @@ public final class CoordinateOperationFinderTest extends MathTransformTestCase {
     }
 
     /**
-     * Tests a transformation using the <cite>"Geocentric translations (geog2D domain)"</cite> method
+     * Tests a transformation using the <q>Geocentric translations (geog2D domain)</q> method
      * together with a longitude rotation and unit conversion. The CRS and sample point are taken from
      * the GR3DF97A – <cite>Grille de paramètres de transformation de coordonnées</cite> document.
      *
@@ -358,7 +358,7 @@ public final class CoordinateOperationFinderTest extends MathTransformTestCase {
     }
 
     /**
-     * Tests a transformation using the <cite>"Geocentric translations (geocentric domain)"</cite> method,
+     * Tests a transformation using the <q>Geocentric translations (geocentric domain)</q> method,
      * together with a longitude rotation and unit conversion. The CRS and sample point are derived from
      * the GR3DF97A – <cite>Grille de paramètres de transformation de coordonnées</cite> document.
      *
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
index 56e44ab7e7..159922324f 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
@@ -59,9 +59,9 @@ import org.opengis.metadata.Identifier;
  *
  * <p>This class tests the following operations:</p>
  * <ul>
- *   <li><cite>"NTF (Paris) to WGS 84 (1)"</cite> operation (EPSG:8094), which implies a longitude rotation
+ *   <li><q>NTF (Paris) to WGS 84 (1)</q> operation (EPSG:8094), which implies a longitude rotation
  *       followed by a geocentric translation in the geographic domain.</li>
- *   <li><cite>"Martinique 1938 to RGAF09 (1)"</cite> operation (EPSG:5491), which implies a datum shift
+ *   <li><q>Martinique 1938 to RGAF09 (1)</q> operation (EPSG:5491), which implies a datum shift
  *       that does not go through WGS84. Furthermore, since the EPSG database defines (λ,φ) axis order in
  *       addition to the usual (φ,λ) order for the target CRS, this tests allows us to verify we can find
  *       this operation despite different axis order.</li>
@@ -163,7 +163,7 @@ public final class CoordinateOperationRegistryTest extends MathTransformTestCase
     }
 
     /**
-     * Tests <cite>"NTF (Paris) to WGS 84 (1)"</cite> operation with source and target CRS conform to EPSG definitions.
+     * Tests <q>NTF (Paris) to WGS 84 (1)</q> operation with source and target CRS conform to EPSG definitions.
      *
      * @throws ParseException if a CRS used in this test cannot be parsed.
      * @throws FactoryException if the operation cannot be created.
@@ -199,7 +199,7 @@ public final class CoordinateOperationRegistryTest extends MathTransformTestCase
     }
 
     /**
-     * Tests <cite>"NTF (Paris) to WGS 84 (1)"</cite> operation with normalized source and target CRS.
+     * Tests <q>NTF (Paris) to WGS 84 (1)</q> operation with normalized source and target CRS.
      * {@link CoordinateOperationRegistry} should be able to find the operation despite the difference
      * in axis order an units.
      *
@@ -232,7 +232,7 @@ public final class CoordinateOperationRegistryTest extends MathTransformTestCase
     }
 
     /**
-     * Tests the inverse of <cite>"NTF (Paris) to WGS 84 (1)"</cite> operation, also with different axis order.
+     * Tests the inverse of <q>NTF (Paris) to WGS 84 (1)</q> operation, also with different axis order.
      *
      * @throws ParseException if a CRS used in this test cannot be parsed.
      * @throws FactoryException if the operation cannot be created.
@@ -262,7 +262,7 @@ public final class CoordinateOperationRegistryTest extends MathTransformTestCase
     }
 
     /**
-     * Tests <cite>"NTF (Paris) to WGS 84 (1)"</cite> operation with three-dimensional source and target CRS.
+     * Tests <q>NTF (Paris) to WGS 84 (1)</q> operation with three-dimensional source and target CRS.
      * {@link CoordinateOperationRegistry} should be able to find the operation despite the difference in
      * number of dimensions.
      *
@@ -297,7 +297,7 @@ public final class CoordinateOperationRegistryTest extends MathTransformTestCase
     }
 
     /**
-     * Tests <cite>"NTF (Paris) to WGS 84 (1)"</cite> operation with three-dimensional source and target CRS
+     * Tests <q>NTF (Paris) to WGS 84 (1)</q> operation with three-dimensional source and target CRS
      * having different axis order and units than the ones declared in the EPSG dataset.
      *
      * @throws ParseException if a CRS used in this test cannot be parsed.
@@ -332,7 +332,7 @@ public final class CoordinateOperationRegistryTest extends MathTransformTestCase
     }
 
     /**
-     * Verifies a coordinate operation which is expected to be <cite>"NTF (Paris) to WGS 84 (1)"</cite> (EPSG:8094).
+     * Verifies a coordinate operation which is expected to be <q>NTF (Paris) to WGS 84 (1)</q> (EPSG:8094).
      *
      * @param  domain  either {@code "geog2D domain"} or either {@code "geog3D domain"}.
      * @param  isEPSG  {@code true} if the coordinate operation is expected to contain EPSG identifiers.
@@ -387,8 +387,8 @@ public final class CoordinateOperationRegistryTest extends MathTransformTestCase
     }
 
     /**
-     * Tests <cite>"Martinique 1938 to RGAF09 (1)"</cite> operation with a target CRS fixed to EPSG:7086
-     * instead of EPSG:5489. Both are <cite>"RGAF09"</cite>, but the former use (longitude, latitude) axis
+     * Tests <q>Martinique 1938 to RGAF09 (1)</q> operation with a target CRS fixed to EPSG:7086
+     * instead of EPSG:5489. Both are <q>RGAF09</q>, but the former use (longitude, latitude) axis
      * order instead of the usual (latitude, longitude) order. The source CRS stay fixed to EPSG:4625.
      *
      * @throws FactoryException if an error occurred while creating a CRS or operation.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
index 456590c496..ee3d0a0b00 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
@@ -262,7 +262,7 @@ public final class DefaultCoordinateOperationFactoryTest extends MathTransformTe
     }
 
     /**
-     * Verifies the datum shift parameters in the <cite>"NTF to WGS 84 (1)"</cite> transformation.
+     * Verifies the datum shift parameters in the <q>NTF to WGS 84 (1)</q> transformation.
      * Those parameters depends on whether an EPSG database have been used or not.
      *
      * @param  steps            the list returned by {@link DefaultConcatenatedOperation#getOperations()}.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/CassiniSoldnerTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/CassiniSoldnerTest.java
index 3552d0762d..c400761d41 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/CassiniSoldnerTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/CassiniSoldnerTest.java
@@ -191,7 +191,7 @@ public final class CassiniSoldnerTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Cassini-Soldner"</cite> (EPSG:9806) projection method.
+     * Tests the <q>Cassini-Soldner</q> (EPSG:9806) projection method.
      * This test is defined in GeoAPI conformance test suite.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
@@ -205,7 +205,7 @@ public final class CassiniSoldnerTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Hyperbolic Cassini-Soldner"</cite> (EPSG:9833) projection method.
+     * Tests the <q>Hyperbolic Cassini-Soldner</q> (EPSG:9833) projection method.
      * This test is defined in GeoAPI conformance test suite.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
index 8bd891da22..08b263f770 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
@@ -62,7 +62,7 @@ public final class LambertConicConformalTest extends MapProjectionTestCase {
     }
 
     /**
-     * Verifies the value of the constant used in <cite>"Lambert Conic Conformal (2SP Belgium)"</cite> projection.
+     * Verifies the value of the constant used in <q>Lambert Conic Conformal (2SP Belgium)</q> projection.
      *
      * @see #testLambertConicConformalBelgium()
      */
@@ -184,7 +184,7 @@ public final class LambertConicConformalTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Lambert Conic Conformal (1SP)"</cite> case (EPSG:9801).
+     * Tests the <q>Lambert Conic Conformal (1SP)</q> case (EPSG:9801).
      * This test is defined in GeoAPI conformance test suite.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
@@ -199,7 +199,7 @@ public final class LambertConicConformalTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Lambert Conic Conformal (2SP)"</cite> case (EPSG:9802).
+     * Tests the <q>Lambert Conic Conformal (2SP)</q> case (EPSG:9802).
      * This test is defined in GeoAPI conformance test suite.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
@@ -214,7 +214,7 @@ public final class LambertConicConformalTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Lambert Conic Conformal (2SP Belgium)"</cite> case (EPSG:9803).
+     * Tests the <q>Lambert Conic Conformal (2SP Belgium)</q> case (EPSG:9803).
      * This test is defined in GeoAPI conformance test suite.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
@@ -229,7 +229,7 @@ public final class LambertConicConformalTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Lambert Conic Conformal (2SP Michigan)"</cite> case (EPSG:1051).
+     * Tests the <q>Lambert Conic Conformal (2SP Michigan)</q> case (EPSG:1051).
      * This test is defined in GeoAPI conformance test suite.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
@@ -244,7 +244,7 @@ public final class LambertConicConformalTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Lambert Conic Conformal (1SP West Orientated)"</cite> case (EPSG:9826)).
+     * Tests the <q>Lambert Conic Conformal (1SP West Orientated)</q> case (EPSG:9826)).
      *
      * @throws FactoryException if an error occurred while creating the map projection.
      * @throws TransformException if an error occurred while projecting a coordinate.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
index 622ca9b3d4..fdac566ea2 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
@@ -187,7 +187,7 @@ public final class MercatorTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Mercator (variant A)"</cite> case (EPSG:9804).
+     * Tests the <q>Mercator (variant A)</q> case (EPSG:9804).
      * This test is defined in GeoAPI conformance test suite.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
@@ -202,7 +202,7 @@ public final class MercatorTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Mercator (variant B)"</cite> case (EPSG:9805).
+     * Tests the <q>Mercator (variant B)</q> case (EPSG:9805).
      * This test is defined in GeoAPI conformance test suite.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
@@ -217,7 +217,7 @@ public final class MercatorTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Mercator (variant C)"</cite> case (EPSG:1044).
+     * Tests the <q>Mercator (variant C)</q> case (EPSG:1044).
      * This test is defined in GeoAPI conformance test suite.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
@@ -232,7 +232,7 @@ public final class MercatorTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Mercator (Spherical)"</cite> case (EPSG:1026).
+     * Tests the <q>Mercator (Spherical)</q> case (EPSG:1026).
      * This test is defined in GeoAPI conformance test suite.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
@@ -247,7 +247,7 @@ public final class MercatorTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Popular Visualisation Pseudo Mercator"</cite> case (EPSG:1024).
+     * Tests the <q>Popular Visualisation Pseudo Mercator</q> case (EPSG:1024).
      * This test is defined in GeoAPI conformance test suite.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
@@ -262,7 +262,7 @@ public final class MercatorTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Miller Cylindrical"</cite> case.
+     * Tests the <q>Miller Cylindrical</q> case.
      * This test is defined in GeoAPI conformance test suite.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
@@ -277,9 +277,9 @@ public final class MercatorTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Mercator Auxiliary Sphere"</cite> case with type 3.
+     * Tests the <q>Mercator Auxiliary Sphere</q> case with type 3.
      * This type mandate conversion between geodetic latitude and authalic latitude.
-     * The values used in this test are close to <cite>"Mercator (Spherical)"</cite> (EPSG:1026) case.
+     * The values used in this test are close to <q>Mercator (Spherical)</q> (EPSG:1026) case.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
      * @throws TransformException if an error occurred while projecting a coordinate.
@@ -298,7 +298,7 @@ public final class MercatorTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Mercator Auxiliary Sphere"</cite> case.
+     * Tests the <q>Mercator Auxiliary Sphere</q> case.
      * For the sphere type 0, which is the default, this is equivalent to pseudo-Mercator.
      * This simple test measures the length of an arc of 1 radian at equator.
      *
@@ -324,10 +324,10 @@ public final class MercatorTest extends MapProjectionTestCase {
     }
 
     /**
-     * Creates an ESRI  <cite>"Mercator Auxiliary Sphere"</cite> projection.
+     * Creates an ESRI  <q>Mercator Auxiliary Sphere</q> projection.
      * The axis lengths are those of WGS 84, which result in an authalic radius of about 6371007 meters.
      *
-     * @param  type  the <cite>"Auxiliary sphere type"</cite> parameter value.
+     * @param  type  the <q>Auxiliary sphere type</q> parameter value.
      * @throws FactoryException if an error occurred while creating the map projection.
      */
     private void createAuxiliarySphereProjection(final int type) throws FactoryException {
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistantTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistantTest.java
index 5e714d6624..0fec761ef1 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistantTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistantTest.java
@@ -75,7 +75,7 @@ public final class ModifiedAzimuthalEquidistantTest extends AzimuthalEquidistant
     }
 
     /**
-     * Tests the <cite>"Modified Azimuthal Equidistant"</cite> (EPSG:9832) projection method.
+     * Tests the <q>Modified Azimuthal Equidistant</q> (EPSG:9832) projection method.
      * This test is defined in GeoAPI conformance test suite.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueMercatorTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueMercatorTest.java
index 3532ea7eca..69cc4be660 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueMercatorTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueMercatorTest.java
@@ -132,7 +132,7 @@ public final class ObliqueMercatorTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Hotine Oblique Mercator (variant B)"</cite> (EPSG:9815) projection method.
+     * Tests the <q>Hotine Oblique Mercator (variant B)</q> (EPSG:9815) projection method.
      * This test is defined in GeoAPI conformance test suite.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/OrthographicTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/OrthographicTest.java
index 5ac3477759..cce945f23e 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/OrthographicTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/OrthographicTest.java
@@ -154,7 +154,7 @@ public final class OrthographicTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests the <cite>"Orthographic"</cite> (EPSG:9840) projection method.
+     * Tests the <q>Orthographic</q> (EPSG:9840) projection method.
      * This test is defined in GeoAPI conformance test suite.
      *
      * @throws FactoryException if an error occurred while creating the map projection.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java
index 7c8d94f2e1..acdc63adc4 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java
@@ -95,7 +95,7 @@ public final class PolarStereographicTest extends MapProjectionTestCase {
     }
 
     /**
-     * Tests <cite>"Stereographic North Pole"</cite>. The tested point is adapted from
+     * Tests <q>Stereographic North Pole</q>. The tested point is adapted from
      * <a href="http://geotiff.maptools.org/proj_list/polar_stereographic.html">Polar Stereographic
      * from GeoTIFF projections list</a>.
      *
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/CoordinateFrameRotationTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/CoordinateFrameRotationTest.java
index 17d43c7454..3e979f2bc0 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/CoordinateFrameRotationTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/CoordinateFrameRotationTest.java
@@ -57,7 +57,7 @@ public final class CoordinateFrameRotationTest extends MathTransformTestCase {
     }
 
     /**
-     * Tests <cite>"Coordinate Frame Rotation (geocentric domain)"</cite> (EPSG:1032).
+     * Tests <q>Coordinate Frame Rotation (geocentric domain)</q> (EPSG:1032).
      * with a sample point from WGS 72 to WGS 84 (EPSG Dataset transformation code 1238).
      *
      * @throws FactoryException if an error occurred while creating the transform.
@@ -74,7 +74,7 @@ public final class CoordinateFrameRotationTest extends MathTransformTestCase {
     }
 
     /**
-     * Tests <cite>"Coordinate Frame Rotation (geog3D domain)"</cite> (EPSG:1038).
+     * Tests <q>Coordinate Frame Rotation (geog3D domain)</q> (EPSG:1038).
      *
      * @throws FactoryException if an error occurred while creating the transform.
      * @throws TransformException if transformation of a point failed.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolationTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolationTest.java
index 53f43d588b..cbcbd72ef3 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolationTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolationTest.java
@@ -56,7 +56,7 @@ public final class FranceGeocentricInterpolationTest extends DatumShiftTestCase
      * Precision is given by {@link #ANGULAR_TOLERANCE}.
      *
      * <blockquote><b>Source:</b>
-     * <cite>"Grille de paramètres de transformation de coordonnées GR3DF97A"</cite>
+     * <q>Grille de paramètres de transformation de coordonnées GR3DF97A</q>
      * version 1.0, April 1997 in <a href="http://www.ign.fr">http://www.ign.fr</a>
      * </blockquote>
      *
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
index 962503b1cd..72fb86d97b 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
@@ -158,7 +158,7 @@ public final class GeocentricTranslationTest extends MathTransformTestCase {
 
     /**
      * Creates a datum shift operation without using the provider. This method is equivalent to the
-     * <cite>"Geocentric translations (geog3D domain)"</cite> method (EPSG:1035), but the transform
+     * <q>Geocentric translations (geog3D domain)</q> method (EPSG:1035), but the transform
      * steps are created without the use of any {@link ParameterValueGroup}. This way to create the
      * datum shift is provided for better separation of aspects being tested.
      *
@@ -243,7 +243,7 @@ public final class GeocentricTranslationTest extends MathTransformTestCase {
     }
 
     /**
-     * Tests <cite>"Geocentric translations (geocentric domain)"</cite> (EPSG:1031).
+     * Tests <q>Geocentric translations (geocentric domain)</q> (EPSG:1031).
      *
      * @throws FactoryException if an error occurred while creating the transform.
      * @throws TransformException if transformation of a point failed.
@@ -257,7 +257,7 @@ public final class GeocentricTranslationTest extends MathTransformTestCase {
     }
 
     /**
-     * Tests <cite>"Geocentric translations (geog3D domain)"</cite> (EPSG:1035).
+     * Tests <q>Geocentric translations (geog3D domain)</q> (EPSG:1035).
      *
      * @throws FactoryException if an error occurred while creating the transform.
      * @throws TransformException if transformation of a point failed.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeographicOffsetsTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeographicOffsetsTest.java
index 4d97164a14..0ea2de95cd 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeographicOffsetsTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeographicOffsetsTest.java
@@ -89,11 +89,11 @@ public final class GeographicOffsetsTest extends TransformTestCase {
     /**
      * Tests {@code VerticalOffset.createMathTransform(…)}.
      * This test uses the sample point given in §2.4.2.1 of EPSG guide (April 2015)
-     * for the <cite>"KOC CD height to KOC WD depth (ft) (1)"</cite> transformation (EPSG:5453).
+     * for the <q>KOC CD height to KOC WD depth (ft) (1)</q> transformation (EPSG:5453).
      *
      * <p><b>IMPORTANT:</b> since the source and target axis directions are opposite, the input coordinate
      * need to be multiplied by -1 <strong>before</strong> the operation is applied. This order is required
-     * for consistency with the sign of <cite>"Vertical Offset"</cite> parameter value.</p>
+     * for consistency with the sign of <q>Vertical Offset</q> parameter value.</p>
      *
      * @throws FactoryException should never happen.
      * @throws TransformException should never happen.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/PositionVector7ParamTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/PositionVector7ParamTest.java
index 91fbe8dd18..27acb6d4b1 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/PositionVector7ParamTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/PositionVector7ParamTest.java
@@ -113,7 +113,7 @@ public final class PositionVector7ParamTest extends MathTransformTestCase {
     }
 
     /**
-     * Tests <cite>"Position Vector transformation (geocentric domain)"</cite> (EPSG:1033)
+     * Tests <q>Position Vector transformation (geocentric domain)</q> (EPSG:1033)
      * with a sample point from WGS 72 to WGS 84 (EPSG Dataset transformation code 1238).
      *
      * @throws FactoryException if an error occurred while creating the transform.
@@ -129,7 +129,7 @@ public final class PositionVector7ParamTest extends MathTransformTestCase {
     }
 
     /**
-     * Tests <cite>"Position Vector transformation (geog3D domain)"</cite> (EPSG:1037).
+     * Tests <q>Position Vector transformation (geog3D domain)</q> (EPSG:1037).
      *
      * @throws FactoryException if an error occurred while creating the transform.
      * @throws TransformException if transformation of a point failed.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/SeismicBinGridMock.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/SeismicBinGridMock.java
index 08f904d809..7b792eade2 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/SeismicBinGridMock.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/SeismicBinGridMock.java
@@ -23,7 +23,7 @@ import org.apache.sis.measure.Units;
 
 
 /**
- * The provider for <cite>"P6 (I = J-90°) seismic bin grid transformation"</cite> transformation (EPSG:1049).
+ * The provider for <q>P6 (I = J-90°) seismic bin grid transformation</q> transformation (EPSG:1049).
  *
  * This conversion is not yet implemented in Apache SIS, but we need to at least accept the parameters
  * for a Well Known Text (WKT) parsing test in the {@link org.apache.sis.io.wkt.WKTParserTest} class.
@@ -59,7 +59,7 @@ public final class SeismicBinGridMock extends ProviderMock {
     }
 
     /**
-     * Creates a new <cite>"Seismic bin grid transformation"</cite> operation method.
+     * Creates a new <q>Seismic bin grid transformation</q> operation method.
      */
     public SeismicBinGridMock() {
         super(PARAMETERS);
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CopyTransformTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CopyTransformTest.java
index 356ec51c8d..de31482644 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CopyTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CopyTransformTest.java
@@ -142,7 +142,7 @@ public final class CopyTransformTest extends MathTransformTestCase {
     /**
      * Tests a transform with more output dimensions than input dimensions.
      * The extra dimension has values set to 0. This kind of transform happen
-     * in the inverse of <cite>"Geographic 3D to 2D conversion"</cite> (EPSG:9659).
+     * in the inverse of <q>Geographic 3D to 2D conversion</q> (EPSG:9659).
      *
      * @throws TransformException should never happen.
      */
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
index d12183eff6..aad0941b7e 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
@@ -244,8 +244,8 @@ public final class EllipsoidToCentricTransformTest extends MathTransformTestCase
 
     /**
      * Tests {@link EllipsoidToCentricTransform#tryConcatenate(boolean, MathTransform, MathTransformFactory)}.
-     * The test creates <cite>"Geographic 3D to 2D conversion"</cite>, <cite>"Geographic/Geocentric conversions"</cite>
-     * and <cite>"Geocentric translation"</cite> transforms, then concatenate them.
+     * The test creates <q>Geographic 3D to 2D conversion</q>, <q>Geographic/Geocentric conversions</q>
+     * and <q>Geocentric translation</q> transforms, then concatenate them.
      *
      * <p>Because this test involves a lot of steps, this is more an integration test than a unit test:
      * a failure here may not be easy to debug.</p>
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
index fbe5075d0c..6b2300e704 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
@@ -50,7 +50,7 @@ public class InterpolatedGeocentricTransformTest extends MathTransformTestCase {
     }
 
     /**
-     * Creates the <cite>"France geocentric interpolation"</cite> transform,
+     * Creates the <q>France geocentric interpolation</q> transform,
      * including the normalization and denormalization parts.
      *
      * @throws FactoryException if an error occurred while loading the grid.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/InterpolatedTransformTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/InterpolatedTransformTest.java
index 9f6d1e0527..06318f96c7 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/InterpolatedTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/InterpolatedTransformTest.java
@@ -73,7 +73,7 @@ public final class InterpolatedTransformTest extends MathTransformTestCase {
     }
 
     /**
-     * Creates the same transformation than <cite>"France geocentric interpolation"</cite> transform
+     * Creates the same transformation than <q>France geocentric interpolation</q> transform
      * (approximately), but using shifts in geographic domain instead of in geocentric domain.
      *
      * @throws FactoryException if an error occurred while loading the grid.
@@ -213,7 +213,7 @@ public final class InterpolatedTransformTest extends MathTransformTestCase {
     }
 
     /**
-     * Performs the tests using the same transformation than <cite>"France geocentric interpolation"</cite>
+     * Performs the tests using the same transformation than <q>France geocentric interpolation</q>
      * transform (approximately), but using shifts in geographic domain instead of in geocentric domain.
      *
      * @throws FactoryException if an error occurred while creating a transform.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
index 1df9a45758..2df618572a 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
@@ -292,8 +292,8 @@ public final class MolodenskyTransformTest extends MathTransformTestCase {
      * approximation is. This test performs the comparison for the following transformations:
      *
      * <ul>
-     *   <li>Transformation from NTF to RGF93. Those CRS are the source and target of <cite>"France geocentric
-     *       interpolation"</cite> (ESPG:9655). This test allows us to verify the accuracy documented in
+     *   <li>Transformation from NTF to RGF93. Those CRS are the source and target of <q>France geocentric
+     *       interpolation</q> (ESPG:9655). This test allows us to verify the accuracy documented in
      *       {@link InterpolatedGeocentricTransform}.</li>
      *   <li>(More areas may be added later).</li>
      * </ul>
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
index 804ac04f2b..5bc0f37ed8 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
@@ -105,7 +105,7 @@ public final class ScaleTransformTest extends MathTransformTestCase {
     /**
      * Tests a transform with more output dimensions than input dimensions.
      * The extra dimension has values set to 0. This kind of transform happen
-     * in the inverse of <cite>"Geographic 3D to 2D conversion"</cite> (EPSG:9659).
+     * in the inverse of <q>Geographic 3D to 2D conversion</q> (EPSG:9659).
      *
      * @throws TransformException should never happen.
      */
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Axis.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Axis.java
index f7bf1acaf0..78b2cb0c41 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Axis.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Axis.java
@@ -511,8 +511,8 @@ public final class Axis extends NamedElement {
      * A {@code false} value does not necessarily means that the axis maps cell center; it can be unknown.
      * This method assumes a geographic CRS.
      *
-     * <p>From CF-Convention: <cite>"If bounds are not provided, an application might reasonably assume the
-     * grid points to be at the centers of the cells, but we do not require that in this standard."</cite>
+     * <p>From CF-Convention: <q>If bounds are not provided, an application might reasonably assume the
+     * grid points to be at the centers of the cells, but we do not require that in this standard.</q>
      * We nevertheless tries to guess by checking if the "cell center" convention would result in coordinates
      * outside the range of longitude or latitude values.</p>
      */
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/CRSBuilder.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/CRSBuilder.java
index 99b4539751..aa219f552a 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/CRSBuilder.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/CRSBuilder.java
@@ -103,7 +103,7 @@ abstract class CRSBuilder<D extends Datum, CS extends CoordinateSystem> {
 
     /**
      * Name of the datum on which the CRS is presumed to be based, or {@code ""}. This is used
-     * for building a datum name like <cite>"Unknown datum presumably based on GRS 1980"</cite>.
+     * for building a datum name like <q>Unknown datum presumably based on GRS 1980</q>.
      */
     private final String datumBase;
 
@@ -543,7 +543,7 @@ previous:   for (int i=components.size(); --i >= 0;) {
 
     /**
      * Creates the datum for the coordinate reference system to build. The datum are generally not specified in netCDF files.
-     * To make that clearer, this method builds datum with names like <cite>"Unknown datum presumably based on GRS 1980"</cite>.
+     * To make that clearer, this method builds datum with names like <q>Unknown datum presumably based on GRS 1980</q>.
      * The newly created datum is assigned to the {@link #datum} field.
      *
      * @param  factory     the factory to use for creating the datum.
@@ -613,7 +613,7 @@ previous:   for (int i=components.size(); --i >= 0;) {
         }
 
         /**
-         * Creates a {@link GeodeticDatum} for <cite>"Unknown datum presumably based on GRS 1980"</cite>.
+         * Creates a {@link GeodeticDatum} for <q>Unknown datum presumably based on GRS 1980</q>.
          * This method is invoked only if {@link #setPredefinedComponents(Decoder)} failed to create a datum.
          */
         @Override final void createDatum(DatumFactory factory, Map<String,?> properties) throws FactoryException {
@@ -889,7 +889,7 @@ previous:   for (int i=components.size(); --i >= 0;) {
         }
 
         /**
-         * Creates a {@link VerticalDatum} for <cite>"Unknown datum based on Mean Sea Level"</cite>.
+         * Creates a {@link VerticalDatum} for <q>Unknown datum based on Mean Sea Level</q>.
          */
         @Override void createDatum(DatumFactory factory, Map<String,?> properties) throws FactoryException {
             datum = factory.createVerticalDatum(properties, VerticalDatumType.GEOIDAL);
@@ -952,7 +952,7 @@ previous:   for (int i=components.size(); --i >= 0;) {
         }
 
         /**
-         * Creates a {@link TemporalDatum} for <cite>"Unknown datum based on …"</cite>.
+         * Creates a {@link TemporalDatum} for <q>Unknown datum based on …</q>.
          * This method may left the datum to {@code null} if the epoch is unknown.
          * In such case, {@link #createCRS createCRS(…)} will create an engineering CRS instead.
          */
@@ -1022,7 +1022,7 @@ previous:   for (int i=components.size(); --i >= 0;) {
         }
 
         /**
-         * Creates a {@link VerticalDatum} for <cite>"Unknown datum based on affine coordinate system"</cite>.
+         * Creates a {@link VerticalDatum} for <q>Unknown datum based on affine coordinate system</q>.
          */
         @Override void createDatum(DatumFactory factory, Map<String,?> properties) throws FactoryException {
             datum = factory.createEngineeringDatum(properties);
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Convention.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Convention.java
index dcc2ea7f9f..1c6a9b51a7 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Convention.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Convention.java
@@ -319,8 +319,8 @@ public class Convention {
      *
      * In this case, even if {@link #namesOfAxisVariables(Variable)} explicitly returns {@code {"Latitude", "Longitude"}}
      * we are still unable to associate the {@code SST} variable to those axes because they have no dimension in common.
-     * However if we interpret {@code dim0} and {@code dim1} attributes as <cite>"Name of dimension 0"</cite> and
-     * <cite>"Name of dimension 1"</cite> respectively, then we can associate the same dimension <strong>names</strong>
+     * However if we interpret {@code dim0} and {@code dim1} attributes as <q>Name of dimension 0</q> and
+     * <q>Name of dimension 1</q> respectively, then we can associate the same dimension <strong>names</strong>
      * to all those variables: namely {@code "Line grids"} and {@code "Pixel grids"}. Using those names, we deduce that
      * the {@code (data_y, data_x)} dimensions in the {@code SST} variable are mapped to the {@code (grid_y, grid_x)}
      * dimensions in the localization grid.
@@ -561,7 +561,7 @@ public class Convention {
 
     /**
      * Returns an identification of default geodetic components to use if no corresponding information is found in the
-     * netCDF file. The default implementation returns <cite>"Unknown datum based upon the GRS 1980 ellipsoid"</cite>.
+     * netCDF file. The default implementation returns <q>Unknown datum based upon the GRS 1980 ellipsoid</q>.
      * Note that the GRS 1980 ellipsoid is close to WGS 84 ellipsoid.
      *
      * <h4>Maintenance note</h4>
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
index ceb41b4519..af763570f6 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
@@ -334,7 +334,7 @@ public abstract class Decoder extends ReferencingFactoryContainer {
 
     /**
      * Converts the given numerical values to date, using the information provided in the given unit symbol.
-     * The unit symbol is typically a string like <cite>"days since 1970-01-01T00:00:00Z"</cite>.
+     * The unit symbol is typically a string like <q>days since 1970-01-01T00:00:00Z</q>.
      *
      * @param  symbol  the temporal unit name or symbol, followed by the epoch.
      * @param  values  the values to convert. May contains {@code null} elements.
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Grid.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Grid.java
index 3fc619239f..7fc9a7fbe1 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Grid.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Grid.java
@@ -136,13 +136,13 @@ public abstract class Grid extends NamedElement {
     protected abstract Grid forDimensions(Dimension[] dimensions);
 
     /**
-     * Returns the number of dimensions of source coordinates in the <cite>"grid to CRS"</cite> conversion.
+     * Returns the number of dimensions of source coordinates in the <q>grid to CRS</q> conversion.
      * This is the number of dimensions of the <em>grid</em>.
      * It should be equal to the size of {@link #getDimensions()} list.
      *
      * <h4>Note on target dimensions</h4>
      * A {@code getTargetDimensions()} method would return the number of dimensions of the
-     * <em>coordinate reference system</em>, which is the target of the <cite>"grid to CRS"</cite> conversion.
+     * <em>coordinate reference system</em>, which is the target of the <q>grid to CRS</q> conversion.
      * However, we do not provide that method because, while it should be equal to {@code getAxes(decoder).length},
      * it sometimes differs because {@link #getAxes(Decoder)} may exclude axis with zero dimensions.
      * The latter method should be used as the authoritative one.
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Variable.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Variable.java
index 5d1f44b4c0..20f9c8b0e7 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Variable.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Variable.java
@@ -306,7 +306,7 @@ public abstract class Variable extends Node {
      * for example for more stable identifier or more consistency between similar data.
      *
      * <p>This method does not check the {@code "long_name"} attribute because the long
-     * name is more like a sentence (e.g. <cite>"model wind direction at 10 m"</cite>)
+     * name is more like a sentence (e.g. <q>model wind direction at 10 m</q>)
      * while standard name and variable name are more like identifiers.
      * For the long name, use {@link #getDescription()} instead.</p>
      *
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/package-info.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/package-info.java
index 01ed09bdf3..7400b964a7 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/package-info.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/package-info.java
@@ -28,11 +28,11 @@
  * factors.</p>
  *
  * <p>A side effect of this isolation layer is also to adapt netCDF vocabulary to Apache SIS one.
- * For example, what netCDF calls <cite>"coordinate system"</cite> is actually a mix of what OGC/ISO
- * specifications call <cite>"coordinate system"</cite>, <cite>"coordinate reference system"</cite>
- * and <cite>"grid geometry"</cite>. The netCDF coordinate system <cite>"range"</cite> is closer to
- * ISO 19123 <cite>"domain"</cite>, the netCDF coordinate system <cite>"domain"</cite> is closer to
- * ISO 19123 <cite>"grid envelope"</cite> and the ISO 19123 <cite>"range"</cite> is rather related
+ * For example, what netCDF calls <q>coordinate system</q> is actually a mix of what OGC/ISO
+ * specifications call <q>coordinate system</q>, <q>coordinate reference system</q>
+ * and <q>grid geometry</q>. The netCDF coordinate system <q>range</q> is closer to
+ * ISO 19123 <q>domain</q>, the netCDF coordinate system <q>domain</q> is closer to
+ * ISO 19123 <q>grid envelope</q> and the ISO 19123 <q>range</q> is rather related
  * to the netCDF variable minimum and maximum values. Trying to use OGC/ISO and netCDF objects in
  * the same code appears to be very confusing. This isolation layer allows our code to use a more
  * consistent vocabulary (more similar to the rest of Apache SIS).</p>
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java
index 6ae2597681..e9cd4b08a0 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java
@@ -878,7 +878,7 @@ public final class ChannelDecoder extends Decoder {
 
     /**
      * Converts the given numerical values to date, using the information provided in the given unit symbol.
-     * The unit symbol is typically a string like <cite>"days since 1970-01-01T00:00:00Z"</cite>.
+     * The unit symbol is typically a string like <q>days since 1970-01-01T00:00:00Z</q>.
      *
      * @param  values  the values to convert. May contain {@code null} elements.
      * @return the converted values. May contain {@code null} elements.
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/GridInfo.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/GridInfo.java
index 5f0b60d1ba..410a3ef5c6 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/GridInfo.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/GridInfo.java
@@ -109,7 +109,7 @@ final class GridInfo extends Grid {
     }
 
     /**
-     * Returns the number of dimensions of source coordinates in the <cite>"grid to CRS"</cite> conversion.
+     * Returns the number of dimensions of source coordinates in the <q>grid to CRS</q> conversion.
      * This is the number of dimensions of the <em>grid</em>.
      */
     @Override
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/VariableInfo.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/VariableInfo.java
index 72f9e33a9e..ca518319aa 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/VariableInfo.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/VariableInfo.java
@@ -301,9 +301,9 @@ final class VariableInfo extends Variable implements Comparable<VariableInfo> {
     /**
      * Performs the final adjustment of the {@link #offsetToNextRecord} field of all the given variables.
      * This method applies padding except for the special case documented in netCDF specification:
-     * <cite>"In the special case when there is only one {@linkplain #isUnlimited() record variable}
+     * <q>In the special case when there is only one {@linkplain #isUnlimited() record variable}
      * and it is of type character, byte, or short, no padding is used between record slabs,
-     * so records after the first record do not necessarily start on four-byte boundaries"</cite>.
+     * so records after the first record do not necessarily start on four-byte boundaries</q>.
      *
      * <p>After padding has been applied, this method set the {@link #offsetToNextRecord} of all unlimited
      * variables to the number of bytes to skip before reading the next record.</p>
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/package-info.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/package-info.java
index 9d92d73a99..39129a8c65 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/package-info.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/package-info.java
@@ -22,18 +22,18 @@
  *
  * <h2>Note on the definition of terms</h2>
  * The UCAR library sometimes uses the same words than the ISO/OGC standards for different things.
- * In particular the words <cite>"domain"</cite> and <cite>"range"</cite> can be applied to arbitrary functions,
+ * In particular the words <q>domain</q> and <q>range</q> can be applied to arbitrary functions,
  * and the UCAR library chooses to apply it to the function that converts grid indices to geodetic coordinates.
  * This is a different usage than ISO 19123 which uses the <cite>domain</cite> and <cite>range</cite> words for
  * the coverage function. More specifically:
  *
  * <ul>
- *   <li>UCAR <cite>"coordinate system"</cite> is actually a mix of <cite>coordinate system</cite>,
+ *   <li>UCAR <q>coordinate system</q> is actually a mix of <cite>coordinate system</cite>,
  *       <cite>coordinate reference system</cite> and <cite>grid geometry</cite> in OGC sense.</li>
- *   <li>UCAR coordinate system <cite>"domain"</cite> is not equivalent to ISO 19123 coverage domain,
+ *   <li>UCAR coordinate system <q>domain</q> is not equivalent to ISO 19123 coverage domain,
  *       but is rather related to <cite>grid envelope</cite>.</li>
- *   <li>ISO 19123 coverage <cite>domain</cite> is related to UCAR coordinate system <cite>"range"</cite>.</li>
- *   <li>ISO 19123 coverage <cite>range</cite> is not equivalent to UCAR <cite>"range"</cite>,
+ *   <li>ISO 19123 coverage <cite>domain</cite> is related to UCAR coordinate system <q>range</q>.</li>
+ *   <li>ISO 19123 coverage <cite>range</cite> is not equivalent to UCAR <q>range</q>,
  *       but is rather related to the netCDF variable's minimum and maximum values.</li>
  * </ul>
  *
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/DecoderWrapper.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/DecoderWrapper.java
index 103587f280..c72c220c55 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/DecoderWrapper.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/DecoderWrapper.java
@@ -343,7 +343,7 @@ public final class DecoderWrapper extends Decoder implements CancelTask {
 
     /**
      * Converts the given numerical values to date, using the information provided in the given unit symbol.
-     * The unit symbol is typically a string like <cite>"days since 1970-01-01T00:00:00Z"</cite>.
+     * The unit symbol is typically a string like <q>days since 1970-01-01T00:00:00Z</q>.
      *
      * @param  values  the values to convert. May contains {@code null} elements.
      * @return the converted values. May contains {@code null} elements.
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/GridWrapper.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/GridWrapper.java
index 307b3bf383..30082b7e2f 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/GridWrapper.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/GridWrapper.java
@@ -181,7 +181,7 @@ final class GridWrapper extends Grid {
     }
 
     /**
-     * Returns the number of dimensions of source coordinates in the <cite>"grid to CRS"</cite> conversion.
+     * Returns the number of dimensions of source coordinates in the <q>grid to CRS</q> conversion.
      * This is the number of dimensions of the <em>grid</em>.
      * It should be equal to the size of {@link #getDimensions()} list.
      */
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreProvider.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreProvider.java
index 37d7c52903..bffb983a1d 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreProvider.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreProvider.java
@@ -142,10 +142,10 @@ public abstract class DataStoreProvider {
      *       format specification citation}, including:
      *     <ul>
      *       <li>a format specification {@linkplain DefaultCitation#getTitle() title}
-     *           (example: <cite>“PNG (Portable Network Graphics) Specification”</cite>),</li>
+     *           (example: <q>PNG (Portable Network Graphics) Specification</q>),</li>
      *       <li>the format {@linkplain #getShortName() short name} as a citation
      *           {@linkplain DefaultCitation#getAlternateTitles() alternate title}
-     *           (example: <cite>“PNG”</cite>),</li>
+     *           (example: <q>PNG</q>),</li>
      *       <li>the format version as the citation {@linkplain DefaultCitation#getEdition() edition},</li>
      *       <li>link to an {@linkplain DefaultCitation#getOnlineResources() online} version of the specification.</li>
      *     </ul>
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/Resource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/Resource.java
index 5c53bc83dd..0a01b8a779 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/Resource.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/Resource.java
@@ -25,7 +25,7 @@ import org.apache.sis.storage.event.StoreListener;
 
 /**
  * Provides access to geospatial data in a {@code DataStore}. The ISO 19115 specification defines resource as
- * an <cite>“identifiable asset or means that fulfills a requirement”</cite>. For example, a resource can be a
+ * an <q>identifiable asset or means that fulfills a requirement</q>. For example, a resource can be a
  * coverage of Sea Surface Temperature, or a coverage of water salinity, or the set of all buoys in a harbor,
  * or an aggregation of all the above. A resource is not necessarily digital; it can be a paper document or an
  * organization, in which case only metadata are provided. If the resource is digital, then {@code Resource}s
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java
index c1cef85344..814d664963 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java
@@ -1732,7 +1732,7 @@ public class StorageConnector implements Serializable {
      *
      * <h4>Rational</h4>
      * As of Java 18, above-cited methods systematically catch all {@link IOException}s and wrap
-     * them in an {@link IIOException} with <cite>"Cannot create cache file!"</cite> error message.
+     * them in an {@link IIOException} with <q>Cannot create cache file!</q> error message.
      * This is conform to Image I/O specification but misleading if the stream provider throws an
      * {@link IOException} for another reason. Even when the failure is really caused by a problem
      * with cache file, we want to propagate the original exception to user because its message
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/FormatFinder.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/FormatFinder.java
index 8110dca82f..0231ec0689 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/FormatFinder.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/FormatFinder.java
@@ -304,7 +304,7 @@ final class FormatFinder implements AutoCloseable {
      *
      * <h4>Rational</h4>
      * As of Java 18, above-cited methods systematically catch all {@link IOException}s and wrap
-     * them in an {@link IIOException} with <cite>"Cannot create cache file!"</cite> error message.
+     * them in an {@link IIOException} with <q>Cannot create cache file!</q> error message.
      * This is conform to Image I/O specification but misleading if the stream provider throws an
      * {@link IOException} for another reason. Even when the failure is really caused by a problem
      * with cache file, we want to propagate the original exception to user because its message
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/Store.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/Store.java
index 20daf8f507..6e15afeb29 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/Store.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/Store.java
@@ -189,7 +189,7 @@ final class Store extends URIDataStore implements Filter {
      * <ul>
      *   <li>If the unmarshalled object implements the {@link Metadata} interface, then it is returned directly.</li>
      *   <li>Otherwise if the unmarshalled object implements {@link ReferenceSystem}, then it is wrapped in the
-     *       <cite>"reference system info"</cite> property of a new {@link DefaultMetadata} instance.</li>
+     *       <q>reference system info</q> property of a new {@link DefaultMetadata} instance.</li>
      * </ul>
      *
      * Other cases may be added in any future SIS version.
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/AppendableWriter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/AppendableWriter.java
index c1cd3ca716..45207bc599 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/AppendableWriter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/AppendableWriter.java
@@ -168,7 +168,7 @@ final class AppendableWriter extends Writer {
 
     /**
      * Returns the content of the underlying {@link Appendable} as a string if possible,
-     * or the localized <cite>"Unavailable content"</cite> string otherwise.
+     * or the localized <q>Unavailable content</q> string otherwise.
      *
      * @return the content of the underlying {@code Appendable},
      *         or a localized message for unavailable content.
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/Appender.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/Appender.java
index a0dba96487..20aaaf2152 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/Appender.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/Appender.java
@@ -185,7 +185,7 @@ abstract class Appender implements Appendable {
 
     /**
      * Returns the content of this {@code Appendable} as a string if possible,
-     * or the localized <cite>"Unavailable content"</cite> string otherwise.
+     * or the localized <q>Unavailable content</q> string otherwise.
      *
      * @return the content of this {@code Appendable}, or a localized message for unavailable content.
      *
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/IO.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/IO.java
index b4a36aeb7b..87d0672266 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/IO.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/IO.java
@@ -135,7 +135,7 @@ public final class IO extends Static {
 
     /**
      * Returns the content of the given {@code Appendable} as a string if possible,
-     * or the localized <cite>"Unavailable content"</cite> string otherwise.
+     * or the localized <q>Unavailable content</q> string otherwise.
      */
     static String toString(final Appendable out) {
         final CharSequence content = content(out);
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/TableAppender.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/TableAppender.java
index 23c35706b9..9fba7a9a0f 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/TableAppender.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/TableAppender.java
@@ -683,7 +683,7 @@ public class TableAppender extends Appender implements Flushable {
      *       indirectly a wrapper around a {@code CharSequence}, returns its {@code toString()}
      *       representation. The string will contain this table content only if {@link #flush()}
      *       has been invoked prior this {@code toString()} method.</li>
-     *   <li>Otherwise returns the localized <cite>"Unavailable content"</cite> string.</li>
+     *   <li>Otherwise returns the localized <q>Unavailable content</q> string.</li>
      * </ul>
      */
     @Override
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/TabularFormat.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/TabularFormat.java
index 7eaf633375..1c7ab9a59a 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/TabularFormat.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/TabularFormat.java
@@ -219,9 +219,9 @@ public abstract class TabularFormat<T> extends CompoundFormat<T> {
      * </ul>
      *
      * <h4>Example</h4>
-     * The {@code "?……[…] "} pattern means <cite>"If the next value is non-null, then insert the
+     * The {@code "?……[…] "} pattern means <q>If the next value is non-null, then insert the
      * {@code "……"} string, repeat the {@code '…'} character as many time as needed (may be zero),
-     * then insert a space"</cite>.
+     * then insert a space</q>.
      *
      * @param  pattern  the pattern of the new column separator.
      * @throws IllegalArgumentException if the given pattern is illegal.
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/package-info.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/package-info.java
index 67dd1d1550..49fe43094f 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/package-info.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/package-info.java
@@ -71,7 +71,7 @@
  *   System.out.println( Units.PASCAL.multiply(1000) );
  *   }
  *
- * prints <cite>"kPa"</cite>, i.e. the kilo prefix has been automatically applied
+ * prints <q>kPa</q>, i.e. the kilo prefix has been automatically applied
  * (SI prefixes are applied on SI units only, not on other systems).
  * Other example:
  *
@@ -84,7 +84,7 @@
  *   System.out.println("Instance of Power: " + (e instanceof Power));
  *   }
  *
- * prints <cite>"8 mW"</cite> and <cite>"Instance of Power: true"</cite>,
+ * prints <q>8 mW</q> and <q>Instance of Power: true</q>,
  * i.e. Apache SIS detects that the result of N⋅m∕s is Watt,
  * inherits the milli prefix from millimetre and creates an instance
  * of {@link javax.measure.quantity.Power}, not just {@code Quantity<Power>} (the generic parent).
@@ -92,7 +92,7 @@
  * <p>{@linkplain org.apache.sis.measure.Units#valueOf(String) Parsing} and formatting use Unicode symbols by default, as in µg/m².
  * Parenthesis are recognized at parsing time and used for denominators at formatting time, as in kg/(m²⋅s).
  * While uncommon, Apache SIS accepts fractional powers as in m^⅔.
- * Some sentences like <cite>"100 feet"</cite>, <cite>"square metre"</cite> and <cite>"degree Kelvin"</cite>
+ * Some sentences like <q>100 feet</q>, <q>square metre</q> and <q>degree Kelvin</q>
  * are also recognized at parsing time.</p>
  *
  * @author  Martin Desruisseaux (MPO, IRD, Geomatys)
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/About.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/About.java
index d0819dc2c9..7c5e6da148 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/About.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/About.java
@@ -688,7 +688,7 @@ pathTree:   for (int j=0; ; j++) {
      * node but lost all value of the parent node. For this reason, we perform the merge only if the
      * parent has no value.
      *
-     * <p>See the <cite>"Reduce the depth of a tree"</cite> example in {@link TreeTables} for more information.
+     * <p>See the <q>Reduce the depth of a tree</q> example in {@link TreeTables} for more information.
      * In particular, note that this implementation assumes that children collections are {@link List} (this is
      * guaranteed for {@link DefaultTreeTable.Node} implementations).</p>
      *
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/AbstractInternationalString.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/AbstractInternationalString.java
index b19bd3a411..687f1f7721 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/AbstractInternationalString.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/AbstractInternationalString.java
@@ -34,7 +34,7 @@ import org.apache.sis.util.internal.Strings;
  * The {@linkplain Comparable natural ordering} is defined by the value returned by {@link #toString()}.</p>
  *
  * <h2>Substituting a free text by a code list</h2>
- * The ISO standard allows to substitute some character strings in the <cite>"free text"</cite> domain
+ * The ISO standard allows to substitute some character strings in the <q>free text</q> domain
  * by a {@link org.opengis.util.CodeList} value. This can be done with:
  *
  * <ul>
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java
index 235c8e3898..91826d5ad1 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java
@@ -1000,7 +1000,7 @@ search:     for (; fromIndex <= toIndex; fromIndex++) {
      *
      * <p>More specifically if the given value ends with a {@code '.'} character followed by a
      * sequence of {@code '0'} characters, then those characters are omitted. Otherwise this
-     * method returns the text unchanged. This is a <cite>"all or nothing"</cite> method:
+     * method returns the text unchanged. This is a <q>all or nothing</q> method:
      * either the fractional part is completely removed, or either it is left unchanged.</p>
      *
      * <h4>Examples</h4>
@@ -1176,7 +1176,7 @@ searchWordBreak:    while (true) {
      * <ol>
      *   <li>Invoke {@link #camelCaseToWords(CharSequence, boolean)}, which separate the words
      *     on the basis of character case. For example, {@code "transferFunctionType"} become
-     *     <cite>"transfer function type"</cite>. This works fine for ISO 19115 identifiers.</li>
+     *     <q>transfer function type</q>. This works fine for ISO 19115 identifiers.</li>
      *
      *   <li>Next replace all occurrence of {@code '_'} by spaces in order to take in account
      *     another common naming convention, which uses {@code '_'} as a word separator. This
@@ -1227,7 +1227,7 @@ searchWordBreak:    while (true) {
      * Given a string in camel cases, returns a string with the same words separated by spaces.
      * A word begins with a upper-case character following a lower-case character. For example
      * if the given string is {@code "PixelInterleavedSampleModel"}, then this method returns
-     * <cite>"Pixel Interleaved Sample Model"</cite> or <cite>"Pixel interleaved sample model"</cite>
+     * <q>Pixel Interleaved Sample Model</q> or <q>Pixel interleaved sample model</q>
      * depending on the value of the {@code toLowerCase} argument.
      *
      * <p>If {@code toLowerCase} is {@code false}, then this method inserts spaces but does not change
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ComparisonMode.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ComparisonMode.java
index f7b9888466..7d82726db5 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ComparisonMode.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ComparisonMode.java
@@ -112,8 +112,8 @@ public enum ComparisonMode {
      * transformations still produce the same results.
      *
      * <h4>Example</h4>
-     * A <cite>"Mercator (variant B)"</cite> projection with a <cite>standard parallel</cite> value of 60° produces the
-     * same results than a <cite>"Mercator (variant A)"</cite> projection with a <cite>scale factor</cite> value of 0.5.
+     * A <q>Mercator (variant B)</q> projection with a <cite>standard parallel</cite> value of 60° produces the
+     * same results than a <q>Mercator (variant A)</q> projection with a <cite>scale factor</cite> value of 0.5.
      *
      * @see org.apache.sis.util.Utilities#equalsIgnoreMetadata(Object, Object)
      */
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Debug.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Debug.java
index e6b9053a6c..f2c3dbebaa 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Debug.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Debug.java
@@ -26,7 +26,7 @@ import java.lang.annotation.RetentionPolicy;
 /**
  * Annotates classes or methods that are provided mostly for debugging purpose.
  * This annotation is defined in order to make easier to find which debugging tools are available in case of problem.
- * See the <cite>"Use"</cite> javadoc link for a list of annotated classes and methods.
+ * See the <q>Use</q> javadoc link for a list of annotated classes and methods.
  *
  * <p>Unless specified otherwise in javadoc, {@link Object#toString()} method implementations in Apache SIS
  * are implicitly for debugging purpose. Those methods are usually <em>not</em> annotated with {@code @Debug}
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/LenientComparable.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/LenientComparable.java
index 6b7b12b8cc..d417a0c2f2 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/LenientComparable.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/LenientComparable.java
@@ -72,8 +72,8 @@ package org.apache.sis.util;
  *            because there is no GeoAPI interfaces for the various kind of math transforms.</li>
  *       <li>{@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} – Objects must be of the same class,
  *           but the parameter values can be different if they are different way to formulate the same transform.
- *           For example, a <cite>"Mercator (2SP)"</cite> projection on a sphere with a <cite>standard parallel</cite>
- *           value of 60° produces the same results than a <cite>"Mercator (1SP)"</cite> projection on the same sphere
+ *           For example, a <q>Mercator (2SP)</q> projection on a sphere with a <cite>standard parallel</cite>
+ *           value of 60° produces the same results than a <q>Mercator (1SP)</q> projection on the same sphere
  *           with a <cite>scale factor</cite> value of 0.5.</li>
  *       <li>{@link ComparisonMode#APPROXIMATE APPROXIMATE} – The same attributes than the above
  *           {@code IGNORE_METADATA} mode are compared, but a slight (implementation dependant)
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Numbers.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Numbers.java
index 39ecc45f70..d1a48c35bd 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Numbers.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Numbers.java
@@ -788,8 +788,8 @@ asLong: if (mapping != null) {
 
     /**
      * Returns a {@code NaN}, zero, empty or {@code null} value of the given type. This method
-     * tries to return the closest value that can be interpreted as <cite>"none"</cite>, which
-     * is usually not the same than <cite>"zero"</cite>. More specifically:
+     * tries to return the closest value that can be interpreted as <q>none</q>, which
+     * is usually not the same than <q>zero</q>. More specifically:
      *
      * <ul>
      *   <li>If the given type is a floating point <strong>primitive</strong> type ({@code float}
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ObjectConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ObjectConverter.java
index 1b477cf713..ccd71dad43 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ObjectConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ObjectConverter.java
@@ -140,7 +140,7 @@ public interface ObjectConverter<S,T> extends Function<S,T> {
      * </ul>
      *
      * In other words, the {@code ""} value is unconvertible but nevertheless considered as part of the converter
-     * domain, and is mapped to <cite>"no number"</cite>. All other unparsable strings are considered outside the
+     * domain, and is mapped to <q>no number</q>. All other unparsable strings are considered outside the
      * converter domain.
      *
      * @param  object  the object to convert, or {@code null}.
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/StringBuilders.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/StringBuilders.java
index 4fcbd39b26..3f040cd4dc 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/StringBuilders.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/StringBuilders.java
@@ -258,7 +258,7 @@ public final class StringBuilders extends Static {
      *
      * <p>More specifically if the given buffer ends with a {@code '.'} character followed by a
      * sequence of {@code '0'} characters, then those characters are removed. Otherwise this
-     * method does nothing. This is a <cite>"all or nothing"</cite> method: either the fractional
+     * method does nothing. This is a <q>all or nothing</q> method: either the fractional
      * part is completely removed, or either it is left unchanged.</p>
      *
      * <h4>Use case</h4>
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/Containers.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/Containers.java
index 424bd4540b..bcb18b24f4 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/Containers.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/Containers.java
@@ -219,7 +219,7 @@ public final class Containers extends Static {
      * or {@code null} if the map is null or does not contain a value for the key.
      * If the mapped value is non-null but cannot be casted to the given type, then this
      * method throws an {@link IllegalArgumentException} with a message of the form
-     * <cite>"Property ‘{@code key}’ does not accept instances of ‘{@code value.class}’."</cite>.
+     * <q>Property ‘{@code key}’ does not accept instances of ‘{@code value.class}’.</q>.
      *
      * <p>This is a helper method for processing a {@code Map} argument containing property values of various
      * kinds, as in the {@link org.apache.sis.referencing.AbstractIdentifiedObject#AbstractIdentifiedObject(Map)
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TableColumn.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TableColumn.java
index d6b24bbaa9..b3e441ddfa 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TableColumn.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TableColumn.java
@@ -100,7 +100,7 @@ import org.apache.sis.util.resources.Vocabulary;
 public class TableColumn<V> implements CheckedContainer<V> {
     /**
      * Frequently-used constant for a column of object names.
-     * The column {@linkplain #getHeader() header} is <cite>"Name"</cite> (eventually localized) and
+     * The column {@linkplain #getHeader() header} is <q>Name</q> (eventually localized) and
      * the column elements are typically instances of {@link String} or {@link InternationalString},
      * depending on whether the data provide localization support or not.
      */
@@ -109,7 +109,7 @@ public class TableColumn<V> implements CheckedContainer<V> {
 
     /**
      * Frequently-used constant for a column of object identifiers.
-     * The column {@linkplain #getHeader() header} is <cite>"Identifier"</cite> (eventually localized)
+     * The column {@linkplain #getHeader() header} is <q>Identifier</q> (eventually localized)
      * and the column elements are instances of {@link String}.
      */
     public static final TableColumn<String> IDENTIFIER = new Constant<>("IDENTIFIER",
@@ -117,7 +117,7 @@ public class TableColumn<V> implements CheckedContainer<V> {
 
     /**
      * Frequently-used constant for a column of index values.
-     * The column {@linkplain #getHeader() header} is <cite>"Index"</cite> (eventually localized)
+     * The column {@linkplain #getHeader() header} is <q>Index</q> (eventually localized)
      * and the column elements are instances of {@link Integer}.
      */
     public static final TableColumn<Integer> INDEX = new Constant<>("INDEX",
@@ -125,7 +125,7 @@ public class TableColumn<V> implements CheckedContainer<V> {
 
     /**
      * Frequently-used constant for a column of object types.
-     * The column {@linkplain #getHeader() header} is <cite>"Type"</cite> (eventually localized).
+     * The column {@linkplain #getHeader() header} is <q>Type</q> (eventually localized).
      */
     @SuppressWarnings("unchecked")
     public static final TableColumn<Class<?>> TYPE = new Constant<>("TYPE",
@@ -133,7 +133,7 @@ public class TableColumn<V> implements CheckedContainer<V> {
 
     /**
      * Frequently-used constant for a column of object values.
-     * The column {@linkplain #getHeader() header} is <cite>"Value"</cite> (eventually localized) and
+     * The column {@linkplain #getHeader() header} is <q>Value</q> (eventually localized) and
      * the column elements can be instance of any kind of objects.
      *
      * @see #VALUE_AS_TEXT
@@ -144,7 +144,7 @@ public class TableColumn<V> implements CheckedContainer<V> {
 
     /**
      * Frequently-used constant for a column of object textual values.
-     * The column {@linkplain #getHeader() header} is <cite>"Value"</cite> (eventually localized) and
+     * The column {@linkplain #getHeader() header} is <q>Value</q> (eventually localized) and
      * the column elements are typically instances of {@link String} or {@link InternationalString},
      * depending on whether the data provide localization support or not.
      */
@@ -153,14 +153,14 @@ public class TableColumn<V> implements CheckedContainer<V> {
 
     /**
      * Frequently-used constant for a column of object numerical values.
-     * The column {@linkplain #getHeader() header} is <cite>"Value"</cite> (eventually localized).
+     * The column {@linkplain #getHeader() header} is <q>Value</q> (eventually localized).
      */
     public static final TableColumn<Number> VALUE_AS_NUMBER = new Constant<>("VALUE_AS_NUMBER",
             Number.class, Vocabulary.Keys.Value);
 
     /**
      * Frequently-used constant for a column of remarks.
-     * The column {@linkplain #getHeader() header} is <cite>"Remarks"</cite> (eventually localized) and
+     * The column {@linkplain #getHeader() header} is <q>Remarks</q> (eventually localized) and
      * the column elements are typically instances of {@link String} or {@link InternationalString},
      * depending on whether the data provide localization support or not.
      *
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTableFormat.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTableFormat.java
index ac5388cd60..6fa76f210b 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTableFormat.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTableFormat.java
@@ -78,9 +78,9 @@ import static org.apache.sis.util.Characters.NO_BREAK_SPACE;
  * below nodes) can be modified by calls to the setter methods defined in this formatter.
  * In particular, the dots joining the node labels to their values can be specified by the
  * {@linkplain #setColumnSeparatorPattern(String) column separator pattern}.
- * The default pattern is {@code "?……[…] "}, which means <cite>"If the next value is non-null,
+ * The default pattern is {@code "?……[…] "}, which means <q>If the next value is non-null,
  * then insert the {@code "……"} string, repeat the {@code '…'} character as many time as needed
- * (may be zero), and finally insert a space"</cite>.
+ * (may be zero), and finally insert a space</q>.
  *
  * <h2>Safety against infinite recursivity</h2>
  * Some {@code TreeTable} implementations generate the nodes dynamically as wrappers around Java objects.
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/Constants.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/Constants.java
index ca3f1ffada..058a91b3a4 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/Constants.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/Constants.java
@@ -203,7 +203,7 @@ public final class Constants extends Static {
                                NUM_COL = "num_col";
 
     /**
-     * The OGC name for <cite>"Affine parametric transformation"</cite>.
+     * The OGC name for <q>Affine parametric transformation</q>.
      *
      * @see org.apache.sis.referencing.operation.provider.Affine#NAME
      */
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/DoubleDouble.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/DoubleDouble.java
index a559e9b22c..6938ed9f6a 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/DoubleDouble.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/DoubleDouble.java
@@ -196,7 +196,7 @@ public final class DoubleDouble extends Number implements Comparable<DoubleDoubl
 
     /**
      * The error that shall be added to the main {@link #value} in order to get the
-     * <cite>"real"</cite> (actually <cite>"the most accurate that we can"</cite>) value.
+     * <q>real</q> (actually <q>the most accurate that we can</q>) value.
      */
     public final double error;
 
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/LocalizedParseException.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/LocalizedParseException.java
index f00f2b6380..fb42b2d27c 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/LocalizedParseException.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/LocalizedParseException.java
@@ -78,8 +78,8 @@ public final class LocalizedParseException extends ParseException implements Loc
 
     /**
      * Creates a {@link ParseException} with a localized message built from the given parsing information.
-     * This convenience constructor creates a message of the kind <cite>"Cannot parse string "text" as an
-     * object of type 'type'"</cite>.
+     * This convenience constructor creates a message of the kind <q>Cannot parse string "text" as an
+     * object of type 'type'</q>.
      *
      * @param  locale  the locale for {@link #getLocalizedMessage()}, or {@code null} for the default.
      * @param  type    the type of objects parsed by the {@link java.text.Format}.
diff --git a/endorsed/src/org.apache.sis.util/test/org/apache/sis/measure/UnitFormatTest.java b/endorsed/src/org.apache.sis.util/test/org/apache/sis/measure/UnitFormatTest.java
index 309941b5dc..389d2f559d 100644
--- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/measure/UnitFormatTest.java
+++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/measure/UnitFormatTest.java
@@ -654,7 +654,7 @@ public final class UnitFormatTest extends TestCase {
     /**
      * Tests parsing of miscellaneous symbols, followed by formatting.
      * This test uses some units defined by World Meteorological Organisation (WMO).
-     * The lines with <cite>"Too aggressive simplification bug (SIS-378)"</cite> comment are actually bugs,
+     * The lines with <q>Too aggressive simplification bug (SIS-378)</q> comment are actually bugs,
      * but they are tested anyway (despite the bogus "expected" value) for tracking progresses on SIS-378.
      *
      * @see <a href="https://issues.apache.org/jira/browse/SIS-378">SIS-378</a>
diff --git a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/RecentReferenceSystems.java b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/RecentReferenceSystems.java
index f8ba44279a..5dabf7e3d4 100644
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/RecentReferenceSystems.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/RecentReferenceSystems.java
@@ -386,7 +386,7 @@ public class RecentReferenceSystems {
      * If a previous preferred system existed, the previous system will be moved to alternative choices.
      *
      * <p>The {@code replaceByAuthoritativeDefinition} argument specifies whether the given reference system should
-     * be replaced by authoritative definition. If {@code true} then for example a <cite>"WGS 84"</cite> geographic
+     * be replaced by authoritative definition. If {@code true} then for example a <q>WGS 84</q> geographic
      * CRS with (<var>longitude</var>, <var>latitude</var>) axis order may be replaced by "EPSG::4326" definition with
      * (<var>latitude</var>, <var>longitude</var>) axis order.</p>
      *
@@ -443,7 +443,7 @@ public class RecentReferenceSystems {
      * then reference systems that do not intersect the AOI will be hidden.
      *
      * <p>The {@code replaceByAuthoritativeDefinition} argument specifies whether the given reference systems should
-     * be replaced by authoritative definitions. If {@code true} then for example a <cite>"WGS 84"</cite> geographic
+     * be replaced by authoritative definitions. If {@code true} then for example a <q>WGS 84</q> geographic
      * CRS with (<var>longitude</var>, <var>latitude</var>) axis order may be replaced by "EPSG::4326" definition with
      * (<var>latitude</var>, <var>longitude</var>) axis order.</p>
      *
diff --git a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/Wizard.java b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/Wizard.java
index 8607027c82..77b8d40d94 100644
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/Wizard.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/Wizard.java
@@ -208,7 +208,7 @@ final class Wizard extends FileFilter implements ActionListener, PropertyChangeL
     private final JLabel javafxPathError;
 
     /**
-     * The message shown on the last page. This is <cite>"Apache SIS setup is completed"</cite>,
+     * The message shown on the last page. This is <q>Apache SIS setup is completed</q>,
      * but may be changed if the setup failed.
      */
     private JLabel finalMessage;