diff --git a/src/aggregation/agg_req.rs b/src/aggregation/agg_req.rs
index fd9155e51..0fba56dc1 100644
--- a/src/aggregation/agg_req.rs
+++ b/src/aggregation/agg_req.rs
@@ -1,7 +1,7 @@
 //! Contains the aggregation request tree. Used to build an
-//! [AggregationCollector](super::AggregationCollector).
+//! [`AggregationCollector`](super::AggregationCollector).
 //!
-//! [Aggregations] is the top level entry point to create a request, which is a `HashMap<String,
+//! [`Aggregations`] is the top level entry point to create a request, which is a `HashMap<String,
 //! Aggregation>`.
 //!
 //! Requests are compatible with the json format of elasticsearch.
@@ -54,8 +54,8 @@ use super::bucket::{HistogramAggregation, TermsAggregation};
 use super::metric::{AverageAggregation, StatsAggregation};
 use super::VecWithNames;
 
-/// The top-level aggregation request structure, which contains [Aggregation] and their user defined
-/// names. It is also used in [buckets](BucketAggregation) to define sub-aggregations.
+/// The top-level aggregation request structure, which contains [`Aggregation`] and their user
+/// defined names. It is also used in [buckets](BucketAggregation) to define sub-aggregations.
 ///
 /// The key is the user defined name of the aggregation.
 pub type Aggregations = HashMap<String, Aggregation>;
@@ -139,15 +139,15 @@ pub fn get_fast_field_names(aggs: &Aggregations) -> HashSet<String> {
     fast_field_names
 }
 
-/// Aggregation request of [BucketAggregation] or [MetricAggregation].
+/// Aggregation request of [`BucketAggregation`] or [`MetricAggregation`].
 ///
 /// An aggregation is either a bucket or a metric.
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum Aggregation {
-    /// Bucket aggregation, see [BucketAggregation] for details.
+    /// Bucket aggregation, see [`BucketAggregation`] for details.
     Bucket(BucketAggregation),
-    /// Metric aggregation, see [MetricAggregation] for details.
+    /// Metric aggregation, see [`MetricAggregation`] for details.
     Metric(MetricAggregation),
 }
 
diff --git a/src/aggregation/agg_result.rs b/src/aggregation/agg_result.rs
index 8bc9cf60c..11c9f03e7 100644
--- a/src/aggregation/agg_result.rs
+++ b/src/aggregation/agg_result.rs
@@ -113,14 +113,14 @@ pub enum BucketResult {
         ///
         /// If there are holes depends on the request, if min_doc_count is 0, then there are no
         /// holes between the first and last bucket.
-        /// See [HistogramAggregation](super::bucket::HistogramAggregation)
+        /// See [`HistogramAggregation`](super::bucket::HistogramAggregation)
         buckets: BucketEntries<BucketEntry>,
     },
     /// This is the term result
     Terms {
         /// The buckets.
         ///
-        /// See [TermsAggregation](super::bucket::TermsAggregation)
+        /// See [`TermsAggregation`](super::bucket::TermsAggregation)
         buckets: Vec<BucketEntry>,
         /// The number of documents that didn’t make it into to TOP N due to shard_size or size
         sum_other_doc_count: u64,
@@ -234,10 +234,10 @@ pub struct RangeBucketEntry {
     #[serde(flatten)]
     /// sub-aggregations in this bucket.
     pub sub_aggregation: AggregationResults,
-    /// The from range of the bucket. Equals f64::MIN when None.
+    /// The from range of the bucket. Equals `f64::MIN` when `None`.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub from: Option<f64>,
-    /// The to range of the bucket. Equals f64::MAX when None.
+    /// The to range of the bucket. Equals `f64::MAX` when `None`.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub to: Option<f64>,
 }
diff --git a/src/aggregation/bucket/histogram/histogram.rs b/src/aggregation/bucket/histogram/histogram.rs
index c2823ac8d..6579f4fc7 100644
--- a/src/aggregation/bucket/histogram/histogram.rs
+++ b/src/aggregation/bucket/histogram/histogram.rs
@@ -37,14 +37,14 @@ use crate::{DocId, TantivyError};
 /// [hard_bounds](HistogramAggregation::hard_bounds).
 ///
 /// # Result
-/// Result type is [BucketResult](crate::aggregation::agg_result::BucketResult) with
-/// [BucketEntry](crate::aggregation::agg_result::BucketEntry) on the
-/// AggregationCollector.
+/// Result type is [`BucketResult`](crate::aggregation::agg_result::BucketResult) with
+/// [`BucketEntry`](crate::aggregation::agg_result::BucketEntry) on the
+/// `AggregationCollector`.
 ///
 /// Result type is
-/// [IntermediateBucketResult](crate::aggregation::intermediate_agg_result::IntermediateBucketResult) with
-/// [IntermediateHistogramBucketEntry](crate::aggregation::intermediate_agg_result::IntermediateHistogramBucketEntry) on the
-/// DistributedAggregationCollector.
+/// [`IntermediateBucketResult`](crate::aggregation::intermediate_agg_result::IntermediateBucketResult) with
+/// [`IntermediateHistogramBucketEntry`](crate::aggregation::intermediate_agg_result::IntermediateHistogramBucketEntry) on the
+/// `DistributedAggregationCollector`.
 ///
 /// # Limitations/Compatibility
 ///
@@ -61,7 +61,7 @@ use crate::{DocId, TantivyError};
 /// ```
 ///
 /// Response
-/// See [BucketEntry](crate::aggregation::agg_result::BucketEntry)
+/// See [`BucketEntry`](crate::aggregation::agg_result::BucketEntry)
 
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
 pub struct HistogramAggregation {
@@ -518,7 +518,7 @@ pub(crate) fn intermediate_histogram_buckets_to_final_buckets(
 
 /// Applies req extended_bounds/hard_bounds on the min_max value
 ///
-/// May return (f64::MAX, f64::MIN), if there is no range.
+/// May return `(f64::MAX, f64::MIN)`, if there is no range.
 fn get_req_min_max(req: &HistogramAggregation, min_max: Option<(f64, f64)>) -> (f64, f64) {
     let (mut min, mut max) = min_max.unwrap_or((f64::MAX, f64::MIN));
 
diff --git a/src/aggregation/bucket/mod.rs b/src/aggregation/bucket/mod.rs
index a47437952..723c6145b 100644
--- a/src/aggregation/bucket/mod.rs
+++ b/src/aggregation/bucket/mod.rs
@@ -1,11 +1,11 @@
 //! Module for all bucket aggregations.
 //!
 //! BucketAggregations create buckets of documents
-//! [BucketAggregation](super::agg_req::BucketAggregation).
+//! [`BucketAggregation`](super::agg_req::BucketAggregation).
 //!
-//! Results of final buckets are [BucketResult](super::agg_result::BucketResult).
+//! Results of final buckets are [`BucketResult`](super::agg_result::BucketResult).
 //! Results of intermediate buckets are
-//! [IntermediateBucketResult](super::intermediate_agg_result::IntermediateBucketResult)
+//! [`IntermediateBucketResult`](super::intermediate_agg_result::IntermediateBucketResult)
 
 mod histogram;
 mod range;
diff --git a/src/aggregation/bucket/range.rs b/src/aggregation/bucket/range.rs
index 987cf3f48..7029dab83 100644
--- a/src/aggregation/bucket/range.rs
+++ b/src/aggregation/bucket/range.rs
@@ -22,14 +22,14 @@ use crate::{DocId, TantivyError};
 /// against each bucket range. Note that this aggregation includes the from value and excludes the
 /// to value for each range.
 ///
-/// Result type is [BucketResult](crate::aggregation::agg_result::BucketResult) with
-/// [RangeBucketEntry](crate::aggregation::agg_result::RangeBucketEntry) on the
-/// AggregationCollector.
+/// Result type is [`BucketResult`](crate::aggregation::agg_result::BucketResult) with
+/// [`RangeBucketEntry`](crate::aggregation::agg_result::RangeBucketEntry) on the
+/// `AggregationCollector`.
 ///
 /// Result type is
-/// [IntermediateBucketResult](crate::aggregation::intermediate_agg_result::IntermediateBucketResult) with
-/// [IntermediateRangeBucketEntry](crate::aggregation::intermediate_agg_result::IntermediateRangeBucketEntry) on the
-/// DistributedAggregationCollector.
+/// [`IntermediateBucketResult`](crate::aggregation::intermediate_agg_result::IntermediateBucketResult) with
+/// [`IntermediateRangeBucketEntry`](crate::aggregation::intermediate_agg_result::IntermediateRangeBucketEntry) on the
+/// `DistributedAggregationCollector`.
 ///
 /// # Limitations/Compatibility
 /// Overlapping ranges are not yet supported.
@@ -67,11 +67,11 @@ pub struct RangeAggregationRange {
     #[serde(skip_serializing_if = "Option::is_none", default)]
     pub key: Option<String>,
     /// The from range value, which is inclusive in the range.
-    /// None equals to an open ended interval.
+    /// `None` equals to an open ended interval.
     #[serde(skip_serializing_if = "Option::is_none", default)]
     pub from: Option<f64>,
     /// The to range value, which is not inclusive in the range.
-    /// None equals to an open ended interval.
+    /// `None` equals to an open ended interval.
     #[serde(skip_serializing_if = "Option::is_none", default)]
     pub to: Option<f64>,
 }
@@ -101,7 +101,7 @@ impl From<Range<f64>> for RangeAggregationRange {
 pub(crate) struct InternalRangeAggregationRange {
     /// Custom key for the range bucket
     key: Option<String>,
-    /// u64 range value
+    /// `u64` range value
     range: Range<u64>,
 }
 
@@ -131,9 +131,9 @@ pub(crate) struct SegmentRangeBucketEntry {
     pub key: Key,
     pub doc_count: u64,
     pub sub_aggregation: Option<SegmentAggregationResultsCollector>,
-    /// The from range of the bucket. Equals f64::MIN when None.
+    /// The from range of the bucket. Equals `f64::MIN` when `None`.
     pub from: Option<f64>,
-    /// The to range of the bucket. Equals f64::MAX when None. Open interval, `to` is not
+    /// The to range of the bucket. Equals `f64::MAX` when `None`. Open interval, `to` is not
     /// inclusive.
     pub to: Option<f64>,
 }
@@ -261,7 +261,7 @@ impl SegmentRangeCollector {
         let accessor = bucket_with_accessor
             .accessor
             .as_single()
-            .expect("unexpected fast field cardinatility");
+            .expect("unexpected fast field cardinality");
         for docs in iter.by_ref() {
             let val1 = accessor.get_val(docs[0] as u64);
             let val2 = accessor.get_val(docs[1] as u64);
diff --git a/src/aggregation/bucket/term_agg.rs b/src/aggregation/bucket/term_agg.rs
index 947853a6a..9f68a80d7 100644
--- a/src/aggregation/bucket/term_agg.rs
+++ b/src/aggregation/bucket/term_agg.rs
@@ -31,7 +31,7 @@ use crate::{DocId, TantivyError};
 ///
 /// Even with a larger `segment_size` value, doc_count values for a terms aggregation may be
 /// approximate. As a result, any sub-aggregations on the terms aggregation may also be approximate.
-/// `sum_other_doc_count` is the number of documents that didn’t make it into the the top size
+/// `sum_other_doc_count` is the number of documents that didn’t make it into the top size
 /// terms. If this is greater than 0, you can be sure that the terms agg had to throw away some
 /// buckets, either because they didn’t fit into size on the root node or they didn’t fit into
 /// `segment_size` on the segment node.
@@ -42,14 +42,14 @@ use crate::{DocId, TantivyError};
 /// each segment. It’s the sum of the size of the largest bucket on each segment that didn’t fit
 /// into segment_size.
 ///
-/// Result type is [BucketResult](crate::aggregation::agg_result::BucketResult) with
-/// [TermBucketEntry](crate::aggregation::agg_result::BucketEntry) on the
-/// AggregationCollector.
+/// Result type is [`BucketResult`](crate::aggregation::agg_result::BucketResult) with
+/// [`TermBucketEntry`](crate::aggregation::agg_result::BucketEntry) on the
+/// `AggregationCollector`.
 ///
 /// Result type is
-/// [IntermediateBucketResult](crate::aggregation::intermediate_agg_result::IntermediateBucketResult) with
-/// [IntermediateTermBucketEntry](crate::aggregation::intermediate_agg_result::IntermediateTermBucketEntry) on the
-/// DistributedAggregationCollector.
+/// [`IntermediateBucketResult`](crate::aggregation::intermediate_agg_result::IntermediateBucketResult) with
+/// [`IntermediateTermBucketEntry`](crate::aggregation::intermediate_agg_result::IntermediateTermBucketEntry) on the
+/// `DistributedAggregationCollector`.
 ///
 /// # Limitations/Compatibility
 ///
diff --git a/src/aggregation/collector.rs b/src/aggregation/collector.rs
index 03c80af23..cd91ec20c 100644
--- a/src/aggregation/collector.rs
+++ b/src/aggregation/collector.rs
@@ -131,7 +131,7 @@ fn merge_fruits(
     }
 }
 
-/// AggregationSegmentCollector does the aggregation collection on a segment.
+/// `AggregationSegmentCollector` does the aggregation collection on a segment.
 pub struct AggregationSegmentCollector {
     aggs_with_accessor: AggregationsWithAccessor,
     result: SegmentAggregationResultsCollector,
@@ -139,8 +139,8 @@ pub struct AggregationSegmentCollector {
 }
 
 impl AggregationSegmentCollector {
-    /// Creates an AggregationSegmentCollector from an [Aggregations] request and a segment reader.
-    /// Also includes validation, e.g. checking field types and existence.
+    /// Creates an `AggregationSegmentCollector from` an [`Aggregations`] request and a segment
+    /// reader. Also includes validation, e.g. checking field types and existence.
     pub fn from_agg_req_and_reader(
         agg: &Aggregations,
         reader: &SegmentReader,
diff --git a/src/aggregation/intermediate_agg_result.rs b/src/aggregation/intermediate_agg_result.rs
index eab4325c7..4baeec902 100644
--- a/src/aggregation/intermediate_agg_result.rs
+++ b/src/aggregation/intermediate_agg_result.rs
@@ -108,10 +108,10 @@ impl IntermediateAggregationResults {
         Self { metrics, buckets }
     }
 
-    /// Merge an other intermediate aggregation result into this result.
+    /// Merge another intermediate aggregation result into this result.
     ///
     /// The order of the values need to be the same on both results. This is ensured when the same
-    /// (key values) are present on the underlying VecWithNames struct.
+    /// (key values) are present on the underlying `VecWithNames` struct.
     pub fn merge_fruits(&mut self, other: IntermediateAggregationResults) {
         if let (Some(buckets_left), Some(buckets_right)) = (&mut self.buckets, other.buckets) {
             for (bucket_left, bucket_right) in
@@ -560,10 +560,10 @@ pub struct IntermediateRangeBucketEntry {
     pub doc_count: u64,
     /// The sub_aggregation in this bucket.
     pub sub_aggregation: IntermediateAggregationResults,
-    /// The from range of the bucket. Equals f64::MIN when None.
+    /// The from range of the bucket. Equals `f64::MIN` when `None`.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub from: Option<f64>,
-    /// The to range of the bucket. Equals f64::MAX when None.
+    /// The to range of the bucket. Equals `f64::MAX` when `None`.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub to: Option<f64>,
 }
diff --git a/src/aggregation/metric/stats.rs b/src/aggregation/metric/stats.rs
index 924bc634c..cb4236b8a 100644
--- a/src/aggregation/metric/stats.rs
+++ b/src/aggregation/metric/stats.rs
@@ -7,8 +7,8 @@ use crate::{DocId, TantivyError};
 
 /// A multi-value metric aggregation that computes stats of numeric values that are
 /// extracted from the aggregated documents.
-/// Supported field types are u64, i64, and f64.
-/// See [Stats] for returned statistics.
+/// Supported field types are `u64`, `i64`, and `f64`.
+/// See [`Stats`] for returned statistics.
 ///
 /// # JSON Format
 /// ```json
@@ -43,13 +43,13 @@ pub struct Stats {
     pub count: usize,
     /// The sum of the fast field values.
     pub sum: f64,
-    /// The standard deviation of the fast field values. None for count == 0.
+    /// The standard deviation of the fast field values. `None` for count == 0.
     pub standard_deviation: Option<f64>,
     /// The min value of the fast field values.
     pub min: Option<f64>,
     /// The max value of the fast field values.
     pub max: Option<f64>,
-    /// The average of the values. None for count == 0.
+    /// The average of the values. `None` for count == 0.
     pub avg: Option<f64>,
 }
 
@@ -70,7 +70,7 @@ impl Stats {
     }
 }
 
-/// IntermediateStats contains the mergeable version for stats.
+/// `IntermediateStats` contains the mergeable version for stats.
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct IntermediateStats {
     count: usize,
diff --git a/src/aggregation/mod.rs b/src/aggregation/mod.rs
index 2d505119d..c5183fa06 100644
--- a/src/aggregation/mod.rs
+++ b/src/aggregation/mod.rs
@@ -14,13 +14,14 @@
 //!
 //!
 //! To use aggregations, build an aggregation request by constructing
-//! [Aggregations](agg_req::Aggregations).
-//! Create an [AggregationCollector] from this request. AggregationCollector implements the
-//! `Collector` trait and can be passed as collector into `searcher.search()`.
+//! [`Aggregations`](agg_req::Aggregations).
+//! Create an [`AggregationCollector`] from this request. `AggregationCollector` implements the
+//! [`Collector`](crate::collector::Collector) trait and can be passed as collector into
+//! [`Searcher::search()`](crate::Searcher::search).
 //!
 //! #### Limitations
 //!
-//! Currently aggregations work only on single value fast fields of type u64, f64, i64 and
+//! Currently aggregations work only on single value fast fields of type `u64`, `f64`, `i64` and
 //! fast fields on text fields.
 //!
 //! # JSON Format
@@ -44,8 +45,8 @@
 //!     - [Stats](metric::StatsAggregation)
 //!
 //! # Example
-//! Compute the average metric, by building [agg_req::Aggregations], which is built from an (String,
-//! [agg_req::Aggregation]) iterator.
+//! Compute the average metric, by building [`agg_req::Aggregations`], which is built from an
+//! `(String, agg_req::Aggregation)` iterator.
 //!
 //! ```
 //! use tantivy::aggregation::agg_req::{Aggregations, Aggregation, MetricAggregation};
@@ -143,15 +144,15 @@
 //! ```
 //!
 //! # Distributed Aggregation
-//! When the data is distributed on different [crate::Index] instances, the
-//! [DistributedAggregationCollector] provides functionality to merge data between independent
+//! When the data is distributed on different [`Index`](crate::Index) instances, the
+//! [`DistributedAggregationCollector`] provides functionality to merge data between independent
 //! search calls by returning
-//! [IntermediateAggregationResults](intermediate_agg_result::IntermediateAggregationResults).
-//! IntermediateAggregationResults provides the
-//! [merge_fruits](intermediate_agg_result::IntermediateAggregationResults::merge_fruits) method to
-//! merge multiple results. The merged result can then be converted into
-//! [AggregationResults](agg_result::AggregationResults) via the
-//! [into_final_bucket_result](intermediate_agg_result::IntermediateAggregationResults::into_final_bucket_result) method.
+//! [`IntermediateAggregationResults`](intermediate_agg_result::IntermediateAggregationResults).
+//! `IntermediateAggregationResults` provides the
+//! [`merge_fruits`](intermediate_agg_result::IntermediateAggregationResults::merge_fruits) method
+//! to merge multiple results. The merged result can then be converted into
+//! [`AggregationResults`](agg_result::AggregationResults) via the
+//! [`into_final_bucket_result`](intermediate_agg_result::IntermediateAggregationResults::into_final_bucket_result) method.
 
 pub mod agg_req;
 mod agg_req_with_accessor;
@@ -259,7 +260,7 @@ impl<T: Clone> VecWithNames<T> {
     }
 }
 
-/// The serialized key is used in a HashMap.
+/// The serialized key is used in a `HashMap`.
 pub type SerializedKey = String;
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, PartialOrd)]
@@ -268,7 +269,7 @@ pub type SerializedKey = String;
 pub enum Key {
     /// String key
     Str(String),
-    /// f64 key
+    /// `f64` key
     F64(f64),
 }
 
@@ -281,10 +282,10 @@ impl Display for Key {
     }
 }
 
-/// Invert of to_fastfield_u64. Used to convert to f64 for metrics.
+/// Inverse of `to_fastfield_u64`. Used to convert to `f64` for metrics.
 ///
 /// # Panics
-/// Only u64, f64, i64 is supported
+/// Only `u64`, `f64`, and `i64` are supported.
 pub(crate) fn f64_from_fastfield_u64(val: u64, field_type: &Type) -> f64 {
     match field_type {
         Type::U64 => val as f64,
@@ -296,15 +297,15 @@ pub(crate) fn f64_from_fastfield_u64(val: u64, field_type: &Type) -> f64 {
     }
 }
 
-/// Converts the f64 value to fast field value space.
+/// Converts the `f64` value to fast field value space.
 ///
-/// If the fast field has u64, values are stored as u64 in the fast field.
-/// A f64 value of e.g. 2.0 therefore needs to be converted to 1u64
+/// If the fast field has `u64`, values are stored as `u64` in the fast field.
+/// A `f64` value of e.g. `2.0` therefore needs to be converted to `1u64`.
 ///
-/// If the fast field has f64 values are converted and stored to u64 using a
+/// If the fast field has `f64` values are converted and stored to `u64` using a
 /// monotonic mapping.
-/// A f64 value of e.g. 2.0 needs to be converted using the same monotonic
-/// conversion function, so that the value matches the u64 value stored in the fast
+/// A `f64` value of e.g. `2.0` needs to be converted using the same monotonic
+/// conversion function, so that the value matches the `u64` value stored in the fast
 /// field.
 pub(crate) fn f64_to_fastfield_u64(val: f64, field_type: &Type) -> Option<u64> {
     match field_type {
diff --git a/src/collector/custom_score_top_collector.rs b/src/collector/custom_score_top_collector.rs
index d645004ad..5c97f5384 100644
--- a/src/collector/custom_score_top_collector.rs
+++ b/src/collector/custom_score_top_collector.rs
@@ -24,7 +24,7 @@ where TScore: Clone + PartialOrd
 /// A custom segment scorer makes it possible to define any kind of score
 /// for a given document belonging to a specific segment.
 ///
-/// It is the segment local version of the [`CustomScorer`](./trait.CustomScorer.html).
+/// It is the segment local version of the [`CustomScorer`].
 pub trait CustomSegmentScorer<TScore>: 'static {
     /// Computes the score of a specific `doc`.
     fn score(&mut self, doc: DocId) -> TScore;
@@ -36,7 +36,7 @@ pub trait CustomSegmentScorer<TScore>: 'static {
 /// Instead, it helps constructing `Self::Child` instances that will compute
 /// the score at a segment scale.
 pub trait CustomScorer<TScore>: Sync {
-    /// Type of the associated [`CustomSegmentScorer`](./trait.CustomSegmentScorer.html).
+    /// Type of the associated [`CustomSegmentScorer`].
     type Child: CustomSegmentScorer<TScore>;
     /// Builds a child scorer for a specific segment. The child scorer is associated to
     /// a specific segment.
diff --git a/src/collector/mod.rs b/src/collector/mod.rs
index 117d6c22b..99c6cf1ca 100644
--- a/src/collector/mod.rs
+++ b/src/collector/mod.rs
@@ -8,9 +8,9 @@
 //! - [the top 10 documents, by relevancy or by a fast field](crate::collector::TopDocs)
 //! - [facet counts](FacetCollector)
 //!
-//! At one point in your code, you will trigger the actual search operation by calling
-//! [the `search(...)` method of your `Searcher` object](../struct.Searcher.html#method.search).
-//! This call will look like this.
+//! At some point in your code, you will trigger the actual search operation by calling
+//! [`Searcher::search()`](crate::Searcher::search).
+//! This call will look like this:
 //!
 //! ```verbatim
 //! let fruit = searcher.search(&query, &collector)?;
@@ -64,7 +64,7 @@
 //!
 //! The `Collector` trait is implemented for up to 4 collectors.
 //! If you have more than 4 collectors, you can either group them into
-//! tuples of tuples `(a,(b,(c,d)))`, or rely on [`MultiCollector`](./struct.MultiCollector.html).
+//! tuples of tuples `(a,(b,(c,d)))`, or rely on [`MultiCollector`].
 //!
 //! # Combining several collectors dynamically
 //!
@@ -74,7 +74,7 @@
 //!
 //! Unfortunately it requires you to know at compile time your collector types.
 //! If on the other hand, the collectors depend on some query parameter,
-//! you can rely on `MultiCollector`'s.
+//! you can rely on [`MultiCollector`]'s.
 //!
 //!
 //! # Implementing your own collectors.
diff --git a/src/collector/top_score_collector.rs b/src/collector/top_score_collector.rs
index 2ee31934a..343969868 100644
--- a/src/collector/top_score_collector.rs
+++ b/src/collector/top_score_collector.rs
@@ -287,7 +287,7 @@ impl TopDocs {
     /// # See also
     ///
     /// To comfortably work with `u64`s, `i64`s, `f64`s, or `date`s, please refer to
-    /// [.order_by_fast_field(...)](#method.order_by_fast_field) method.
+    /// the [.order_by_fast_field(...)](TopDocs::order_by_fast_field) method.
     pub fn order_by_u64_field(
         self,
         field: Field,
@@ -384,7 +384,7 @@ impl TopDocs {
     ///
     /// This method offers a convenient way to tweak or replace
     /// the documents score. As suggested by the prototype you can
-    /// manually define your own [`ScoreTweaker`](./trait.ScoreTweaker.html)
+    /// manually define your own [`ScoreTweaker`]
     /// and pass it as an argument, but there is a much simpler way to
     /// tweak your score: you can use a closure as in the following
     /// example.
@@ -401,7 +401,7 @@ impl TopDocs {
     /// In the following example will will tweak our ranking a bit by
     /// boosting popular products a notch.
     ///
-    /// In more serious application, this tweaking could involved running a
+    /// In more serious application, this tweaking could involve running a
     /// learning-to-rank model over various features
     ///
     /// ```rust
@@ -474,7 +474,7 @@ impl TopDocs {
     /// ```
     ///
     /// # See also
-    /// [custom_score(...)](#method.custom_score).
+    /// - [custom_score(...)](TopDocs::custom_score)
     pub fn tweak_score<TScore, TScoreSegmentTweaker, TScoreTweaker>(
         self,
         score_tweaker: TScoreTweaker,
@@ -491,8 +491,7 @@ impl TopDocs {
     ///
     /// This method offers a convenient way to use a different score.
     ///
-    /// As suggested by the prototype you can manually define your
-    /// own [`CustomScorer`](./trait.CustomScorer.html)
+    /// As suggested by the prototype you can manually define your own [`CustomScorer`]
     /// and pass it as an argument, but there is a much simpler way to
     /// tweak your score: you can use a closure as in the following
     /// example.
@@ -588,7 +587,7 @@ impl TopDocs {
     /// ```
     ///
     /// # See also
-    /// [tweak_score(...)](#method.tweak_score).
+    /// - [tweak_score(...)](TopDocs::tweak_score)
     pub fn custom_score<TScore, TCustomSegmentScorer, TCustomScorer>(
         self,
         custom_score: TCustomScorer,
diff --git a/src/collector/tweak_score_top_collector.rs b/src/collector/tweak_score_top_collector.rs
index 1a81e7361..ae86ca3fd 100644
--- a/src/collector/tweak_score_top_collector.rs
+++ b/src/collector/tweak_score_top_collector.rs
@@ -24,7 +24,7 @@ where TScore: Clone + PartialOrd
 /// A `ScoreSegmentTweaker` makes it possible to modify the default score
 /// for a given document belonging to a specific segment.
 ///
-/// It is the segment local version of the [`ScoreTweaker`](./trait.ScoreTweaker.html).
+/// It is the segment local version of the [`ScoreTweaker`].
 pub trait ScoreSegmentTweaker<TScore>: 'static {
     /// Tweak the given `score` for the document `doc`.
     fn score(&mut self, doc: DocId, score: Score) -> TScore;
@@ -37,7 +37,7 @@ pub trait ScoreSegmentTweaker<TScore>: 'static {
 /// Instead, it helps constructing `Self::Child` instances that will compute
 /// the score at a segment scale.
 pub trait ScoreTweaker<TScore>: Sync {
-    /// Type of the associated [`ScoreSegmentTweaker`](./trait.ScoreSegmentTweaker.html).
+    /// Type of the associated [`ScoreSegmentTweaker`].
     type Child: ScoreSegmentTweaker<TScore>;
 
     /// Builds a child tweaker for a specific segment. The child scorer is associated to
diff --git a/src/core/searcher.rs b/src/core/searcher.rs
index 7fcb8e2c0..7fcbba4b2 100644
--- a/src/core/searcher.rs
+++ b/src/core/searcher.rs
@@ -10,12 +10,12 @@ use crate::space_usage::SearcherSpaceUsage;
 use crate::store::{CacheStats, StoreReader};
 use crate::{DocAddress, Index, Opstamp, SegmentId, TrackedObject};
 
-/// Identifies the searcher generation accessed by a [Searcher].
+/// Identifies the searcher generation accessed by a [`Searcher`].
 ///
-/// While this might seem redundant, a [SearcherGeneration] contains
+/// While this might seem redundant, a [`SearcherGeneration`] contains
 /// both a `generation_id` AND a list of `(SegmentId, DeleteOpstamp)`.
 ///
-/// This is on purpose. This object is used by the `Warmer` API.
+/// This is on purpose. This object is used by the [`Warmer`](crate::reader::Warmer) API.
 /// Having both information makes it possible to identify which
 /// artifact should be refreshed or garbage collected.
 ///
@@ -74,12 +74,12 @@ impl Searcher {
         &self.inner.index
     }
 
-    /// [SearcherGeneration] which identifies the version of the snapshot held by this `Searcher`.
+    /// [`SearcherGeneration`] which identifies the version of the snapshot held by this `Searcher`.
     pub fn generation(&self) -> &SearcherGeneration {
         self.inner.generation.as_ref()
     }
 
-    /// Fetches a document from tantivy's store given a `DocAddress`.
+    /// Fetches a document from tantivy's store given a [`DocAddress`].
     ///
     /// The searcher uses the segment ordinal to route the
     /// request to the right `Segment`.
@@ -180,7 +180,7 @@ impl Searcher {
         self.search_with_executor(query, collector, executor)
     }
 
-    /// Same as [`search(...)`](#method.search) but multithreaded.
+    /// Same as [`search(...)`](Searcher::search) but multithreaded.
     ///
     /// The current implementation is rather naive :
     /// multithreading is by splitting search into as many task
diff --git a/src/directory/mmap_directory.rs b/src/directory/mmap_directory.rs
index 7b7238093..4436e3bf1 100644
--- a/src/directory/mmap_directory.rs
+++ b/src/directory/mmap_directory.rs
@@ -27,7 +27,7 @@ pub(crate) fn make_io_err(msg: String) -> io::Error {
     io::Error::new(io::ErrorKind::Other, msg)
 }
 
-/// Returns None iff the file exists, can be read, but is empty (and hence
+/// Returns `None` iff the file exists, can be read, but is empty (and hence
 /// cannot be mmapped)
 fn open_mmap(full_path: &Path) -> result::Result<Option<Mmap>, OpenReadError> {
     let file = File::open(full_path).map_err(|io_err| {
diff --git a/src/docset.rs b/src/docset.rs
index 160f4f497..03e790f3c 100644
--- a/src/docset.rs
+++ b/src/docset.rs
@@ -3,10 +3,10 @@ use std::borrow::{Borrow, BorrowMut};
 use crate::fastfield::AliveBitSet;
 use crate::DocId;
 
-/// Sentinel value returned when a DocSet has been entirely consumed.
+/// Sentinel value returned when a [`DocSet`] has been entirely consumed.
 ///
-/// This is not u32::MAX as one would have expected, due to the lack of SSE2 instructions
-/// to compare [u32; 4].
+/// This is not `u32::MAX` as one would have expected, due to the lack of SSE2 instructions
+/// to compare `[u32; 4]`.
 pub const TERMINATED: DocId = i32::MAX as u32;
 
 /// Represents an iterable set of sorted doc ids.
@@ -20,21 +20,21 @@ pub trait DocSet: Send {
     /// assert_eq!(doc, docset.doc());
     /// ```
     ///
-    /// If we reached the end of the DocSet, TERMINATED should be returned.
+    /// If we reached the end of the `DocSet`, [`TERMINATED`] should be returned.
     ///
-    /// Calling `.advance()` on a terminated DocSet should be supported, and TERMINATED should
+    /// Calling `.advance()` on a terminated `DocSet` should be supported, and [`TERMINATED`] should
     /// be returned.
     fn advance(&mut self) -> DocId;
 
-    /// Advances the DocSet forward until reaching the target, or going to the
-    /// lowest DocId greater than the target.
+    /// Advances the `DocSet` forward until reaching the target, or going to the
+    /// lowest [`DocId`] greater than the target.
     ///
-    /// If the end of the DocSet is reached, TERMINATED is returned.
+    /// If the end of the `DocSet` is reached, [`TERMINATED`] is returned.
     ///
-    /// Calling `.seek(target)` on a terminated DocSet is legal. Implementation
-    /// of DocSet should support it.
+    /// Calling `.seek(target)` on a terminated `DocSet` is legal. Implementation
+    /// of `DocSet` should support it.
     ///
-    /// Calling `seek(TERMINATED)` is also legal and is the normal way to consume a DocSet.
+    /// Calling `seek(TERMINATED)` is also legal and is the normal way to consume a `DocSet`.
     fn seek(&mut self, target: DocId) -> DocId {
         let mut doc = self.doc();
         debug_assert!(doc <= target);
@@ -73,9 +73,9 @@ pub trait DocSet: Send {
     }
 
     /// Returns the current document
-    /// Right after creating a new DocSet, the docset points to the first document.
+    /// Right after creating a new `DocSet`, the docset points to the first document.
     ///
-    /// If the DocSet is empty, .doc() should return `TERMINATED`.
+    /// If the `DocSet` is empty, `.doc()` should return [`TERMINATED`].
     fn doc(&self) -> DocId;
 
     /// Returns a best-effort hint of the
diff --git a/src/fastfield/multivalued/writer.rs b/src/fastfield/multivalued/writer.rs
index 503263979..212b49616 100644
--- a/src/fastfield/multivalued/writer.rs
+++ b/src/fastfield/multivalued/writer.rs
@@ -17,14 +17,12 @@ use crate::{DatePrecision, DocId};
 /// This `Writer` is only useful for advanced users.
 /// The normal way to get your multivalued int in your index
 /// is to
-/// - declare your field with fast set to `Cardinality::MultiValues`
-/// in your schema
+/// - declare your field with fast set to
+///   [`Cardinality::MultiValues`](crate::schema::Cardinality::MultiValues) in your schema
 /// - add your document simply by calling `.add_document(...)`.
 ///
-/// The `MultiValuedFastFieldWriter` can be acquired from the
-/// fastfield writer, by calling
-/// [`.get_multivalue_writer_mut(...)`](./struct.FastFieldsWriter.html#method.
-/// get_multivalue_writer_mut).
+/// The `MultiValuedFastFieldWriter` can be acquired from the fastfield writer, by calling
+/// [`FastFieldWriter::get_multivalue_writer_mut()`](crate::fastfield::FastFieldsWriter::get_multivalue_writer_mut).
 ///
 /// Once acquired, writing is done by calling
 /// [`.add_document(&Document)`](MultiValuedFastFieldWriter::add_document) once per value.
diff --git a/src/fastfield/writer.rs b/src/fastfield/writer.rs
index dd673fcd2..a7d70635b 100644
--- a/src/fastfield/writer.rs
+++ b/src/fastfield/writer.rs
@@ -168,7 +168,7 @@ impl FastFieldsWriter {
 
     /// Returns the fast field multi-value writer for the given field.
     ///
-    /// Returns None if the field does not exist, or is not
+    /// Returns `None` if the field does not exist, or is not
     /// configured as a multivalued fastfield in the schema.
     pub fn get_multivalue_writer_mut(
         &mut self,
@@ -182,7 +182,7 @@ impl FastFieldsWriter {
 
     /// Returns the bytes fast field writer for the given field.
     ///
-    /// Returns None if the field does not exist, or is not
+    /// Returns `None` if the field does not exist, or is not
     /// configured as a bytes fastfield in the schema.
     pub fn get_bytes_writer_mut(&mut self, field: Field) -> Option<&mut BytesFastFieldWriter> {
         // TODO optimize
diff --git a/src/indexer/delete_queue.rs b/src/indexer/delete_queue.rs
index 8cd4deea4..180119384 100644
--- a/src/indexer/delete_queue.rs
+++ b/src/indexer/delete_queue.rs
@@ -178,7 +178,7 @@ pub struct DeleteCursor {
 impl DeleteCursor {
     /// Skips operations and position it so that
     /// - either all of the delete operation currently in the queue are consume and the next get
-    ///   will return None.
+    ///   will return `None`.
     /// - the next get will return the first operation with an
     /// `opstamp >= target_opstamp`.
     pub fn skip_to(&mut self, target_opstamp: Opstamp) {
diff --git a/src/indexer/index_writer_status.rs b/src/indexer/index_writer_status.rs
index b0c2b3074..d6e98ca2c 100644
--- a/src/indexer/index_writer_status.rs
+++ b/src/indexer/index_writer_status.rs
@@ -15,7 +15,7 @@ impl IndexWriterStatus {
     }
 
     /// Returns a copy of the operation receiver.
-    /// If the index writer was killed, returns None.
+    /// If the index writer was killed, returns `None`.
     pub fn operation_receiver(&self) -> Option<AddBatchReceiver> {
         let rlock = self
             .inner
diff --git a/src/query/boolean_query/block_wand.rs b/src/query/boolean_query/block_wand.rs
index 9a882424b..c78490143 100644
--- a/src/query/boolean_query/block_wand.rs
+++ b/src/query/boolean_query/block_wand.rs
@@ -12,7 +12,7 @@ use crate::{DocId, DocSet, Score, TERMINATED};
 ///
 /// We always have `before_pivot_len` < `pivot_len`.
 ///
-/// None is returned if we establish that no document can exceed the threshold.
+/// `None` is returned if we establish that no document can exceed the threshold.
 fn find_pivot_doc(
     term_scorers: &[TermScorerWithMaxScore],
     threshold: Score,
diff --git a/src/query/query.rs b/src/query/query.rs
index 4a3a5a563..530b9cb43 100644
--- a/src/query/query.rs
+++ b/src/query/query.rs
@@ -15,38 +15,39 @@ use crate::{DocAddress, Term};
 /// - a set of documents
 /// - a way to score these documents
 ///
-/// When performing a [search](Searcher::search),  these documents will then
-/// be pushed to a [Collector](../collector/trait.Collector.html),
+/// When performing a [search](Searcher::search), these documents will then
+/// be pushed to a [`Collector`](crate::collector::Collector),
 /// which will in turn be in charge of deciding what to do with them.
 ///
 /// Concretely, this scored docset is represented by the
-/// [`Scorer`](./trait.Scorer.html) trait.
+/// [`Scorer`] trait.
 ///
 /// Because our index is actually split into segments, the
-/// query does not actually directly creates `DocSet` object.
-/// Instead, the query creates a [`Weight`](./trait.Weight.html)
-/// object for a given searcher.
+/// query does not actually directly creates [`DocSet`](crate::DocSet) object.
+/// Instead, the query creates a [`Weight`] object for a given searcher.
 ///
 /// The weight object, in turn, makes it possible to create
-/// a scorer for a specific [`SegmentReader`](../struct.SegmentReader.html).
+/// a scorer for a specific [`SegmentReader`].
 ///
 /// So to sum it up :
-/// - a `Query` is recipe to define a set of documents as well the way to score them.
-/// - a `Weight` is this recipe tied to a specific `Searcher`. It may for instance
+/// - a `Query` is a recipe to define a set of documents as well the way to score them.
+/// - a [`Weight`] is this recipe tied to a specific [`Searcher`]. It may for instance
 /// hold statistics about the different term of the query. It is created by the query.
-/// - a `Scorer` is a cursor over the set of matching documents, for a specific
-/// [`SegmentReader`](../struct.SegmentReader.html). It is created by the
-/// [`Weight`](./trait.Weight.html).
+/// - a [`Scorer`] is a cursor over the set of matching documents, for a specific
+/// [`SegmentReader`]. It is created by the [`Weight`].
 ///
 /// When implementing a new type of `Query`, it is normal to implement a
-/// dedicated `Query`, `Weight` and `Scorer`.
+/// dedicated `Query`, [`Weight`] and [`Scorer`].
+///
+/// [`Scorer`]: crate::query::Scorer
+/// [`SegmentReader`]: crate::SegmentReader
 pub trait Query: QueryClone + Send + Sync + downcast_rs::Downcast + fmt::Debug {
     /// Create the weight associated to a query.
     ///
     /// If scoring is not required, setting `scoring_enabled` to `false`
     /// can increase performances.
     ///
-    /// See [`Weight`](./trait.Weight.html).
+    /// See [`Weight`].
     fn weight(&self, searcher: &Searcher, scoring_enabled: bool) -> crate::Result<Box<dyn Weight>>;
 
     /// Returns an `Explanation` for the score of the document.
diff --git a/src/query/query_parser/query_parser.rs b/src/query/query_parser/query_parser.rs
index e399b2118..fcaf3432e 100644
--- a/src/query/query_parser/query_parser.rs
+++ b/src/query/query_parser/query_parser.rs
@@ -113,8 +113,8 @@ fn trim_ast(logical_ast: LogicalAst) -> Option<LogicalAst> {
 /// The language covered by the current parser is extremely simple.
 ///
 /// * simple terms: "e.g.: `Barack Obama` are simply tokenized using tantivy's
-///   [`SimpleTokenizer`](../tokenizer/struct.SimpleTokenizer.html), hence becoming `["barack",
-///   "obama"]`. The terms are then searched within the default terms of the query parser.
+///   [`SimpleTokenizer`](crate::tokenizer::SimpleTokenizer), hence becoming `["barack", "obama"]`.
+///   The terms are then searched within the default terms of the query parser.
 ///
 ///   e.g. If `body` and `title` are default fields, our example terms are
 ///   `["title:barack", "body:barack", "title:obama", "body:obama"]`.
@@ -166,8 +166,8 @@ fn trim_ast(logical_ast: LogicalAst) -> Option<LogicalAst> {
 /// devops. Negative boosts are not allowed.
 ///
 /// It is also possible to define a boost for a some specific field, at the query parser level.
-/// (See [`set_boost(...)`](#method.set_field_boost) ). Typically you may want to boost a title
-/// field.
+/// (See [`set_field_boost(...)`](QueryParser::set_field_boost)). Typically you may want to boost a
+/// title field.
 ///
 /// Phrase terms support the `~` slop operator which allows to set the phrase's matching
 /// distance in words. `"big wolf"~1` will return documents containing the phrase `"big bad wolf"`.
diff --git a/src/query/scorer.rs b/src/query/scorer.rs
index 9e4e5b250..69448042f 100644
--- a/src/query/scorer.rs
+++ b/src/query/scorer.rs
@@ -7,7 +7,7 @@ use crate::Score;
 
 /// Scored set of documents matching a query within a specific segment.
 ///
-/// See [`Query`](./trait.Query.html).
+/// See [`Query`](crate::query::Query).
 pub trait Scorer: downcast_rs::Downcast + DocSet + 'static {
     /// Returns the score.
     ///
diff --git a/src/query/weight.rs b/src/query/weight.rs
index 4dffea977..210ffb30f 100644
--- a/src/query/weight.rs
+++ b/src/query/weight.rs
@@ -19,7 +19,7 @@ pub(crate) fn for_each_scorer<TScorer: Scorer + ?Sized>(
 /// Calls `callback` with all of the `(doc, score)` for which score
 /// is exceeding a given threshold.
 ///
-/// This method is useful for the TopDocs collector.
+/// This method is useful for the [`TopDocs`](crate::collector::TopDocs) collector.
 /// For all docsets, the blanket implementation has the benefit
 /// of prefiltering (doc, score) pairs, avoiding the
 /// virtual dispatch cost.
@@ -44,21 +44,19 @@ pub(crate) fn for_each_pruning_scorer<TScorer: Scorer + ?Sized>(
 /// A Weight is the specialization of a `Query`
 /// for a given set of segments.
 ///
-/// See [`Query`].
-///
-/// [`Query`]: crate::query::Query
+/// See [`Query`](crate::query::Query).
 pub trait Weight: Send + Sync + 'static {
     /// Returns the scorer for the given segment.
     ///
     /// `boost` is a multiplier to apply to the score.
     ///
-    /// See [`Query`](./trait.Query.html).
+    /// See [`Query`](crate::query::Query).
     fn scorer(&self, reader: &SegmentReader, boost: Score) -> crate::Result<Box<dyn Scorer>>;
 
-    /// Returns an `Explanation` for the given document.
+    /// Returns an [`Explanation`] for the given document.
     fn explain(&self, reader: &SegmentReader, doc: DocId) -> crate::Result<Explanation>;
 
-    /// Returns the number documents within the given `SegmentReader`.
+    /// Returns the number documents within the given [`SegmentReader`].
     fn count(&self, reader: &SegmentReader) -> crate::Result<u32> {
         let mut scorer = self.scorer(reader, 1.0)?;
         if let Some(alive_bitset) = reader.alive_bitset() {
@@ -83,7 +81,7 @@ pub trait Weight: Send + Sync + 'static {
     /// Calls `callback` with all of the `(doc, score)` for which score
     /// is exceeding a given threshold.
     ///
-    /// This method is useful for the TopDocs collector.
+    /// This method is useful for the [`TopDocs`](crate::collector::TopDocs) collector.
     /// For all docsets, the blanket implementation has the benefit
     /// of prefiltering (doc, score) pairs, avoiding the
     /// virtual dispatch cost.
diff --git a/src/reader/mod.rs b/src/reader/mod.rs
index aafc60df0..72dd01f8d 100644
--- a/src/reader/mod.rs
+++ b/src/reader/mod.rs
@@ -124,7 +124,7 @@ impl IndexReaderBuilder {
         self
     }
 
-    /// Set the [Warmer]s that are invoked when reloading searchable segments.
+    /// Set the [`Warmer`]s that are invoked when reloading searchable segments.
     #[must_use]
     pub fn warmers(mut self, warmers: Vec<Weak<dyn Warmer>>) -> IndexReaderBuilder {
         self.warmers = warmers;
diff --git a/src/reader/warming.rs b/src/reader/warming.rs
index ff396f96d..aef5b39f0 100644
--- a/src/reader/warming.rs
+++ b/src/reader/warming.rs
@@ -10,12 +10,12 @@ pub const GC_INTERVAL: Duration = Duration::from_secs(1);
 
 /// `Warmer` can be used to maintain segment-level state e.g. caches.
 ///
-/// They must be registered with the [super::IndexReaderBuilder].
+/// They must be registered with the [`IndexReaderBuilder`](super::IndexReaderBuilder).
 pub trait Warmer: Sync + Send {
-    /// Perform any warming work using the provided [Searcher].
+    /// Perform any warming work using the provided [`Searcher`].
     fn warm(&self, searcher: &Searcher) -> crate::Result<()>;
 
-    /// Discards internal state for any [SearcherGeneration] not provided.
+    /// Discards internal state for any [`SearcherGeneration`] not provided.
     fn garbage_collect(&self, live_generations: &[&SearcherGeneration]);
 }
 
@@ -38,11 +38,11 @@ impl WarmingState {
         }))))
     }
 
-    /// Start tracking a new generation of [Searcher], and [Warmer::warm] it if there are active
+    /// Start tracking a new generation of [`Searcher`], and [`Warmer::warm`] it if there are active
     /// warmers.
     ///
-    /// A background GC thread for [Warmer::garbage_collect] calls is uniquely created if there are
-    /// active warmers.
+    /// A background GC thread for [`Warmer::garbage_collect`] calls is uniquely created if there
+    /// are active warmers.
     pub fn warm_new_searcher_generation(&self, searcher: &Searcher) -> crate::Result<()> {
         self.0
             .lock()
@@ -90,7 +90,7 @@ impl WarmingStateInner {
         Ok(())
     }
 
-    /// Attempt to upgrade the weak Warmer references, pruning those which cannot be upgraded.
+    /// Attempt to upgrade the weak `Warmer` references, pruning those which cannot be upgraded.
     /// Return the strong references.
     fn pruned_warmers(&mut self) -> Vec<Arc<dyn Warmer>> {
         let strong_warmers = self
@@ -102,7 +102,7 @@ impl WarmingStateInner {
         strong_warmers
     }
 
-    /// [Warmer::garbage_collect] active warmers if some searcher generation is observed to have
+    /// [`Warmer::garbage_collect`] active warmers if some searcher generation is observed to have
     /// been dropped.
     fn gc_maybe(&mut self) -> bool {
         let live_generations = self.searcher_generation_inventory.list();
@@ -144,8 +144,8 @@ impl WarmingStateInner {
         Ok(true)
     }
 
-    /// Every [GC_INTERVAL] attempt to GC, with panics caught and logged using
-    /// [std::panic::catch_unwind].
+    /// Every [`GC_INTERVAL`] attempt to GC, with panics caught and logged using
+    /// [`std::panic::catch_unwind`].
     fn gc_loop(inner: Weak<Mutex<WarmingStateInner>>) {
         for _ in crossbeam_channel::tick(GC_INTERVAL) {
             if let Some(inner) = inner.upgrade() {
diff --git a/src/schema/date_time_options.rs b/src/schema/date_time_options.rs
index 0f6eea978..1defc6253 100644
--- a/src/schema/date_time_options.rs
+++ b/src/schema/date_time_options.rs
@@ -115,7 +115,7 @@ impl DateOptions {
     /// Returns the cardinality of the fastfield.
     ///
     /// If the field has not been declared as a fastfield, then
-    /// the method returns None.
+    /// the method returns `None`.
     pub fn get_fastfield_cardinality(&self) -> Option<Cardinality> {
         self.fast
     }
diff --git a/src/schema/field_type.rs b/src/schema/field_type.rs
index dcf91805f..50ff98afe 100644
--- a/src/schema/field_type.rs
+++ b/src/schema/field_type.rs
@@ -103,7 +103,7 @@ impl Type {
     }
 
     /// Interprets a 1byte code as a type.
-    /// Returns None if the code is invalid.
+    /// Returns `None` if the code is invalid.
     pub fn from_code(code: u8) -> Option<Self> {
         match code {
             b's' => Some(Type::Str),
diff --git a/src/schema/index_record_option.rs b/src/schema/index_record_option.rs
index b7ceb464d..9550549c5 100644
--- a/src/schema/index_record_option.rs
+++ b/src/schema/index_record_option.rs
@@ -1,18 +1,14 @@
 use serde::{Deserialize, Serialize};
 
 /// `IndexRecordOption` describes an amount information associated
-/// to a given indexed field.
+/// with a given indexed field.
 ///
 /// It is both used to:
 ///
-///  * describe in the schema the amount of information
-/// that should be retained during indexing (See
-/// [`TextFieldIndexing.html.set_index_option`](
-///     ../schema/struct.TextFieldIndexing.html#method.set_index_option))
-///  * to request for a given
-/// amount of information to be decoded as one goes through a posting list.
-/// (See [`InvertedIndexReader.read_postings`](
-///     ../struct.InvertedIndexReader.html#method.read_postings))
+///  * describe in the schema the amount of information that should be retained during indexing (See
+///    [`TextFieldIndexing::set_index_option()`](crate::schema::TextFieldIndexing::set_index_option))
+///  * request that a given amount of information to be decoded as one goes through a posting list.
+///    (See [`InvertedIndexReader::read_postings()`](crate::InvertedIndexReader::read_postings))
 #[derive(Clone, Copy, Debug, PartialEq, PartialOrd, Ord, Eq, Hash, Serialize, Deserialize)]
 pub enum IndexRecordOption {
     /// records only the `DocId`s
@@ -24,7 +20,7 @@ pub enum IndexRecordOption {
     WithFreqs,
     /// records the document id, the term frequency and the positions of
     /// the occurrences in the document.
-    /// Positions are required to run [PhraseQueries](../query/struct.PhraseQuery.html).
+    /// Positions are required to run a [`PhraseQuery`](crate::query::PhraseQuery).
     #[serde(rename = "position")]
     WithFreqsAndPositions,
 }
diff --git a/src/schema/mod.rs b/src/schema/mod.rs
index 2c145f8be..0fbd947ae 100644
--- a/src/schema/mod.rs
+++ b/src/schema/mod.rs
@@ -5,9 +5,9 @@
 //! Tantivy has a very strict schema.
 //! The schema defines information about the fields your index contains, that is, for each field:
 //!
-//! the field name (may only contain letters `[a-zA-Z]`, number `[0-9]`, and `_`)
-//! the type of the field (currently only  `text` and `u64` are supported)
-//! how the field should be indexed / stored.
+//! - the field name (may only contain letters `[a-zA-Z]`, number `[0-9]`, and `_`)
+//! - the type of the field (currently only  `text` and `u64` are supported)
+//! - how the field should be indexed / stored.
 //!
 //! This very last point is critical as it will enable / disable some of the functionality
 //! for your index.
@@ -36,21 +36,20 @@
 //! let schema = schema_builder.build();
 //! ```
 //!
-//! We can split the problem of generating a search result page into two phases :
+//! We can split the problem of generating a search result page into two phases:
 //!
-//! identifying the list of 10 or so documents to be displayed (Conceptually `query -> doc_ids[]`)
-//! for each of these documents, retrieving the information required to generate
-//! the search results page. (`doc_ids[] -> Document[]`)
+//! - identifying the list of 10 or so documents to be displayed (Conceptually `query -> doc_ids[]`)
+//! - for each of these documents, retrieving the information required to generate the search
+//!   results page. (`doc_ids[] -> Document[]`)
 //!
 //! In the first phase, the ability to search for documents by the given field is determined by the
-//! [`IndexRecordOption`](enum.IndexRecordOption.html) of our
-//! [`TextOptions`](struct.TextOptions.html).
+//! [`IndexRecordOption`] of our [`TextOptions`].
 //!
 //! The effect of each possible setting is described more in detail
 //! [`TextIndexingOptions`](enum.TextIndexingOptions.html).
 //!
 //! On the other hand setting the field as stored or not determines whether the field should be
-//! returned when [`searcher.doc(doc_address)`](../struct.Searcher.html#method.doc) is called.
+//! returned when [`Searcher::doc()`](crate::Searcher::doc) is called.
 //!
 //!
 //! ## Setting a u64, a i64 or a f64 field
@@ -69,7 +68,7 @@
 //!
 //! Just like for Text fields (see above),
 //! setting the field as stored defines whether the field will be
-//! returned when [`searcher.doc(doc_address)`](../struct.Searcher.html#method.doc) is called,
+//! returned when [`Searcher::doc()`](crate::Searcher::doc) is called,
 //! and setting the field as indexed means that we will be able perform queries such as
 //! `num_stars:10`. Note that unlike text fields, numeric fields can only be indexed in one way for
 //! the moment.
@@ -94,7 +93,7 @@
 //! ### Fast fields
 //! This functionality is somewhat similar to Lucene's `DocValues`.
 //!
-//! Fields that are indexed as [FAST] will be stored in a special data structure that will
+//! Fields that are indexed as [`FAST`] will be stored in a special data structure that will
 //! make it possible to access the value given the doc id rapidly. This is useful if the value
 //! of the field is required during scoring or collection for instance.
 //!
diff --git a/src/schema/numeric_options.rs b/src/schema/numeric_options.rs
index 72d5b3d49..8b2b75033 100644
--- a/src/schema/numeric_options.rs
+++ b/src/schema/numeric_options.rs
@@ -11,16 +11,16 @@ pub enum Cardinality {
     #[serde(rename = "single")]
     SingleValue,
     /// The document can have any number of values associated to the document.
-    /// This is more memory and CPU expensive than the SingleValue solution.
+    /// This is more memory and CPU expensive than the `SingleValue` solution.
     #[serde(rename = "multi")]
     MultiValues,
 }
 
 #[deprecated(since = "0.17.0", note = "Use NumericOptions instead.")]
-/// Deprecated use [NumericOptions] instead.
+/// Deprecated use [`NumericOptions`] instead.
 pub type IntOptions = NumericOptions;
 
-/// Define how an u64, i64, of f64 field should be handled by tantivy.
+/// Define how an `u64`, `i64`, or `f64` field should be handled by tantivy.
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
 #[serde(from = "NumericOptionsDeser")]
 pub struct NumericOptions {
@@ -36,7 +36,7 @@ pub struct NumericOptions {
 /// lack of fieldnorms attribute as "true" if and only if indexed.
 ///
 /// (Downstream, for the moment, this attribute is not used anyway if not indexed...)
-/// Note that: newly serialized NumericOptions will include the new attribute.
+/// Note that: newly serialized `NumericOptions` will include the new attribute.
 #[derive(Deserialize)]
 struct NumericOptionsDeser {
     indexed: bool,
@@ -135,7 +135,7 @@ impl NumericOptions {
     /// Returns the cardinality of the fastfield.
     ///
     /// If the field has not been declared as a fastfield, then
-    /// the method returns None.
+    /// the method returns `None`.
     pub fn get_fastfield_cardinality(&self) -> Option<Cardinality> {
         self.fast
     }
diff --git a/src/schema/term.rs b/src/schema/term.rs
index 77aa7b29c..37d5dc02d 100644
--- a/src/schema/term.rs
+++ b/src/schema/term.rs
@@ -236,7 +236,7 @@ where B: AsRef<[u8]>
 
     /// Returns the `u64` value stored in a term.
     ///
-    /// Returns None if the term is not of the u64 type, or if the term byte representation
+    /// Returns `None` if the term is not of the u64 type, or if the term byte representation
     /// is invalid.
     pub fn as_u64(&self) -> Option<u64> {
         self.get_fast_type::<u64>()
@@ -258,7 +258,7 @@ where B: AsRef<[u8]>
 
     /// Returns the `i64` value stored in a term.
     ///
-    /// Returns None if the term is not of the i64 type, or if the term byte representation
+    /// Returns `None` if the term is not of the i64 type, or if the term byte representation
     /// is invalid.
     pub fn as_i64(&self) -> Option<i64> {
         self.get_fast_type::<i64>()
@@ -266,7 +266,7 @@ where B: AsRef<[u8]>
 
     /// Returns the `f64` value stored in a term.
     ///
-    /// Returns None if the term is not of the f64 type, or if the term byte representation
+    /// Returns `None` if the term is not of the f64 type, or if the term byte representation
     /// is invalid.
     pub fn as_f64(&self) -> Option<f64> {
         self.get_fast_type::<f64>()
@@ -274,7 +274,7 @@ where B: AsRef<[u8]>
 
     /// Returns the `bool` value stored in a term.
     ///
-    /// Returns None if the term is not of the bool type, or if the term byte representation
+    /// Returns `None` if the term is not of the bool type, or if the term byte representation
     /// is invalid.
     pub fn as_bool(&self) -> Option<bool> {
         self.get_fast_type::<bool>()
@@ -282,7 +282,7 @@ where B: AsRef<[u8]>
 
     /// Returns the `Date` value stored in a term.
     ///
-    /// Returns None if the term is not of the Date type, or if the term byte representation
+    /// Returns `None` if the term is not of the Date type, or if the term byte representation
     /// is invalid.
     pub fn as_date(&self) -> Option<DateTime> {
         self.get_fast_type::<DateTime>()
@@ -290,7 +290,7 @@ where B: AsRef<[u8]>
 
     /// Returns the text associated with the term.
     ///
-    /// Returns None if the field is not of string type
+    /// Returns `None` if the field is not of string type
     /// or if the bytes are not valid utf-8.
     pub fn as_str(&self) -> Option<&str> {
         if self.as_slice().len() < 5 {
@@ -304,7 +304,7 @@ where B: AsRef<[u8]>
 
     /// Returns the facet associated with the term.
     ///
-    /// Returns None if the field is not of facet type
+    /// Returns `None` if the field is not of facet type
     /// or if the bytes are not valid utf-8.
     pub fn as_facet(&self) -> Option<Facet> {
         if self.as_slice().len() < 5 {
@@ -319,7 +319,7 @@ where B: AsRef<[u8]>
 
     /// Returns the bytes associated with the term.
     ///
-    /// Returns None if the field is not of bytes type.
+    /// Returns `None` if the field is not of bytes type.
     pub fn as_bytes(&self) -> Option<&[u8]> {
         if self.as_slice().len() < 5 {
             return None;
@@ -366,7 +366,7 @@ fn get_fast_type<T: FastValue>(bytes: &[u8]) -> Option<T> {
 }
 
 /// Returns the json path (without non-human friendly separators, the type of the value, and the
-/// value bytes). Returns None if the value is not JSON or is not valid.
+/// value bytes). Returns `None` if the value is not JSON or is not valid.
 pub(crate) fn as_json_path_type_value_bytes(bytes: &[u8]) -> Option<(&str, Type, &[u8])> {
     let pos = bytes.iter().cloned().position(|b| b == JSON_END_OF_PATH)?;
     let json_path = str::from_utf8(&bytes[..pos]).ok()?;
diff --git a/src/schema/text_options.rs b/src/schema/text_options.rs
index 14728154a..5fc4ebb94 100644
--- a/src/schema/text_options.rs
+++ b/src/schema/text_options.rs
@@ -99,7 +99,7 @@ impl TokenizerName {
 /// It defines
 /// - The amount of information that should be stored about the presence of a term in a document.
 /// Essentially, should we store the term frequency and/or the positions (See
-/// [`IndexRecordOption`](./enum.IndexRecordOption.html)).
+/// [`IndexRecordOption`]).
 /// - The name of the `Tokenizer` that should be used to process the field.
 /// - Flag indicating, if fieldnorms should be stored (See [fieldnorm](crate::fieldnorm)). Defaults
 ///   to `true`.
@@ -147,14 +147,14 @@ impl TextFieldIndexing {
         self
     }
 
-    /// Returns true if and only if [fieldnorms](crate::fieldnorm)are stored.
+    /// Returns true if and only if [fieldnorms](crate::fieldnorm) are stored.
     pub fn fieldnorms(&self) -> bool {
         self.fieldnorms
     }
 
     /// Sets which information should be indexed with the tokens.
     ///
-    /// See [IndexRecordOption](./enum.IndexRecordOption.html) for more detail.
+    /// See [`IndexRecordOption`] for more detail.
     #[must_use]
     pub fn set_index_option(mut self, index_option: IndexRecordOption) -> TextFieldIndexing {
         self.record = index_option;
@@ -163,7 +163,7 @@ impl TextFieldIndexing {
 
     /// Returns the indexing options associated to this field.
     ///
-    /// See [IndexRecordOption](./enum.IndexRecordOption.html) for more detail.
+    /// See [`IndexRecordOption`] for more detail.
     pub fn index_option(&self) -> IndexRecordOption {
         self.record
     }
diff --git a/src/schema/value.rs b/src/schema/value.rs
index 5cd5d3894..bcfcfb74b 100644
--- a/src/schema/value.rs
+++ b/src/schema/value.rs
@@ -97,7 +97,7 @@ impl<'de> Deserialize<'de> for Value {
 
 impl Value {
     /// Returns the text value, provided the value is of the `Str` type.
-    /// (Returns None if the value is not of the `Str` type).
+    /// (Returns `None` if the value is not of the `Str` type).
     pub fn as_text(&self) -> Option<&str> {
         if let Value::Str(text) = self {
             Some(text)
@@ -107,7 +107,7 @@ impl Value {
     }
 
     /// Returns the facet value, provided the value is of the `Facet` type.
-    /// (Returns None if the value is not of the `Facet` type).
+    /// (Returns `None` if the value is not of the `Facet` type).
     pub fn as_facet(&self) -> Option<&Facet> {
         if let Value::Facet(facet) = self {
             Some(facet)
@@ -117,7 +117,7 @@ impl Value {
     }
 
     /// Returns the tokenized text, provided the value is of the `PreTokStr` type.
-    /// (Returns None if the value is not of the `PreTokStr` type.)
+    /// (Returns `None` if the value is not of the `PreTokStr` type.)
     pub fn tokenized_text(&self) -> Option<&PreTokenizedString> {
         if let Value::PreTokStr(tokenized_text) = self {
             Some(tokenized_text)
@@ -127,7 +127,7 @@ impl Value {
     }
 
     /// Returns the u64-value, provided the value is of the `U64` type.
-    /// (Returns None if the value is not of the `U64` type)
+    /// (Returns `None` if the value is not of the `U64` type)
     pub fn as_u64(&self) -> Option<u64> {
         if let Value::U64(val) = self {
             Some(*val)
@@ -138,7 +138,7 @@ impl Value {
 
     /// Returns the i64-value, provided the value is of the `I64` type.
     ///
-    /// Return None if the value is not of type `I64`.
+    /// Returns `None` if the value is not of type `I64`.
     pub fn as_i64(&self) -> Option<i64> {
         if let Value::I64(val) = self {
             Some(*val)
@@ -149,7 +149,7 @@ impl Value {
 
     /// Returns the f64-value, provided the value is of the `F64` type.
     ///
-    /// Return None if the value is not of type `F64`.
+    /// Returns `None` if the value is not of type `F64`.
     pub fn as_f64(&self) -> Option<f64> {
         if let Value::F64(value) = self {
             Some(*value)
@@ -160,7 +160,7 @@ impl Value {
 
     /// Returns the bool value, provided the value is of the `Bool` type.
     ///
-    /// Return None if the value is not of type `Bool`.
+    /// Returns `None` if the value is not of type `Bool`.
     pub fn as_bool(&self) -> Option<bool> {
         if let Value::Bool(value) = self {
             Some(*value)
@@ -171,7 +171,7 @@ impl Value {
 
     /// Returns the Date-value, provided the value is of the `Date` type.
     ///
-    /// Returns None if the value is not of type `Date`.
+    /// Returns `None` if the value is not of type `Date`.
     pub fn as_date(&self) -> Option<DateTime> {
         if let Value::Date(date) = self {
             Some(*date)
@@ -182,7 +182,7 @@ impl Value {
 
     /// Returns the Bytes-value, provided the value is of the `Bytes` type.
     ///
-    /// Returns None if the value is not of type `Bytes`.
+    /// Returns `None` if the value is not of type `Bytes`.
     pub fn as_bytes(&self) -> Option<&[u8]> {
         if let Value::Bytes(bytes) = self {
             Some(bytes)
@@ -191,9 +191,9 @@ impl Value {
         }
     }
 
-    /// Returns the json object, provided the value is of the JsonObject type.
+    /// Returns the json object, provided the value is of the `JsonObject` type.
     ///
-    /// Returns None if the value is not of type JsonObject.
+    /// Returns `None` if the value is not of type `JsonObject`.
     pub fn as_json(&self) -> Option<&Map<String, serde_json::Value>> {
         if let Value::JsonObject(json) = self {
             Some(json)
diff --git a/src/space_usage/mod.rs b/src/space_usage/mod.rs
index 1c21f2996..056bf647c 100644
--- a/src/space_usage/mod.rs
+++ b/src/space_usage/mod.rs
@@ -238,7 +238,7 @@ impl PerFieldSpaceUsage {
 /// Represents space usage of a given field, breaking it down into the (field, index) pairs that
 /// comprise it.
 ///
-/// See documentation for [PerFieldSpaceUsage] for slightly more information.
+/// See documentation for [`PerFieldSpaceUsage`] for slightly more information.
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct FieldUsage {
     field: Field,
diff --git a/src/store/index/skip_index_builder.rs b/src/store/index/skip_index_builder.rs
index 2f34376cd..ffebf8e95 100644
--- a/src/store/index/skip_index_builder.rs
+++ b/src/store/index/skip_index_builder.rs
@@ -28,7 +28,7 @@ impl LayerBuilder {
     /// Serializes the block, and return a checkpoint representing
     /// the entire block.
     ///
-    /// If the block was empty to begin with, simply return None.
+    /// If the block was empty to begin with, simply return `None`.
     fn flush_block(&mut self) -> Option<Checkpoint> {
         if let Some(doc_range) = self.block.doc_interval() {
             let start_offset = self.buffer.len();
diff --git a/src/termdict/fst_termdict/merger.rs b/src/termdict/fst_termdict/merger.rs
index 037641747..e9241f916 100644
--- a/src/termdict/fst_termdict/merger.rs
+++ b/src/termdict/fst_termdict/merger.rs
@@ -36,10 +36,10 @@ impl<'a> TermMerger<'a> {
         }
     }
 
-    /// Iterator over (segment ordinal, [TermOrdinal]) sorted by segment ordinal
+    /// Iterator over `(segment ordinal, TermOrdinal)` pairs sorted by segment ordinal
     ///
     /// This method may be called
-    /// if [Self::advance] has been called before
+    /// if [`Self::advance`] has been called before
     /// and `true` was returned.
     pub fn matching_segments<'b: 'a>(&'b self) -> impl 'b + Iterator<Item = (usize, TermOrdinal)> {
         self.current_segment_and_term_ordinals
@@ -68,17 +68,15 @@ impl<'a> TermMerger<'a> {
 
     /// Returns the current term.
     ///
-    /// This method may be called
-    /// if [Self::advance] has been called before
+    /// This method may be called if [`Self::advance`] has been called before
     /// and `true` was returned.
     pub fn key(&self) -> &[u8] {
         &self.current_key
     }
 
-    /// Iterator over (segment ordinal, [TermInfo]) pairs iterator sorted by the ordinal.
+    /// Iterator over `(segment ordinal, TermInfo)` pairs sorted by the ordinal.
     ///
-    /// This method may be called
-    /// if [Self::advance] has been called before
+    /// This method may be called if [`Self::advance`] has been called before
     /// and `true` was returned.
     pub fn current_segment_ords_and_term_infos<'b: 'a>(
         &'b self,
diff --git a/src/termdict/fst_termdict/mod.rs b/src/termdict/fst_termdict/mod.rs
index 0677e436a..4201df6a4 100644
--- a/src/termdict/fst_termdict/mod.rs
+++ b/src/termdict/fst_termdict/mod.rs
@@ -1,9 +1,9 @@
-//! The term dictionary main role is to associate the sorted [`Term`s](../struct.Term.html) to
-//! a [`TermInfo`](../postings/struct.TermInfo.html) struct that contains some meta-information
+//! The term dictionary main role is to associate the sorted [`Term`](crate::Term)s with
+//! a [`TermInfo`](crate::postings::TermInfo) struct that contains some meta-information
 //! about the term.
 //!
 //! Internally, the term dictionary relies on the `fst` crate to store
-//! a sorted mapping that associate each term to its rank in the lexicographical order.
+//! a sorted mapping that associates each term to its rank in the lexicographical order.
 //! For instance, in a dictionary containing the sorted terms "abba", "bjork", "blur" and "donovan",
 //! the `TermOrdinal` are respectively `0`, `1`, `2`, and `3`.
 //!
@@ -17,7 +17,7 @@
 //! as `u64`.
 //!
 //! A second datastructure makes it possible to access a
-//! [`TermInfo`](../postings/struct.TermInfo.html).
+//! [`TermInfo`](crate::postings::TermInfo).
 mod merger;
 mod streamer;
 mod term_info_store;
diff --git a/src/termdict/mod.rs b/src/termdict/mod.rs
index 83fec1e13..0b2763dc9 100644
--- a/src/termdict/mod.rs
+++ b/src/termdict/mod.rs
@@ -1,11 +1,11 @@
-//! The term dictionary main role is to associate the sorted [`Term`s](../struct.Term.html) to
-//! a [`TermInfo`](../postings/struct.TermInfo.html) struct that contains some meta-information
+//! The term dictionary main role is to associate the sorted [`Term`s](crate::Term) to
+//! a [`TermInfo`](crate::postings::TermInfo) struct that contains some meta-information
 //! about the term.
 //!
 //! Internally, the term dictionary relies on the `fst` crate to store
 //! a sorted mapping that associate each term to its rank in the lexicographical order.
 //! For instance, in a dictionary containing the sorted terms "abba", "bjork", "blur" and "donovan",
-//! the [TermOrdinal] are respectively `0`, `1`, `2`, and `3`.
+//! the [`TermOrdinal`] are respectively `0`, `1`, `2`, and `3`.
 //!
 //! For `u64`-terms, tantivy explicitly uses a `BigEndian` representation to ensure that the
 //! lexicographical order matches the natural order of integers.
@@ -17,7 +17,7 @@
 //! as `u64`.
 //!
 //! A second datastructure makes it possible to access a
-//! [`TermInfo`](../postings/struct.TermInfo.html).
+//! [`TermInfo`](crate::postings::TermInfo).
 
 #[cfg(not(feature = "quickwit"))]
 mod fst_termdict;
diff --git a/src/tokenizer/mod.rs b/src/tokenizer/mod.rs
index 925cd5059..145ba04fc 100644
--- a/src/tokenizer/mod.rs
+++ b/src/tokenizer/mod.rs
@@ -55,9 +55,9 @@
 //!
 //! # Custom tokenizers
 //!
-//! You can write your own tokenizer by implementing the [`Tokenizer`](./trait.Tokenizer.html)
-//! or you can extend an existing [`Tokenizer`](./trait.Tokenizer.html) by chaining it several
-//! [`TokenFilter`s](./trait.TokenFilter.html).
+//! You can write your own tokenizer by implementing the [`Tokenizer`] trait
+//! or you can extend an existing [`Tokenizer`] by chaining it with several
+//! [`TokenFilter`]s.
 //!
 //! For instance, the `en_stem` is defined as follows.
 //!
@@ -71,7 +71,7 @@
 //! ```
 //!
 //! Once your tokenizer is defined, you need to
-//! register it with a name in your index's [`TokenizerManager`](./struct.TokenizerManager.html).
+//! register it with a name in your index's [`TokenizerManager`].
 //!
 //! ```rust
 //! # use tantivy::schema::Schema;
@@ -89,7 +89,7 @@
 //! could like this for instance.
 //!
 //! Note that tokens with a len greater or equal to
-//! [`MAX_TOKEN_LEN`](./constant.MAX_TOKEN_LEN.html).
+//! [`MAX_TOKEN_LEN`].
 //!
 //! # Example
 //!
diff --git a/src/tokenizer/stemmer.rs b/src/tokenizer/stemmer.rs
index 46fa43525..77a35ec18 100644
--- a/src/tokenizer/stemmer.rs
+++ b/src/tokenizer/stemmer.rs
@@ -54,7 +54,7 @@ impl Language {
     }
 }
 
-/// `Stemmer` token filter. Several languages are supported, see [Language] for the available
+/// `Stemmer` token filter. Several languages are supported, see [`Language`] for the available
 /// languages.
 /// Tokens are expected to be lowercased beforehand.
 #[derive(Clone)]
@@ -63,7 +63,7 @@ pub struct Stemmer {
 }
 
 impl Stemmer {
-    /// Creates a new Stemmer `TokenFilter` for a given language algorithm.
+    /// Creates a new `Stemmer` [`TokenFilter`] for a given language algorithm.
     pub fn new(language: Language) -> Stemmer {
         Stemmer {
             stemmer_algorithm: language.algorithm(),
@@ -72,7 +72,7 @@ impl Stemmer {
 }
 
 impl Default for Stemmer {
-    /// Creates a new Stemmer `TokenFilter` for English.
+    /// Creates a new `Stemmer` [`TokenFilter`] for [`Language::English`].
     fn default() -> Self {
         Stemmer::new(Language::English)
     }
diff --git a/src/tokenizer/tokenized_string.rs b/src/tokenizer/tokenized_string.rs
index 01072aa71..251bfcfe1 100644
--- a/src/tokenizer/tokenized_string.rs
+++ b/src/tokenizer/tokenized_string.rs
@@ -25,7 +25,7 @@ impl PartialOrd for PreTokenizedString {
     }
 }
 
-/// TokenStream implementation which wraps [PreTokenizedString]
+/// [`TokenStream`] implementation which wraps [`PreTokenizedString`]
 pub struct PreTokenizedStream {
     tokenized_string: PreTokenizedString,
     current_token: i64,
diff --git a/src/tokenizer/tokenizer.rs b/src/tokenizer/tokenizer.rs
index 0965f004f..203202e4a 100644
--- a/src/tokenizer/tokenizer.rs
+++ b/src/tokenizer/tokenizer.rs
@@ -116,7 +116,7 @@ impl Clone for TextAnalyzer {
 /// `Tokenizer` are in charge of splitting text into a stream of token
 /// before indexing.
 ///
-/// See the [module documentation](./index.html) for more detail.
+/// See the [module documentation](crate::tokenizer) for more detail.
 ///
 /// # Warning
 ///
@@ -155,7 +155,7 @@ impl<'a> TokenStream for Box<dyn TokenStream + 'a> {
 
 /// Simple wrapper of `Box<dyn TokenStream + 'a>`.
 ///
-/// See [TokenStream] for more information.
+/// See [`TokenStream`] for more information.
 pub struct BoxTokenStream<'a>(Box<dyn TokenStream + 'a>);
 
 impl<'a, T> From<T> for BoxTokenStream<'a>
@@ -181,7 +181,7 @@ impl<'a> DerefMut for BoxTokenStream<'a> {
 
 /// Simple wrapper of `Box<dyn TokenFilter + 'a>`.
 ///
-/// See [TokenStream] for more information.
+/// See [`TokenFilter`] for more information.
 pub struct BoxTokenFilter(Box<dyn TokenFilter>);
 
 impl Deref for BoxTokenFilter {