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

pjfanning pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko.git


The following commit(s) were added to refs/heads/main by this push:
     new ce82186c82 fix some stray refs to Akka classes and some uses of 'an' 
(#2963)
ce82186c82 is described below

commit ce82186c82d6c618f8ffb9af4f1f267abf7fb8d3
Author: PJ Fanning <[email protected]>
AuthorDate: Sun May 10 12:17:09 2026 +0100

    fix some stray refs to Akka classes and some uses of 'an' (#2963)
---
 .gitignore                                         |  3 --
 .../actor/testkit/typed/javadsl/ActorTestKit.scala |  8 +++---
 .../testkit/typed/javadsl/BehaviorTestKit.scala    |  4 +--
 .../actor/testkit/typed/javadsl/TestInbox.scala    |  8 +++---
 .../actor/testkit/typed/javadsl/TestProbe.scala    |  6 ++--
 .../testkit/typed/scaladsl/ActorTestKit.scala      |  8 +++---
 .../testkit/typed/scaladsl/BehaviorTestKit.scala   |  4 +--
 .../actor/testkit/typed/scaladsl/TestInbox.scala   | 10 +++----
 .../actor/testkit/typed/scaladsl/TestProbe.scala   |  6 ++--
 .../internal/adapter/ActorContextAdapter.scala     |  2 +-
 .../pekko/actor/typed/javadsl/ActorContext.scala   |  6 ++--
 .../pekko/actor/typed/javadsl/Behaviors.scala      | 10 +++----
 .../pekko/actor/typed/scaladsl/ActorContext.scala  |  4 +--
 .../pekko/actor/typed/scaladsl/Behaviors.scala     |  8 +++---
 .../org/apache/pekko/actor/AbstractActor.scala     |  2 +-
 .../scala/org/apache/pekko/actor/AbstractFSM.scala | 32 +++++++++++-----------
 .../main/scala/org/apache/pekko/actor/Actor.scala  |  2 +-
 .../scala/org/apache/pekko/actor/ActorCell.scala   |  4 +--
 .../scala/org/apache/pekko/actor/ActorRef.scala    |  2 +-
 .../org/apache/pekko/actor/ActorRefProvider.scala  |  4 +--
 .../main/scala/org/apache/pekko/actor/FSM.scala    |  2 +-
 .../pekko/actor/setup/ActorSystemSetup.scala       |  6 ++--
 .../scala/org/apache/pekko/event/EventStream.scala |  2 +-
 .../scala/org/apache/pekko/event/Logging.scala     |  2 +-
 .../scala/org/apache/pekko/io/TcpManager.scala     |  2 +-
 .../scala/org/apache/pekko/io/UdpManager.scala     |  2 +-
 .../main/scala/org/apache/pekko/japi/JavaAPI.scala |  4 +--
 .../org/apache/pekko/pattern/AskSupport.scala      |  8 +++---
 .../scala/org/apache/pekko/pattern/Patterns.scala  | 16 +++++------
 .../org/apache/pekko/pattern/RetrySupport.scala    |  4 +--
 .../scala/org/apache/pekko/pattern/package.scala   |  4 +--
 .../scala/org/apache/pekko/routing/Router.scala    |  4 +--
 .../sharding/typed/javadsl/ClusterSharding.scala   |  2 +-
 .../sharding/typed/scaladsl/ClusterSharding.scala  |  2 +-
 .../cluster/singleton/ClusterSingletonProxy.scala  |  2 +-
 .../pekko/cluster/typed/ClusterSingleton.scala     |  2 +-
 .../org/apache/pekko/cluster/DowningProvider.scala |  2 +-
 .../leveldb/javadsl/LeveldbReadJournal.scala       |  2 +-
 .../leveldb/scaladsl/LeveldbReadJournal.scala      |  2 +-
 .../japi/journal/JavaJournalPerfSpec.scala         |  2 +-
 .../persistence/journal/JournalPerfSpec.scala      |  2 +-
 .../typed/internal/ExternalInteractions.scala      |  2 +-
 .../typed/javadsl/CommandHandlerWithReply.scala    |  4 +--
 .../pekko/persistence/typed/javadsl/Effect.scala   |  2 +-
 .../state/javadsl/CommandHandlerWithReply.scala    |  4 +--
 .../persistence/typed/state/javadsl/Effect.scala   |  2 +-
 .../org/apache/pekko/persistence/Persistence.scala |  4 +--
 .../org/apache/pekko/persistence/Persistent.scala  |  2 +-
 .../org/apache/pekko/persistence/Snapshotter.scala |  8 +++---
 .../pekko/persistence/fsm/PersistentFSM.scala      |  2 +-
 .../pekko/persistence/fsm/PersistentFSMBase.scala  | 32 +++++++++++-----------
 .../journal/leveldb/LeveldbJournal.scala           |  2 +-
 .../apache/pekko/remote/AddressUidExtension.scala  |  2 +-
 .../pekko/remote/FailureDetectorRegistry.scala     |  4 +--
 .../remote/serialization/ProtobufSerializer.scala  |  4 +--
 .../pekko/remote/transport/PekkoPduCodec.scala     |  4 +--
 .../apache/pekko/remote/transport/Transport.scala  | 14 +++++-----
 .../pekko/stream/typed/javadsl/ActorFlow.scala     |  8 +++---
 .../pekko/stream/typed/javadsl/ActorSource.scala   |  4 +--
 .../pekko/stream/typed/scaladsl/ActorFlow.scala    |  8 +++---
 .../pekko/stream/typed/scaladsl/ActorSource.scala  |  4 +--
 .../apache/pekko/stream/ActorMaterializer.scala    | 10 +++----
 .../org/apache/pekko/stream/javadsl/Flow.scala     |  8 +++---
 .../org/apache/pekko/stream/javadsl/Sink.scala     |  4 +--
 .../org/apache/pekko/stream/javadsl/Source.scala   | 18 ++++++------
 .../pekko/stream/javadsl/StreamConverters.scala    | 12 ++++----
 .../org/apache/pekko/stream/javadsl/SubFlow.scala  |  2 +-
 .../apache/pekko/stream/javadsl/SubSource.scala    |  2 +-
 .../org/apache/pekko/stream/javadsl/Tcp.scala      |  8 +++---
 .../org/apache/pekko/stream/scaladsl/Flow.scala    | 10 +++----
 .../org/apache/pekko/stream/scaladsl/Sink.scala    |  4 +--
 .../org/apache/pekko/stream/scaladsl/Source.scala  | 10 +++----
 .../org/apache/pekko/stream/scaladsl/Tcp.scala     |  8 +++---
 .../org/apache/pekko/stream/stage/GraphStage.scala |  2 +-
 .../apache/pekko/stream/stage/StageLogging.scala   |  2 +-
 .../scala/org/apache/pekko/testkit/TestKit.scala   |  2 +-
 .../org/apache/pekko/testkit/javadsl/TestKit.scala |  2 +-
 77 files changed, 212 insertions(+), 215 deletions(-)

diff --git a/.gitignore b/.gitignore
index c7b7728870..fb655d8317 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,9 +49,6 @@ docs/_build/
 docs/exts/
 docs/rst_preprocessed/
 osgi/src/main/resources/*.conf
-akka.sublime-project
-akka.sublime-workspace
-akka.tmproj
 beanstalk/
 bin/
 data
diff --git 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala
 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala
index bbc650021b..cb599f57fb 100644
--- 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala
+++ 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala
@@ -63,7 +63,7 @@ object ActorTestKit {
   /**
    * Create a testkit using the provided name.
    *
-   * It will create an [[pekko.actor.typed.ActorSystem]] with this name,
+   * It will create a [[pekko.actor.typed.ActorSystem]] with this name,
    * e.g. threads will include the name.
    * When the test has completed you should terminate the `ActorSystem` and
    * the testkit with [[ActorTestKit#shutdownTestKit]].
@@ -91,7 +91,7 @@ object ActorTestKit {
    * Create a test kit named based on the provided name,
    * and uses the provided custom config for the actor system.
    *
-   * It will create an [[pekko.actor.typed.ActorSystem]] with this name,
+   * It will create a [[pekko.actor.typed.ActorSystem]] with this name,
    * e.g. threads will include the name.
    *
    * It will also used the provided customConfig provided to create the 
`ActorSystem`
@@ -103,10 +103,10 @@ object ActorTestKit {
     new ActorTestKit(scaladsl.ActorTestKit(name, customConfig))
 
   /**
-   * Create an [[pekko.actor.typed.ActorSystem]] named based on the provided 
name,
+   * Create a [[pekko.actor.typed.ActorSystem]] named based on the provided 
name,
    * use the provided custom config for the actor system, and the testkit will 
use the provided setting.
    *
-   * It will create an [[pekko.actor.typed.ActorSystem]] with this name,
+   * It will create a [[pekko.actor.typed.ActorSystem]] with this name,
    * e.g. threads will include the name.
    *
    * It will also used the provided customConfig provided to create the 
`ActorSystem`, and provided setting.
diff --git 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala
 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala
index 0623c5914c..2a97e31323 100644
--- 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala
+++ 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala
@@ -77,7 +77,7 @@ abstract class BehaviorTestKit[T] {
 
   /**
    * Constructs a message using the provided 'messageFactory' to inject a 
single-use "reply to"
-   * [[akka.actor.typed.ActorRef]], and sends the constructed message to the 
behavior, recording any [[Effect]]s.
+   * [[pekko.actor.typed.ActorRef]], and sends the constructed message to the 
behavior, recording any [[Effect]]s.
    *
    * The returned [[ReplyInbox]] allows the message sent to the "reply to" 
`ActorRef` to be asserted on.
    *
@@ -102,7 +102,7 @@ abstract class BehaviorTestKit[T] {
     runAsk(messageFactory)
 
   /**
-   * The same as [[runAsk]] but only for requests that result in a response of 
type [[akka.pattern.StatusReply]].
+   * The same as [[runAsk]] but only for requests that result in a response of 
type [[pekko.pattern.StatusReply]].
    *
    * @since 1.3.0
    */
diff --git 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala
 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala
index 962083dc9b..bc4467aca4 100644
--- 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala
+++ 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala
@@ -79,9 +79,9 @@ abstract class TestInbox[T] {
 }
 
 /**
- * Similar to an [[akka.actor.testkit.typed.javadsl.TestInbox]], but can only 
ever give access to a single message (a reply).
+ * Similar to a [[pekko.actor.testkit.typed.javadsl.TestInbox]], but can only 
ever give access to a single message (a reply).
  *
- * Not intended for user creation: the 
[[akka.actor.testkit.typed.javadsl.BehaviorTestKit]] will provide these to
+ * Not intended for user creation: the 
[[pekko.actor.testkit.typed.javadsl.BehaviorTestKit]] will provide these to
  * denote that at most a single reply is expected.
  *
  * @since 1.3.0
@@ -107,12 +107,12 @@ trait ReplyInbox[T] {
 }
 
 /**
- * A [[akka.actor.testkit.typed.javadsl.ReplyInbox]] which specially handles 
[[akka.pattern.StatusReply]].
+ * A [[pekko.actor.testkit.typed.javadsl.ReplyInbox]] which specially handles 
[[pekko.pattern.StatusReply]].
  *
  * Note that there is no provided ability to expect a specific `Throwable`, as 
it's recommended to prefer
  * a string error message or to enumerate failures with specific types.
  *
- * Not intended for user creation: the 
[[akka.actor.testkit.typed.javadsl.BehaviorTestKit]] will provide these to
+ * Not intended for user creation: the 
[[pekko.actor.testkit.typed.javadsl.BehaviorTestKit]] will provide these to
  * denote that at most a single reply is expected.
  */
 @DoNotInherit
diff --git 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestProbe.scala
 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestProbe.scala
index c709d59a85..8f602a5cc6 100644
--- 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestProbe.scala
+++ 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestProbe.scala
@@ -101,7 +101,7 @@ abstract class TestProbe[M] extends RecipientRef[M] { this: 
InternalRecipientRef
 
   /**
    * Obtain time remaining for execution of the innermost enclosing `within`
-   * block or throw an [[java.lang.AssertionError]] if no `within` block 
surrounds this
+   * block or throw a [[java.lang.AssertionError]] if no `within` block 
surrounds this
    * call.
    */
   def getRemaining: Duration
@@ -191,7 +191,7 @@ abstract class TestProbe[M] extends RecipientRef[M] { this: 
InternalRecipientRef
 
   /**
    * Receive one message of type `M`. Wait time is bounded by the `max` 
duration,
-   * with an [[java.lang.AssertionError]] raised in case of timeout.
+   * with a [[java.lang.AssertionError]] raised in case of timeout.
    */
   def receiveMessage(max: Duration): M
 
@@ -236,7 +236,7 @@ abstract class TestProbe[M] extends RecipientRef[M] { this: 
InternalRecipientRef
 
   /**
    * Expect the given actor to be stopped or stop within the given timeout or
-   * throw an [[java.lang.AssertionError]].
+   * throw a [[java.lang.AssertionError]].
    *
    * Note that the timeout is scaled using the configuration entry 
"pekko.actor.testkit.typed.timefactor".
    */
diff --git 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala
 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala
index 2d1fb7be35..01f6a36297 100644
--- 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala
+++ 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala
@@ -88,7 +88,7 @@ object ActorTestKit {
   /**
    * Create a testkit using the provided name.
    *
-   * It will create an [[pekko.actor.typed.ActorSystem]] with this name,
+   * It will create a [[pekko.actor.typed.ActorSystem]] with this name,
    * e.g. threads will include the name.
    * When the test has completed you should terminate the `ActorSystem` and
    * the testkit with [[ActorTestKit#shutdownTestKit]].
@@ -124,7 +124,7 @@ object ActorTestKit {
    * Create a test kit named based on the provided name,
    * and uses the provided custom config for the actor system.
    *
-   * It will create an [[pekko.actor.typed.ActorSystem]] with this name,
+   * It will create a [[pekko.actor.typed.ActorSystem]] with this name,
    * e.g. threads will include the name.
    *
    * It will also used the provided customConfig provided to create the 
`ActorSystem`
@@ -139,10 +139,10 @@ object ActorTestKit {
   }
 
   /**
-   * Create an [[pekko.actor.typed.ActorSystem]] named based on the provided 
name,
+   * Create a [[pekko.actor.typed.ActorSystem]] named based on the provided 
name,
    * use the provided custom config for the actor system, and the testkit will 
use the provided setting.
    *
-   * It will create an [[pekko.actor.typed.ActorSystem]] with this name,
+   * It will create a [[pekko.actor.typed.ActorSystem]] with this name,
    * e.g. threads will include the name.
    *
    * It will also used the provided customConfig provided to create the 
`ActorSystem`, and provided setting.
diff --git 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKit.scala
 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKit.scala
index e3f7945c64..ef5fd4cb0f 100644
--- 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKit.scala
+++ 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKit.scala
@@ -59,7 +59,7 @@ object BehaviorTestKit {
 trait BehaviorTestKit[T] {
 
   /**
-   * Constructs a message using the provided function to inject a single-use 
"reply to" [[akka.actor.typed.ActorRef]],
+   * Constructs a message using the provided function to inject a single-use 
"reply to" [[pekko.actor.typed.ActorRef]],
    * and sends the constructed message to the behavior, recording any 
[[Effect]]s.
    *
    * The returned [[ReplyInbox]] allows the message sent to the "reply to" 
`ActorRef` to be asserted on.
@@ -69,7 +69,7 @@ trait BehaviorTestKit[T] {
   def runAsk[Res](f: ActorRef[Res] => T): ReplyInbox[Res]
 
   /**
-   * The same as [[runAsk]] but only for requests that result in a response of 
type [[akka.pattern.StatusReply]].
+   * The same as [[runAsk]] but only for requests that result in a response of 
type [[pekko.pattern.StatusReply]].
    *
    * @since 1.3.0
    */
diff --git 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestInbox.scala
 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestInbox.scala
index 6c1a1935aa..f619499835 100644
--- 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestInbox.scala
+++ 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestInbox.scala
@@ -78,9 +78,9 @@ trait TestInbox[T] {
 }
 
 /**
- * Similar to an [[akka.actor.testkit.typed.scaladsl.TestInbox]], but can only 
ever give access to a single message (a reply).
+ * Similar to a [[pekko.actor.testkit.typed.scaladsl.TestInbox]], but can only 
ever give access to a single message (a reply).
  *
- * Not intended for user creation: the 
[[akka.actor.testkit.typed.scaladsl.BehaviorTestKit]] will provide these
+ * Not intended for user creation: the 
[[pekko.actor.testkit.typed.scaladsl.BehaviorTestKit]] will provide these
  * to denote that at most a single reply is expected.
  *
  * @since 1.3.0
@@ -110,12 +110,12 @@ trait ReplyInbox[T] {
 }
 
 /**
- * A [[akka.actor.testkit.typed.scaladsl.ReplyInbox]] which specially handles 
[[akka.pattern.StatusReply]].
+ * A [[pekko.actor.testkit.typed.scaladsl.ReplyInbox]] which specially handles 
[[pekko.pattern.StatusReply]].
  *
  * Note that there is no provided ability to expect a specific `Throwable`, as 
it's recommended to prefer
  * a string error message or to enumerate failures with specific types.
  *
- * Not intended for user creation: the 
[[akka.actor.testkit.typed.scaladsl.BehaviorTestKit]] will provide these
+ * Not intended for user creation: the 
[[pekko.actor.testkit.typed.scaladsl.BehaviorTestKit]] will provide these
  * to denote that at most a single reply is expected.
  */
 @DoNotInherit
@@ -155,7 +155,7 @@ trait StatusReplyInbox[T] {
   def expectErrorMessage(errorMessage: String): Unit
 
   /**
-   * Assert that the successful value of the status reply is [[akka.Done]].  
Subsequent calls to any `receive` or
+   * Assert that the successful value of the status reply is [[pekko.Done]].  
Subsequent calls to any `receive` or
    * `expect` method will fail and `hasReply` will be false after calling this 
method.
    */
   @annotation.nowarn("msg=never used")
diff --git 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbe.scala
 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbe.scala
index 322f9a7172..4ec7625a84 100644
--- 
a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbe.scala
+++ 
b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbe.scala
@@ -86,7 +86,7 @@ object TestProbe {
 
   /**
    * Obtain time remaining for execution of the innermost enclosing `within`
-   * block or throw an [[java.lang.AssertionError]] if no `within` block 
surrounds this
+   * block or throw a [[java.lang.AssertionError]] if no `within` block 
surrounds this
    * call.
    */
   def remaining: FiniteDuration
@@ -172,7 +172,7 @@ object TestProbe {
 
   /**
    * Receive one message of type `M`. Wait time is bounded by the `max` 
duration,
-   * with an [[java.lang.AssertionError]] raised in case of timeout.
+   * with a [[java.lang.AssertionError]] raised in case of timeout.
    */
   def receiveMessage(max: FiniteDuration): M
 
@@ -225,7 +225,7 @@ object TestProbe {
 
   /**
    * Expect the given actor to be stopped or stop within the given timeout or
-   * throw an [[java.lang.AssertionError]].
+   * throw a [[java.lang.AssertionError]].
    */
   def expectTerminated[U](actorRef: ActorRef[U], max: FiniteDuration): Unit
 
diff --git 
a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorContextAdapter.scala
 
b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorContextAdapter.scala
index 95be6cd5de..4a522b33c2 100644
--- 
a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorContextAdapter.scala
+++ 
b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorContextAdapter.scala
@@ -43,7 +43,7 @@ private[pekko] object ActorContextAdapter {
 }
 
 /**
- * INTERNAL API. Wrapping an [[pekko.actor.ActorContext]] as an 
[[TypedActorContext]].
+ * INTERNAL API. Wrapping a [[pekko.actor.ActorContext]] as a 
[[TypedActorContext]].
  */
 @InternalApi private[pekko] final class ActorContextAdapter[T](adapter: 
ActorAdapter[T])
     extends ActorContextImpl[T] {
diff --git 
a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala
 
b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala
index 77512eab00..2d15fb8fca 100644
--- 
a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala
+++ 
b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala
@@ -186,7 +186,7 @@ trait ActorContext[T] extends TypedActorContext[T] with 
ClassicActorContextProvi
    *
    * `watch` is idempotent if it is not mixed with `watchWith`.
    *
-   * It will fail with an [[java.lang.IllegalStateException]] if the same 
subject was watched before using `watchWith`.
+   * It will fail with a [[java.lang.IllegalStateException]] if the same 
subject was watched before using `watchWith`.
    * To clear the termination message, unwatch first.
    *
    * *Warning*: This method is not thread-safe and must not be accessed from 
threads other
@@ -201,7 +201,7 @@ trait ActorContext[T] extends TypedActorContext[T] with 
ClassicActorContextProvi
    *
    * `watchWith` is idempotent if it is called with the same `msg` and not 
mixed with `watch`.
    *
-   * It will fail with an [[java.lang.IllegalStateException]] if the same 
subject was watched before using `watch` or `watchWith` with
+   * It will fail with a [[java.lang.IllegalStateException]] if the same 
subject was watched before using `watch` or `watchWith` with
    * another termination message. To change the termination message, unwatch 
first.
    *
    * *Warning*: This method is not thread-safe and must not be accessed from 
threads other
@@ -292,7 +292,7 @@ trait ActorContext[T] extends TypedActorContext[T] with 
ClassicActorContextProvi
    * the protocol of this actor.
    *
    * The interaction has a timeout (to avoid a resource leak). If the timeout 
hits without any response it
-   * will be passed as an [[java.util.concurrent.TimeoutException]] to the 
`applyToResponse` function.
+   * will be passed as a [[java.util.concurrent.TimeoutException]] to the 
`applyToResponse` function.
    *
    * For other messaging patterns with other actors, see 
[[ActorContext#messageAdapter]].
    *
diff --git 
a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala
 
b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala
index df04d2e2db..78a3d5314e 100644
--- 
a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala
+++ 
b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala
@@ -112,7 +112,7 @@ object Behaviors {
   /**
    * Construct an actor behavior that can react to incoming messages but not to
    * lifecycle signals. After spawning this actor from another actor (or as the
-   * guardian of an [[pekko.actor.typed.ActorSystem]]) it will be executed 
within an
+   * guardian of a [[pekko.actor.typed.ActorSystem]]) it will be executed 
within an
    * [[ActorContext]] that allows access to the system, spawning and watching
    * other actors, etc.
    *
@@ -127,11 +127,11 @@ object Behaviors {
   /**
    * Simplified version of `receive` with only a single argument - the message
    * to be handled. Useful for when the context is already accessible by other 
means,
-   * like being wrapped in an [[setup]] or similar.
+   * like being wrapped in a [[setup]] or similar.
    *
    * Construct an actor behavior that can react to incoming messages but not to
    * lifecycle signals. After spawning this actor from another actor (or as the
-   * guardian of an [[pekko.actor.typed.ActorSystem]]) it will be executed 
within an
+   * guardian of a [[pekko.actor.typed.ActorSystem]]) it will be executed 
within an
    * [[ActorContext]] that allows access to the system, spawning and watching
    * other actors, etc.
    *
@@ -150,7 +150,7 @@ object Behaviors {
    *
    * Construct an actor behavior that can react to incoming messages but not to
    * lifecycle signals. After spawning this actor from another actor (or as the
-   * guardian of an [[pekko.actor.typed.ActorSystem]]) it will be executed 
within an
+   * guardian of a [[pekko.actor.typed.ActorSystem]]) it will be executed 
within an
    * [[ActorContext]] that allows access to the system, spawning and watching
    * other actors, etc.
    *
@@ -169,7 +169,7 @@ object Behaviors {
   /**
    * Construct an actor behavior that can react to both incoming messages and
    * lifecycle signals. After spawning this actor from another actor (or as the
-   * guardian of an [[pekko.actor.typed.ActorSystem]]) it will be executed 
within an
+   * guardian of a [[pekko.actor.typed.ActorSystem]]) it will be executed 
within an
    * [[ActorContext]] that allows access to the system, spawning and watching
    * other actors, etc.
    *
diff --git 
a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala
 
b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala
index 577b75c3ca..86ab53c765 100644
--- 
a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala
+++ 
b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala
@@ -169,7 +169,7 @@ trait ActorContext[T] extends TypedActorContext[T] with 
ClassicActorContextProvi
    *
    * `watch` is idempotent if it is not mixed with `watchWith`.
    *
-   * It will fail with an [[java.lang.IllegalStateException]] if the same 
subject was watched before using `watchWith`.
+   * It will fail with a [[java.lang.IllegalStateException]] if the same 
subject was watched before using `watchWith`.
    * To clear the termination message, unwatch first.
    *
    * *Warning*: This method is not thread-safe and must not be accessed from 
threads other
@@ -184,7 +184,7 @@ trait ActorContext[T] extends TypedActorContext[T] with 
ClassicActorContextProvi
    *
    * `watchWith` is idempotent if it is called with the same `msg` and not 
mixed with `watch`.
    *
-   * It will fail with an [[java.lang.IllegalStateException]] if the same 
subject was watched before using `watch` or `watchWith` with
+   * It will fail with a [[java.lang.IllegalStateException]] if the same 
subject was watched before using `watch` or `watchWith` with
    * another termination message. To change the termination message, unwatch 
first.
    *
    * *Warning*: This method is not thread-safe and must not be accessed from 
threads other
diff --git 
a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Behaviors.scala
 
b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Behaviors.scala
index 0d224f499d..bfeb470389 100644
--- 
a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Behaviors.scala
+++ 
b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Behaviors.scala
@@ -103,7 +103,7 @@ object Behaviors {
   /**
    * Construct an actor behavior that can react to both incoming messages and
    * lifecycle signals. After spawning this actor from another actor (or as the
-   * guardian of an [[pekko.actor.typed.ActorSystem]]) it will be executed 
within an
+   * guardian of a [[pekko.actor.typed.ActorSystem]]) it will be executed 
within an
    * [[ActorContext]] that allows access to the system, spawning and watching
    * other actors, etc.
    *
@@ -118,11 +118,11 @@ object Behaviors {
   /**
    * Simplified version of [[Receive]] with only a single argument - the 
message
    * to be handled. Useful for when the context is already accessible by other 
means,
-   * like being wrapped in an [[setup]] or similar.
+   * like being wrapped in a [[setup]] or similar.
    *
    * Construct an actor behavior that can react to both incoming messages and
    * lifecycle signals. After spawning this actor from another actor (or as the
-   * guardian of an [[pekko.actor.typed.ActorSystem]]) it will be executed 
within an
+   * guardian of a [[pekko.actor.typed.ActorSystem]]) it will be executed 
within an
    * [[ActorContext]] that allows access to the system, spawning and watching
    * other actors, etc.
    *
@@ -141,7 +141,7 @@ object Behaviors {
    *
    * Construct an actor behavior that can react to incoming messages but not to
    * lifecycle signals. After spawning this actor from another actor (or as the
-   * guardian of an [[pekko.actor.typed.ActorSystem]]) it will be executed 
within an
+   * guardian of a [[pekko.actor.typed.ActorSystem]]) it will be executed 
within an
    * [[ActorContext]] that allows access to the system, spawning and watching
    * other actors, etc.
    *
diff --git a/actor/src/main/scala/org/apache/pekko/actor/AbstractActor.scala 
b/actor/src/main/scala/org/apache/pekko/actor/AbstractActor.scala
index b5f0ad1ec4..7bb3ce71a0 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/AbstractActor.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/AbstractActor.scala
@@ -354,7 +354,7 @@ abstract class UntypedAbstractActor extends AbstractActor {
    * Recommended convention is to call this method if the message
    * isn't handled in [[#onReceive]] (e.g. unknown message type).
    * By default it fails with either a [[pekko.actor.DeathPactException]] (in
-   * case of an unhandled [[pekko.actor.Terminated]] message) or publishes an 
[[pekko.actor.UnhandledMessage]]
+   * case of an unhandled [[pekko.actor.Terminated]] message) or publishes a 
[[pekko.actor.UnhandledMessage]]
    * to the actor's system's [[pekko.event.EventStream]].
    */
   override def unhandled(message: Any): Unit = super.unhandled(message)
diff --git a/actor/src/main/scala/org/apache/pekko/actor/AbstractFSM.scala 
b/actor/src/main/scala/org/apache/pekko/actor/AbstractFSM.scala
index d82d379720..fd26155ced 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/AbstractFSM.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/AbstractFSM.scala
@@ -201,7 +201,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
     
super.onTermination(stopBuilder.build().asInstanceOf[PartialFunction[StopEvent, 
Unit]])
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches on an event and data type and a predicate.
    *
@@ -219,7 +219,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
     new FSMStateFunctionBuilder[S, D]().event(eventType, dataType, predicate, 
apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches on an event and data type.
    *
@@ -235,7 +235,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
     new FSMStateFunctionBuilder[S, D]().event(eventType, dataType, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches if the event type and predicate matches.
    *
@@ -251,7 +251,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
     new FSMStateFunctionBuilder[S, D]().event(eventType, predicate, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches if the event type matches.
    *
@@ -263,7 +263,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
     new FSMStateFunctionBuilder[S, D]().event(eventType, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches if the predicate matches.
    *
@@ -277,7 +277,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
     new FSMStateFunctionBuilder[S, D]().event(predicate, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches on the data type and if any of the event 
types
    * in the list match or any of the event instances in the list compares 
equal.
@@ -294,7 +294,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
     new FSMStateFunctionBuilder[S, D]().event(eventMatches, dataType, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches if any of the event types in the list match 
or any
    * of the event instances in the list compares equal.
@@ -307,7 +307,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
     new FSMStateFunctionBuilder[S, D]().event(eventMatches, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches on the data type and if the event compares 
equal.
    *
@@ -323,7 +323,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
     new FSMStateFunctionBuilder[S, D]().eventEquals(event, dataType, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches if the event compares equal.
    *
@@ -335,7 +335,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
     new FSMStateFunctionBuilder[S, D]().eventEquals(event, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches on any type of event.
    *
@@ -346,7 +346,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
     new FSMStateFunctionBuilder[S, D]().anyEvent(apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMTransitionHandlerBuilder]] with the first 
case statement set.
+   * Create a [[pekko.japi.pf.FSMTransitionHandlerBuilder]] with the first 
case statement set.
    *
    * A case statement that matches on a from state and a to state.
    *
@@ -359,7 +359,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
     new FSMTransitionHandlerBuilder[S]().state(fromState, toState, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMTransitionHandlerBuilder]] with the first 
case statement set.
+   * Create a [[pekko.japi.pf.FSMTransitionHandlerBuilder]] with the first 
case statement set.
    *
    * A case statement that matches on a from state and a to state.
    *
@@ -372,9 +372,9 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
     new FSMTransitionHandlerBuilder[S]().state(fromState, toState, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStopBuilder]] with the first case statement 
set.
+   * Create a [[pekko.japi.pf.FSMStopBuilder]] with the first case statement 
set.
    *
-   * A case statement that matches on an [[FSM.Reason]].
+   * A case statement that matches on a [[FSM.Reason]].
    *
    * @param reason  the reason for the termination
    * @param apply  an action to apply to the event and state data if there is 
a match
@@ -384,7 +384,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
     new FSMStopBuilder[S, D]().stop(reason, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStopBuilder]] with the first case statement 
set.
+   * Create a [[pekko.japi.pf.FSMStopBuilder]] with the first case statement 
set.
    *
    * A case statement that matches on a reason type.
    *
@@ -396,7 +396,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] {
     new FSMStopBuilder[S, D]().stop(reasonType, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStopBuilder]] with the first case statement 
set.
+   * Create a [[pekko.japi.pf.FSMStopBuilder]] with the first case statement 
set.
    *
    * A case statement that matches on a reason type and a predicate.
    *
diff --git a/actor/src/main/scala/org/apache/pekko/actor/Actor.scala 
b/actor/src/main/scala/org/apache/pekko/actor/Actor.scala
index 61f2a460e5..28e0b5e65a 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/Actor.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/Actor.scala
@@ -651,7 +651,7 @@ trait Actor {
    * <p/>
    * Is called when a message isn't handled by the current behavior of the 
actor
    * by default it fails with either a [[pekko.actor.DeathPactException]] (in
-   * case of an unhandled [[pekko.actor.Terminated]] message) or publishes an 
[[pekko.actor.UnhandledMessage]]
+   * case of an unhandled [[pekko.actor.Terminated]] message) or publishes a 
[[pekko.actor.UnhandledMessage]]
    * to the actor's system's [[pekko.event.EventStream]]
    */
   def unhandled(message: Any): Unit = {
diff --git a/actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala 
b/actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala
index 011ca93f06..eafd287823 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala
@@ -200,7 +200,7 @@ trait ActorContext extends ActorRefFactory with 
ClassicActorContextProvider {
    *
    * `watch` is idempotent if it is not mixed with `watchWith`.
    *
-   * It will fail with an [[java.lang.IllegalStateException]] if the same 
subject was watched before using `watchWith`.
+   * It will fail with a [[java.lang.IllegalStateException]] if the same 
subject was watched before using `watchWith`.
    * To clear the termination message, unwatch first.
    *
    * *Warning*: This method is not thread-safe and must not be accessed from 
threads other
@@ -217,7 +217,7 @@ trait ActorContext extends ActorRefFactory with 
ClassicActorContextProvider {
    *
    * `watchWith` is idempotent if it is called with the same `msg` and not 
mixed with `watch`.
    *
-   * It will fail with an [[java.lang.IllegalStateException]] if the same 
subject was watched before using `watch` or `watchWith` with
+   * It will fail with a [[java.lang.IllegalStateException]] if the same 
subject was watched before using `watch` or `watchWith` with
    * another termination message. To change the termination message, unwatch 
first.
    *
    * *Warning*: This method is not thread-safe and must not be accessed from 
threads other
diff --git a/actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala 
b/actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala
index 6136981c08..abd9d06af6 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala
@@ -46,7 +46,7 @@ object ActorRef {
 /**
  * Immutable and serializable handle to an actor, which may or may not reside
  * on the local host or inside the same [[pekko.actor.ActorSystem]]. An 
ActorRef
- * can be obtained from an [[pekko.actor.ActorRefFactory]], an interface which
+ * can be obtained from a [[pekko.actor.ActorRefFactory]], an interface which
  * is implemented by ActorSystem and [[pekko.actor.ActorContext]]. This means
  * actors can be created top-level in the ActorSystem or as children of an
  * existing actor, but only from within that actor.
diff --git a/actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala 
b/actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala
index d9ce1b7a4e..286d395945 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala
@@ -246,7 +246,7 @@ trait ActorRefFactory {
   def actorOf(props: Props, name: String): ActorRef
 
   /**
-   * Construct an [[pekko.actor.ActorSelection]] from the given path, which is
+   * Construct a [[pekko.actor.ActorSelection]] from the given path, which is
    * parsed for wildcards (these are replaced by regular expressions
    * internally). No attempt is made to verify the existence of any part of
    * the supplied path, it is recommended to send a message and gather the
@@ -264,7 +264,7 @@ trait ActorRefFactory {
   }
 
   /**
-   * Construct an [[pekko.actor.ActorSelection]] from the given path, which is
+   * Construct a [[pekko.actor.ActorSelection]] from the given path, which is
    * parsed for wildcards (these are replaced by regular expressions
    * internally). No attempt is made to verify the existence of any part of
    * the supplied path, it is recommended to send a message and gather the
diff --git a/actor/src/main/scala/org/apache/pekko/actor/FSM.scala 
b/actor/src/main/scala/org/apache/pekko/actor/FSM.scala
index 190e753091..a46a7378fa 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/FSM.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/FSM.scala
@@ -55,7 +55,7 @@ object FSM {
   final case class Transition[S](fsmRef: ActorRef, from: S, to: S)
 
   /**
-   * Send this to an [[pekko.actor.FSM]] to request first the 
[[FSM.CurrentState]]
+   * Send this to a [[pekko.actor.FSM]] to request first the 
[[FSM.CurrentState]]
    * and then a series of [[FSM.Transition]] updates. Cancel the subscription
    * using [[FSM.UnsubscribeTransitionCallBack]].
    */
diff --git 
a/actor/src/main/scala/org/apache/pekko/actor/setup/ActorSystemSetup.scala 
b/actor/src/main/scala/org/apache/pekko/actor/setup/ActorSystemSetup.scala
index 1394483f3f..acde21bf5d 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/setup/ActorSystemSetup.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/setup/ActorSystemSetup.scala
@@ -30,7 +30,7 @@ import pekko.annotation.InternalApi
 abstract class Setup {
 
   /**
-   * Construct an [[pekko.actor.setup.ActorSystemSetup]] with this setup 
combined with another one. Allows for
+   * Construct a [[pekko.actor.setup.ActorSystemSetup]] with this setup 
combined with another one. Allows for
    * fluent creation of settings. If `other` is a setting of the same concrete 
[[pekko.actor.setup.Setup]] as this
    * it will replace this.
    */
@@ -43,13 +43,13 @@ object ActorSystemSetup {
   val empty = new ActorSystemSetup(Map.empty)
 
   /**
-   * Scala API: Create an [[pekko.actor.setup.ActorSystemSetup]] containing 
all the provided settings
+   * Scala API: Create a [[pekko.actor.setup.ActorSystemSetup]] containing all 
the provided settings
    */
   def apply(settings: Setup*): ActorSystemSetup =
     new ActorSystemSetup(settings.map(s => s.getClass -> s).toMap)
 
   /**
-   * Java API: Create an [[pekko.actor.setup.ActorSystemSetup]] containing all 
the provided settings
+   * Java API: Create a [[pekko.actor.setup.ActorSystemSetup]] containing all 
the provided settings
    */
   @varargs
   def create(settings: Setup*): ActorSystemSetup = apply(settings: _*)
diff --git a/actor/src/main/scala/org/apache/pekko/event/EventStream.scala 
b/actor/src/main/scala/org/apache/pekko/event/EventStream.scala
index 35bcac9684..0822f39e57 100644
--- a/actor/src/main/scala/org/apache/pekko/event/EventStream.scala
+++ b/actor/src/main/scala/org/apache/pekko/event/EventStream.scala
@@ -38,7 +38,7 @@ class EventStream(sys: ActorSystem, private val debug: 
Boolean) extends LoggingB
   type Event = Any
   type Classifier = Class[_]
 
-  /** Either the list of subscribed actors, or a ref to an 
[[pekko.event.EventStreamUnsubscriber]] */
+  /** Either the list of subscribed actors, or a ref to a 
[[pekko.event.EventStreamUnsubscriber]] */
   private val initiallySubscribedOrUnsubscriber = new 
AtomicReference[Either[Set[ActorRef], ActorRef]](Left(Set.empty))
 
   protected implicit val subclassification: Subclassification[Classifier] = 
new Subclassification[Class[_]] {
diff --git a/actor/src/main/scala/org/apache/pekko/event/Logging.scala 
b/actor/src/main/scala/org/apache/pekko/event/Logging.scala
index 62d8f0146b..d7b4c8fbc2 100644
--- a/actor/src/main/scala/org/apache/pekko/event/Logging.scala
+++ b/actor/src/main/scala/org/apache/pekko/event/Logging.scala
@@ -309,7 +309,7 @@ class DummyClassForStringSources
 /**
  * This object holds predefined formatting rules for log sources.
  *
- * In case an [[pekko.actor.ActorSystem]] is provided, the following apply:
+ * In case a [[pekko.actor.ActorSystem]] is provided, the following apply:
  * <ul>
  * <li>[[pekko.actor.Actor]] and [[pekko.actor.ActorRef]] will be represented 
by their absolute physical path</li>
  * <li>providing a `String` as source will append "(&lt;system address&gt;)" 
and use the result</li>
diff --git a/actor/src/main/scala/org/apache/pekko/io/TcpManager.scala 
b/actor/src/main/scala/org/apache/pekko/io/TcpManager.scala
index 948f9b4fd6..af3bde377b 100644
--- a/actor/src/main/scala/org/apache/pekko/io/TcpManager.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/TcpManager.scala
@@ -30,7 +30,7 @@ import pekko.actor.{ ActorLogging, Props }
  * To bind and listen to a local address, a [[pekko.io.Tcp.Bind]] command must 
be sent to this actor. If the binding
  * was successful, the sender of the [[pekko.io.Tcp.Bind]] will be notified 
with a [[pekko.io.Tcp.Bound]]
  * message. The sender() of the [[pekko.io.Tcp.Bound]] message is the Listener 
actor (an internal actor responsible for
- * listening to server events). To unbind the port an [[pekko.io.Tcp.Unbind]] 
message must be sent to the Listener actor.
+ * listening to server events). To unbind the port a [[pekko.io.Tcp.Unbind]] 
message must be sent to the Listener actor.
  *
  * If the bind request is rejected because the Tcp system is not able to 
register more channels (see the nr-of-selectors
  * and max-channels configuration options in the pekko.io.tcp section of the 
configuration) the sender will be notified
diff --git a/actor/src/main/scala/org/apache/pekko/io/UdpManager.scala 
b/actor/src/main/scala/org/apache/pekko/io/UdpManager.scala
index 78172ff082..cf8a57f188 100644
--- a/actor/src/main/scala/org/apache/pekko/io/UdpManager.scala
+++ b/actor/src/main/scala/org/apache/pekko/io/UdpManager.scala
@@ -33,7 +33,7 @@ import pekko.io.Udp._
  * To bind and listen to a local address, a [[pekko.io.Udp..Bind]] command 
must be sent to this actor. If the binding
  * was successful, the sender of the [[pekko.io.Udp.Bind]] will be notified 
with a [[pekko.io.Udp.Bound]]
  * message. The sender of the [[pekko.io.Udp.Bound]] message is the Listener 
actor (an internal actor responsible for
- * listening to server events). To unbind the port an [[pekko.io.Tcp.Unbind]] 
message must be sent to the Listener actor.
+ * listening to server events). To unbind the port a [[pekko.io.Tcp.Unbind]] 
message must be sent to the Listener actor.
  *
  * If the bind request is rejected because the Udp system is not able to 
register more channels (see the nr-of-selectors
  * and max-channels configuration options in the pekko.io.udp section of the 
configuration) the sender will be notified
diff --git a/actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala 
b/actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
index 91c846a682..6af233658d 100644
--- a/actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
+++ b/actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
@@ -118,7 +118,7 @@ object Util {
     if ((arr ne null) && arr.length > 0) arr.toIndexedSeq else Nil
 
   /**
-   * Turns an [[java.lang.Iterable]] into an immutable Scala sequence (by 
copying it).
+   * Turns a [[java.lang.Iterable]] into an immutable Scala sequence (by 
copying it).
    */
   def immutableSeq[T](iterable: java.lang.Iterable[T]): immutable.Seq[T] =
     iterable match {
@@ -144,7 +144,7 @@ object Util {
   }
 
   /**
-   * Turns an [[java.lang.Iterable]] into an immutable Scala IndexedSeq (by 
copying it).
+   * Turns a [[java.lang.Iterable]] into an immutable Scala IndexedSeq (by 
copying it).
    */
   def immutableIndexedSeq[T](iterable: java.lang.Iterable[T]): 
immutable.IndexedSeq[T] =
     immutableSeq(iterable).toVector
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala 
b/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
index 37134d1f03..98c717dcfe 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
@@ -67,7 +67,7 @@ trait AskSupport {
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an 
[[pekko.pattern.AskTimeoutException]] after the
+   * The Future will be completed with a [[pekko.pattern.AskTimeoutException]] 
after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` 
is that the
@@ -133,7 +133,7 @@ trait AskSupport {
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an 
[[pekko.pattern.AskTimeoutException]] after the
+   * The Future will be completed with a [[pekko.pattern.AskTimeoutException]] 
after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` 
is that the
@@ -196,7 +196,7 @@ trait ExplicitAskSupport {
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an 
[[pekko.pattern.AskTimeoutException]] after the
+   * The Future will be completed with a [[pekko.pattern.AskTimeoutException]] 
after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` 
is that the
@@ -254,7 +254,7 @@ trait ExplicitAskSupport {
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an 
[[pekko.pattern.AskTimeoutException]] after the
+   * The Future will be completed with a [[pekko.pattern.AskTimeoutException]] 
after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` 
is that the
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala 
b/actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala
index d39c5862b8..f56faed968 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala
@@ -50,7 +50,7 @@ object Patterns {
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an 
[[pekko.pattern.AskTimeoutException]] after the
+   * The Future will be completed with a [[pekko.pattern.AskTimeoutException]] 
after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` 
is that the
@@ -84,7 +84,7 @@ object Patterns {
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The CompletionStage will be completed with an 
[[pekko.pattern.AskTimeoutException]] after the
+   * The CompletionStage will be completed with a 
[[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` 
is that the
@@ -158,7 +158,7 @@ object Patterns {
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an 
[[pekko.pattern.AskTimeoutException]] after the
+   * The Future will be completed with a [[pekko.pattern.AskTimeoutException]] 
after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` 
is that the
@@ -209,7 +209,7 @@ object Patterns {
    * holding the eventual reply message; this means that the target 
[[pekko.actor.ActorSelection]]
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an 
[[pekko.pattern.AskTimeoutException]] after the
+   * The Future will be completed with a [[pekko.pattern.AskTimeoutException]] 
after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` 
is that the
@@ -243,7 +243,7 @@ object Patterns {
    * holding the eventual reply message; this means that the target 
[[pekko.actor.ActorSelection]]
    * needs to send the result to the `sender` reference provided.
    *
-   * The CompletionStage will be completed with an 
[[pekko.pattern.AskTimeoutException]] after the
+   * The CompletionStage will be completed with a 
[[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` 
is that the
@@ -273,7 +273,7 @@ object Patterns {
    * holding the eventual reply message; this means that the target 
[[pekko.actor.ActorSelection]]
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an 
[[pekko.pattern.AskTimeoutException]] after the
+   * The Future will be completed with a [[pekko.pattern.AskTimeoutException]] 
after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` 
is that the
@@ -803,7 +803,7 @@ object Patterns {
    * Return an empty [[Optional]] instance for no delay.
    * A scheduler (eg context.system.scheduler) must be provided to delay each 
retry.
    * You could provide a function to generate the next delay duration after 
first attempt,
-   * this function should never return `null`, otherwise an 
[[java.lang.IllegalArgumentException]] will be through.
+   * this function should never return `null`, otherwise a 
[[java.lang.IllegalArgumentException]] will be through.
    *
    * If attempts are exhausted the returned future is simply the result of 
invoking attempt.
    * Note that the attempt function will be invoked on the given execution 
context for subsequent tries and
@@ -833,7 +833,7 @@ object Patterns {
    *
    * A scheduler (eg context.system.scheduler) must be provided to delay each 
retry.
    * You could provide a function to generate the next delay duration after 
first attempt,
-   * this function should never return `null`, otherwise an 
[[java.lang.IllegalArgumentException]] will be through.
+   * this function should never return `null`, otherwise a 
[[java.lang.IllegalArgumentException]] will be through.
    *
    * If attempts are exhausted the returned future is simply the result of 
invoking attempt.
    * Note that the attempt function will be invoked on the given execution 
context for subsequent tries and
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/RetrySupport.scala 
b/actor/src/main/scala/org/apache/pekko/pattern/RetrySupport.scala
index 0884b71f8e..ad94610fd5 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/RetrySupport.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/RetrySupport.scala
@@ -266,7 +266,7 @@ trait RetrySupport {
    *
    * A scheduler (eg context.system.scheduler) must be provided to delay each 
retry.
    * You could provide a function to generate the next delay duration after 
first attempt,
-   * this function should never return `null`, otherwise an 
[[java.lang.IllegalArgumentException]] will be through.
+   * this function should never return `null`, otherwise a 
[[java.lang.IllegalArgumentException]] will be through.
    *
    * If attempts are exhausted the returned future is simply the result of 
invoking attempt.
    * Note that the attempt function will be invoked on the given execution 
context for subsequent
@@ -301,7 +301,7 @@ trait RetrySupport {
    *
    * A scheduler (eg context.system.scheduler) must be provided to delay each 
retry.
    * You could provide a function to generate the next delay duration after 
first attempt,
-   * this function should never return `null`, otherwise an 
[[java.lang.IllegalArgumentException]] will be through.
+   * this function should never return `null`, otherwise a 
[[java.lang.IllegalArgumentException]] will be through.
    *
    * If attempts are exhausted the returned future is simply the result of 
invoking attempt.
    * Note that the attempt function will be invoked on the given execution 
context for subsequent
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/package.scala 
b/actor/src/main/scala/org/apache/pekko/pattern/package.scala
index 62f3d2b490..6023b973f0 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/package.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/package.scala
@@ -25,9 +25,9 @@ package org.apache.pekko
  * <li><b>ask:</b> create a temporary one-off actor for receiving a reply to a
  * message and complete a [[scala.concurrent.Future]] with it; returns said
  * Future.</li>
- * <li><b>pipeTo:</b> feed eventually computed value of a future to an 
[[org.apache.pekko.actor.ActorRef]] as
+ * <li><b>pipeTo:</b> feed eventually computed value of a future to a 
[[org.apache.pekko.actor.ActorRef]] as
  * a message.</li>
- * <li><b>pipeToSelection:</b> feed eventually computed value of a future to 
an [[org.apache.pekko.actor.ActorSelection]] as
+ * <li><b>pipeToSelection:</b> feed eventually computed value of a future to a 
[[org.apache.pekko.actor.ActorSelection]] as
  * a message.</li>
  * </ul>
  *
diff --git a/actor/src/main/scala/org/apache/pekko/routing/Router.scala 
b/actor/src/main/scala/org/apache/pekko/routing/Router.scala
index 0b479378e1..32516e45da 100644
--- a/actor/src/main/scala/org/apache/pekko/routing/Router.scala
+++ b/actor/src/main/scala/org/apache/pekko/routing/Router.scala
@@ -53,7 +53,7 @@ trait Routee {
 }
 
 /**
- * [[Routee]] that sends the messages to an [[pekko.actor.ActorRef]].
+ * [[Routee]] that sends the messages to a [[pekko.actor.ActorRef]].
  */
 final case class ActorRefRoutee(ref: ActorRef) extends Routee {
   override def send(message: Any, sender: ActorRef): Unit =
@@ -61,7 +61,7 @@ final case class ActorRefRoutee(ref: ActorRef) extends Routee 
{
 }
 
 /**
- * [[Routee]] that sends the messages to an [[pekko.actor.ActorSelection]].
+ * [[Routee]] that sends the messages to a [[pekko.actor.ActorSelection]].
  */
 final case class ActorSelectionRoutee(selection: ActorSelection) extends 
Routee {
   override def send(message: Any, sender: ActorRef): Unit =
diff --git 
a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterSharding.scala
 
b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterSharding.scala
index 6038efa5ad..c70d3e8b45 100644
--- 
a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterSharding.scala
+++ 
b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterSharding.scala
@@ -440,7 +440,7 @@ object EntityTypeKey {
 /**
  * A reference to an sharded Entity, which allows `ActorRef`-like usage.
  *
- * An [[EntityRef]] is NOT an [[pekko.actor.typed.ActorRef ActorRef]]–by 
design–in order to be explicit about the fact that the life-cycle
+ * An [[EntityRef]] is NOT a [[pekko.actor.typed.ActorRef ActorRef]]–by 
design–in order to be explicit about the fact that the life-cycle
  * of a sharded Entity is very different than a plain Actor. Most notably, 
this is shown by features of Entities
  * such as re-balancing (an active Entity to a different node) or passivation. 
Both of which are aimed to be completely
  * transparent to users of such Entity. In other words, if this were to be a 
plain ActorRef, it would be possible to
diff --git 
a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterSharding.scala
 
b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterSharding.scala
index c50aba205c..83c9b825b0 100644
--- 
a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterSharding.scala
+++ 
b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterSharding.scala
@@ -417,7 +417,7 @@ object EntityTypeKey {
 /**
  * A reference to an sharded Entity, which allows `ActorRef`-like usage.
  *
- * An [[EntityRef]] is NOT an [[pekko.actor.typed.ActorRef ActorRef]]–by 
design–in order to be explicit about the fact that the life-cycle
+ * An [[EntityRef]] is NOT a [[pekko.actor.typed.ActorRef ActorRef]]–by 
design–in order to be explicit about the fact that the life-cycle
  * of a sharded Entity is very different than a plain Actors. Most notably, 
this is shown by features of Entities
  * such as re-balancing (an active Entity to a different node) or passivation. 
Both of which are aimed to be completely
  * transparent to users of such Entity. In other words, if this were to be a 
plain ActorRef, it would be possible to
diff --git 
a/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxy.scala
 
b/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxy.scala
index 9c973798e6..d1d2607395 100644
--- 
a/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxy.scala
+++ 
b/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxy.scala
@@ -162,7 +162,7 @@ object ClusterSingletonProxy {
  *
  * The proxy works by keeping track of the oldest cluster member. When a new 
oldest member is identified, e.g. because
  * the older one left the cluster, or at startup, the proxy will try to 
identify the singleton on the oldest member by
- * periodically sending an [[pekko.actor.Identify]] message until the 
singleton responds with its
+ * periodically sending a [[pekko.actor.Identify]] message until the singleton 
responds with its
  * [[pekko.actor.ActorIdentity]].
  *
  * Note that this is a best effort implementation: messages can always be lost 
due to the distributed nature of the
diff --git 
a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/ClusterSingleton.scala
 
b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/ClusterSingleton.scala
index a4bd03fb27..33d620ea75 100644
--- 
a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/ClusterSingleton.scala
+++ 
b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/ClusterSingleton.scala
@@ -213,7 +213,7 @@ abstract class ClusterSingleton extends Extension {
    * Start if needed and provide a proxy to a named singleton
    *
    * If there already is a manager running for the given `singletonName` on 
this node, no additional manager is started.
-   * If there already is a proxy running for the given `singletonName` on this 
node, an [[pekko.actor.typed.ActorRef]] to that is returned.
+   * If there already is a proxy running for the given `singletonName` on this 
node, a [[pekko.actor.typed.ActorRef]] to that is returned.
    *
    * @return A proxy actor that can be used to communicate with the singleton 
in the cluster
    */
diff --git 
a/cluster/src/main/scala/org/apache/pekko/cluster/DowningProvider.scala 
b/cluster/src/main/scala/org/apache/pekko/cluster/DowningProvider.scala
index 2a96b34120..c33f50ee38 100644
--- a/cluster/src/main/scala/org/apache/pekko/cluster/DowningProvider.scala
+++ b/cluster/src/main/scala/org/apache/pekko/cluster/DowningProvider.scala
@@ -43,7 +43,7 @@ private[cluster] object DowningProvider {
 
 /**
  * API for plugins that will handle downing of cluster nodes. Concrete plugins 
must subclass and
- * have a public one argument constructor accepting an 
[[pekko.actor.ActorSystem]].
+ * have a public one argument constructor accepting a 
[[pekko.actor.ActorSystem]].
  *
  * A custom `DowningProvider` can be configured with 
`pekko.cluster.downing-provider-class`
  *
diff --git 
a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/javadsl/LeveldbReadJournal.scala
 
b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/javadsl/LeveldbReadJournal.scala
index 7393548ee2..5b2ed51561 100644
--- 
a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/javadsl/LeveldbReadJournal.scala
+++ 
b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/javadsl/LeveldbReadJournal.scala
@@ -120,7 +120,7 @@ class LeveldbReadJournal(scaladslReadJournal: 
pekko.persistence.query.journal.le
    * `eventsByTag` is used for retrieving events that were marked with
    * a given tag, e.g. all events of an Aggregate Root type.
    *
-   * To tag events you create an [[pekko.persistence.journal.EventAdapter]] 
that wraps the events
+   * To tag events you create a [[pekko.persistence.journal.EventAdapter]] 
that wraps the events
    * in a [[pekko.persistence.journal.Tagged]] with the given `tags`.
    *
    * You can retrieve a subset of all events by specifying `offset`, or use 
`0L` to retrieve all
diff --git 
a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala
 
b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala
index 75cad65a4f..e5aeb0032d 100644
--- 
a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala
+++ 
b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala
@@ -195,7 +195,7 @@ class LeveldbReadJournal(system: ExtendedActorSystem, 
config: Config)
    * `eventsByTag` is used for retrieving events that were marked with
    * a given tag, e.g. all events of an Aggregate Root type.
    *
-   * To tag events you create an [[pekko.persistence.journal.EventAdapter]] 
that wraps the events
+   * To tag events you create a [[pekko.persistence.journal.EventAdapter]] 
that wraps the events
    * in a [[pekko.persistence.journal.Tagged]] with the given `tags`.
    *
    * You can use `NoOffset` to retrieve all events with a given tag or 
retrieve a subset of all
diff --git 
a/persistence-tck/src/main/scala/org/apache/pekko/persistence/japi/journal/JavaJournalPerfSpec.scala
 
b/persistence-tck/src/main/scala/org/apache/pekko/persistence/japi/journal/JavaJournalPerfSpec.scala
index 1ea0b4865c..10982f64bf 100644
--- 
a/persistence-tck/src/main/scala/org/apache/pekko/persistence/japi/journal/JavaJournalPerfSpec.scala
+++ 
b/persistence-tck/src/main/scala/org/apache/pekko/persistence/japi/journal/JavaJournalPerfSpec.scala
@@ -28,7 +28,7 @@ import com.typesafe.config.Config
  *
  * Java / JUnit consumable equivalent of 
[[pekko.persistence.journal.JournalPerfSpec]] and 
[[pekko.persistence.journal.JournalSpec]].
  *
- * This spec measures execution times of the basic operations that an 
[[pekko.persistence.PersistentActor]] provides,
+ * This spec measures execution times of the basic operations that a 
[[pekko.persistence.PersistentActor]] provides,
  * using the provided Journal (plugin).
  *
  * It is *NOT* meant to be a comprehensive benchmark, but rather aims to help 
plugin developers to easily determine
diff --git 
a/persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalPerfSpec.scala
 
b/persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalPerfSpec.scala
index 67e468e20c..37eb2820d9 100644
--- 
a/persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalPerfSpec.scala
+++ 
b/persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalPerfSpec.scala
@@ -119,7 +119,7 @@ object JournalPerfSpec {
 }
 
 /**
- * This spec measures execution times of the basic operations that an 
[[pekko.persistence.PersistentActor]] provides,
+ * This spec measures execution times of the basic operations that a 
[[pekko.persistence.PersistentActor]] provides,
  * using the provided Journal (plugin).
  *
  * It is *NOT* meant to be a comprehensive benchmark, but rather aims to help 
plugin developers to easily determine
diff --git 
a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ExternalInteractions.scala
 
b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ExternalInteractions.scala
index f56411ad5e..5477ca5b67 100644
--- 
a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ExternalInteractions.scala
+++ 
b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ExternalInteractions.scala
@@ -197,7 +197,7 @@ private[pekko] trait SnapshotInteractions[C, E, S] {
   def setup: BehaviorSetup[C, E, S]
 
   /**
-   * Instructs the snapshot store to load the specified snapshot and send it 
via an [[SnapshotOffer]]
+   * Instructs the snapshot store to load the specified snapshot and send it 
via a [[SnapshotOffer]]
    * to the running [[PersistentActor]].
    */
   protected def loadSnapshot(criteria: SnapshotSelectionCriteria, 
toSequenceNr: Long): Unit = {
diff --git 
a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandlerWithReply.scala
 
b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandlerWithReply.scala
index 7065c5a4f6..8575022fa3 100644
--- 
a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandlerWithReply.scala
+++ 
b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandlerWithReply.scala
@@ -339,7 +339,7 @@ final class CommandHandlerWithReplyBuilderByState[Command, 
Event, S <: State, St
    * Use this to declare a command handler that will match any command. This 
is particular useful when encoding
    * a finite state machine in which the final state is not supposed to handle 
any new command.
    *
-   * Use this when you just need to return an [[ReplyEffect]] without using 
any data from the state.
+   * Use this when you just need to return a [[ReplyEffect]] without using any 
data from the state.
    *
    * Note: command handlers are selected in the order they are added. Once a 
matching is found, it's selected for handling the command
    * and no further lookup is done. Therefore you must make sure that their 
matching conditions don't overlap,
@@ -365,7 +365,7 @@ final class CommandHandlerWithReplyBuilderByState[Command, 
Event, S <: State, St
    * Use this to declare a command handler that will match any command. This 
is particular useful when encoding
    * a finite state machine in which the final state is not supposed to handle 
any new command.
    *
-   * Use this when you just need to return an [[ReplyEffect]] without using 
any data from the command or from the state.
+   * Use this when you just need to return a [[ReplyEffect]] without using any 
data from the command or from the state.
    *
    * Note: command handlers are selected in the order they are added. Once a 
matching is found, it's selected for handling the command
    * and no further lookup is done. Therefore you must make sure that their 
matching conditions don't overlap,
diff --git 
a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/Effect.scala
 
b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/Effect.scala
index fc6ed9e2b2..5d54062a3a 100644
--- 
a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/Effect.scala
+++ 
b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/Effect.scala
@@ -145,7 +145,7 @@ import pekko.persistence.typed.internal.SideEffect
    * @tparam NewState The type of the state after the event is persisted, when 
not specified will be the same as `State`
    *                  but if a known subtype of `State` is expected that can 
be specified instead (preferably by
    *                  explicitly typing the lambda parameter like so: 
`thenRun((SubState state) -> { ... })`).
-   *                  If the state is not of the expected type an 
[[java.lang.ClassCastException]] is thrown.
+   *                  If the state is not of the expected type a 
[[java.lang.ClassCastException]] is thrown.
    */
   final def thenRun[NewState <: State](callback: 
function.Procedure[NewState]): EffectBuilder[Event, State] =
     CompositeEffect(this, SideEffect[State](s => 
callback.apply(s.asInstanceOf[NewState])))
diff --git 
a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandlerWithReply.scala
 
b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandlerWithReply.scala
index ce53f9ef18..aa0382c0ad 100644
--- 
a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandlerWithReply.scala
+++ 
b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandlerWithReply.scala
@@ -340,7 +340,7 @@ final class CommandHandlerWithReplyBuilderByState[Command, 
S <: State, State] @I
    * Use this to declare a command handler that will match any command. This 
is particular useful when encoding
    * a finite state machine in which the final state is not supposed to handle 
any new command.
    *
-   * Use this when you just need to return an [[ReplyEffect]] without using 
any data from the state.
+   * Use this when you just need to return a [[ReplyEffect]] without using any 
data from the state.
    *
    * Note: command handlers are selected in the order they are added. Once a 
matching is found, it's selected for handling the command
    * and no further lookup is done. Therefore you must make sure that their 
matching conditions don't overlap,
@@ -365,7 +365,7 @@ final class CommandHandlerWithReplyBuilderByState[Command, 
S <: State, State] @I
    * Use this to declare a command handler that will match any command. This 
is particular useful when encoding
    * a finite state machine in which the final state is not supposed to handle 
any new command.
    *
-   * Use this when you just need to return an [[ReplyEffect]] without using 
any data from the command or from the state.
+   * Use this when you just need to return a [[ReplyEffect]] without using any 
data from the command or from the state.
    *
    * Note: command handlers are selected in the order they are added. Once a 
matching is found, it's selected for handling the command
    * and no further lookup is done. Therefore you must make sure that their 
matching conditions don't overlap,
diff --git 
a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/Effect.scala
 
b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/Effect.scala
index 3cccde5bf6..95369627ac 100644
--- 
a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/Effect.scala
+++ 
b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/Effect.scala
@@ -149,7 +149,7 @@ import pekko.persistence.typed.state.internal.SideEffect
    * @tparam NewState The type of the state after the state is persisted, when 
not specified will be the same as `State`
    *                  but if a known subtype of `State` is expected that can 
be specified instead (preferably by
    *                  explicitly typing the lambda parameter like so: 
`thenRun((SubState state) -> { ... })`).
-   *                  If the state is not of the expected type an 
[[java.lang.ClassCastException]] is thrown.
+   *                  If the state is not of the expected type a 
[[java.lang.ClassCastException]] is thrown.
    */
   final def thenRun[NewState <: State](callback: 
function.Procedure[NewState]): EffectBuilder[State] =
     CompositeEffect(this, SideEffect[State](s => 
callback.apply(s.asInstanceOf[NewState])))
diff --git 
a/persistence/src/main/scala/org/apache/pekko/persistence/Persistence.scala 
b/persistence/src/main/scala/org/apache/pekko/persistence/Persistence.scala
index 4e4b608d07..6ea1d98ab1 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/Persistence.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/Persistence.scala
@@ -296,7 +296,7 @@ class Persistence(val system: ExtendedActorSystem) extends 
Extension {
     
verifyPluginConfigExists(pluginConfig.withFallback(system.settings.config), 
configPath, "Snapshot store")
 
   /**
-   * Returns an [[pekko.persistence.journal.EventAdapters]] object which 
serves as a per-journal collection of bound event adapters.
+   * Returns a [[pekko.persistence.journal.EventAdapters]] object which serves 
as a per-journal collection of bound event adapters.
    * If no adapters are registered for a given journal the EventAdapters 
object will simply return the identity
    * adapter for each class, otherwise the most specific adapter matching a 
given class will be returned.
    */
@@ -305,7 +305,7 @@ class Persistence(val system: ExtendedActorSystem) extends 
Extension {
   }
 
   /**
-   * Returns an [[pekko.persistence.journal.EventAdapters]] object which 
serves as a per-journal collection of bound event adapters.
+   * Returns a [[pekko.persistence.journal.EventAdapters]] object which serves 
as a per-journal collection of bound event adapters.
    * If no adapters are registered for a given journal the EventAdapters 
object will simply return the identity
    * adapter for each class, otherwise the most specific adapter matching a 
given class will be returned.
    *
diff --git 
a/persistence/src/main/scala/org/apache/pekko/persistence/Persistent.scala 
b/persistence/src/main/scala/org/apache/pekko/persistence/Persistent.scala
index 76fbfd3a1a..cba3ad166e 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/Persistent.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/Persistent.scala
@@ -26,7 +26,7 @@ import pekko.util.HashCode
  *
  * Marks messages which can be resequenced by the 
[[pekko.persistence.journal.AsyncWriteJournal]].
  *
- * In essence it is either an [[NonPersistentRepr]] or [[AtomicWrite]].
+ * In essence it is either a [[NonPersistentRepr]] or [[AtomicWrite]].
  */
 private[persistence] sealed trait PersistentEnvelope {
   def payload: Any
diff --git 
a/persistence/src/main/scala/org/apache/pekko/persistence/Snapshotter.scala 
b/persistence/src/main/scala/org/apache/pekko/persistence/Snapshotter.scala
index a52713a25e..ab6177729c 100644
--- a/persistence/src/main/scala/org/apache/pekko/persistence/Snapshotter.scala
+++ b/persistence/src/main/scala/org/apache/pekko/persistence/Snapshotter.scala
@@ -36,7 +36,7 @@ trait Snapshotter extends Actor {
   def snapshotSequenceNr: Long
 
   /**
-   * Instructs the snapshot store to load the specified snapshot and send it 
via an [[pekko.persistence.SnapshotOffer SnapshotOffer]]
+   * Instructs the snapshot store to load the specified snapshot and send it 
via a [[pekko.persistence.SnapshotOffer SnapshotOffer]]
    * to the running [[pekko.persistence.PersistentActor PersistentActor]].
    */
   def loadSnapshot(persistenceId: String, criteria: SnapshotSelectionCriteria, 
toSequenceNr: Long): Unit =
@@ -46,7 +46,7 @@ trait Snapshotter extends Actor {
    * Saves a `snapshot` of this snapshotter's state.
    *
    * The [[pekko.persistence.PersistentActor PersistentActor]] will be 
notified about the success or failure of this
-   * via an [[pekko.persistence.SaveSnapshotSuccess SaveSnapshotSuccess]] or 
[[pekko.persistence.SaveSnapshotFailure SaveSnapshotFailure]] message.
+   * via a [[pekko.persistence.SaveSnapshotSuccess SaveSnapshotSuccess]] or 
[[pekko.persistence.SaveSnapshotFailure SaveSnapshotFailure]] message.
    */
   def saveSnapshot(snapshot: Any): Unit = {
     snapshotStore ! SaveSnapshot(SnapshotMetadata(snapshotterId, 
snapshotSequenceNr), snapshot)
@@ -56,7 +56,7 @@ trait Snapshotter extends Actor {
    * Deletes the snapshot identified by `sequenceNr`.
    *
    * The [[pekko.persistence.PersistentActor PersistentActor]] will be 
notified about the status of the deletion
-   * via an [[pekko.persistence.DeleteSnapshotSuccess DeleteSnapshotSuccess]] 
or [[pekko.persistence.DeleteSnapshotFailure DeleteSnapshotFailure]] message.
+   * via a [[pekko.persistence.DeleteSnapshotSuccess DeleteSnapshotSuccess]] 
or [[pekko.persistence.DeleteSnapshotFailure DeleteSnapshotFailure]] message.
    */
   def deleteSnapshot(sequenceNr: Long): Unit = {
     snapshotStore ! DeleteSnapshot(SnapshotMetadata(snapshotterId, sequenceNr))
@@ -66,7 +66,7 @@ trait Snapshotter extends Actor {
    * Deletes all snapshots matching `criteria`.
    *
    * The [[pekko.persistence.PersistentActor PersistentActor]] will be 
notified about the status of the deletion
-   * via an [[pekko.persistence.DeleteSnapshotsSuccess 
DeleteSnapshotsSuccess]] or [[pekko.persistence.DeleteSnapshotsFailure 
DeleteSnapshotsFailure]] message.
+   * via a [[pekko.persistence.DeleteSnapshotsSuccess DeleteSnapshotsSuccess]] 
or [[pekko.persistence.DeleteSnapshotsFailure DeleteSnapshotsFailure]] message.
    */
   def deleteSnapshots(criteria: SnapshotSelectionCriteria): Unit = {
     snapshotStore ! DeleteSnapshots(snapshotterId, criteria)
diff --git 
a/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSM.scala
 
b/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSM.scala
index 69343ac8c8..155ae429e4 100644
--- 
a/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSM.scala
+++ 
b/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSM.scala
@@ -266,7 +266,7 @@ object PersistentFSM {
   final case class Transition[S](fsmRef: ActorRef, from: S, to: S, timeout: 
Option[FiniteDuration])
 
   /**
-   * Send this to an [[pekko.actor.FSM]] to request first the 
[[PersistentFSM.CurrentState]]
+   * Send this to a [[pekko.actor.FSM]] to request first the 
[[PersistentFSM.CurrentState]]
    * and then a series of [[PersistentFSM.Transition]] updates. Cancel the 
subscription
    * using [[PersistentFSM.UnsubscribeTransitionCallBack]].
    */
diff --git 
a/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSMBase.scala
 
b/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSMBase.scala
index 0b4f894437..448f00ef52 100644
--- 
a/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSMBase.scala
+++ 
b/persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSMBase.scala
@@ -857,7 +857,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends 
PersistentFSMBase[S, D
     onTermination(stopBuilder.build().asInstanceOf[PartialFunction[StopEvent, 
Unit]])
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches on an event and data type and a predicate.
    *
@@ -875,7 +875,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends 
PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().event(eventType, dataType, 
predicate, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches on an event and data type.
    *
@@ -891,7 +891,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends 
PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().event(eventType, dataType, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches if the event type and predicate matches.
    *
@@ -907,7 +907,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends 
PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().event(eventType, predicate, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches if the event type matches.
    *
@@ -919,7 +919,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends 
PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().event(eventType, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches if the predicate matches.
    *
@@ -933,7 +933,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends 
PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().event(predicate, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches on the data type and if any of the event 
types
    * in the list match or any of the event instances in the list compares 
equal.
@@ -950,7 +950,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends 
PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().event(eventMatches, dataType, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches if any of the event types in the list match 
or any
    * of the event instances in the list compares equal.
@@ -964,7 +964,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends 
PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().event(eventMatches, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches on the data type and if the event compares 
equal.
    *
@@ -980,7 +980,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends 
PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().eventEquals(event, dataType, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches if the event compares equal.
    *
@@ -992,7 +992,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends 
PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().eventEquals(event, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
+   * Create a [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case 
statement set.
    *
    * A case statement that matches on any type of event.
    *
@@ -1003,7 +1003,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends 
PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().anyEvent(apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMTransitionHandlerBuilder]] with the first 
case statement set.
+   * Create a [[pekko.japi.pf.FSMTransitionHandlerBuilder]] with the first 
case statement set.
    *
    * A case statement that matches on a from state and a to state.
    *
@@ -1016,7 +1016,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends 
PersistentFSMBase[S, D
     new FSMTransitionHandlerBuilder[S]().state(fromState, toState, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMTransitionHandlerBuilder]] with the first 
case statement set.
+   * Create a [[pekko.japi.pf.FSMTransitionHandlerBuilder]] with the first 
case statement set.
    *
    * A case statement that matches on a from state and a to state.
    *
@@ -1029,9 +1029,9 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends 
PersistentFSMBase[S, D
     new FSMTransitionHandlerBuilder[S]().state(fromState, toState, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStopBuilder]] with the first case statement 
set.
+   * Create a [[pekko.japi.pf.FSMStopBuilder]] with the first case statement 
set.
    *
-   * A case statement that matches on an [[PersistentFSM.Reason]].
+   * A case statement that matches on a [[PersistentFSM.Reason]].
    *
    * @param reason  the reason for the termination
    * @param apply  an action to apply to the event and state data if there is 
a match
@@ -1041,7 +1041,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends 
PersistentFSMBase[S, D
     new FSMStopBuilder[S, D]().stop(reason, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStopBuilder]] with the first case statement 
set.
+   * Create a [[pekko.japi.pf.FSMStopBuilder]] with the first case statement 
set.
    *
    * A case statement that matches on a reason type.
    *
@@ -1053,7 +1053,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends 
PersistentFSMBase[S, D
     new FSMStopBuilder[S, D]().stop(reasonType, apply)
 
   /**
-   * Create an [[pekko.japi.pf.FSMStopBuilder]] with the first case statement 
set.
+   * Create a [[pekko.japi.pf.FSMStopBuilder]] with the first case statement 
set.
    *
    * A case statement that matches on a reason type and a predicate.
    *
diff --git 
a/persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournal.scala
 
b/persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournal.scala
index fbc36b3fff..6200342e18 100644
--- 
a/persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournal.scala
+++ 
b/persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournal.scala
@@ -113,7 +113,7 @@ private[persistence] object LeveldbJournal {
    * Used by query-side. The journal will send [[TaggedEventAppended]] 
messages to
    * the subscriber when `asyncWriteMessages` has been called.
    * Events are tagged by wrapping in [[pekko.persistence.journal.Tagged]]
-   * via an [[pekko.persistence.journal.EventAdapter]].
+   * via a [[pekko.persistence.journal.EventAdapter]].
    */
   final case class SubscribeTag(tag: String) extends SubscriptionCommand
   final case class TaggedEventAppended(tag: String) extends 
DeadLetterSuppression
diff --git 
a/remote/src/main/scala/org/apache/pekko/remote/AddressUidExtension.scala 
b/remote/src/main/scala/org/apache/pekko/remote/AddressUidExtension.scala
index db4656a3f1..245c6ff6b7 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/AddressUidExtension.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/AddressUidExtension.scala
@@ -25,7 +25,7 @@ import pekko.actor.ExtensionIdProvider
  * Extension that holds a uid that is assigned as a random `Long` or `Int` 
depending
  * on which version of remoting that is used.
  *
- * The uid is intended to be used together with an [[pekko.actor.Address]]
+ * The uid is intended to be used together with a [[pekko.actor.Address]]
  * to be able to distinguish restarted actor system using the same host
  * and port.
  */
diff --git 
a/remote/src/main/scala/org/apache/pekko/remote/FailureDetectorRegistry.scala 
b/remote/src/main/scala/org/apache/pekko/remote/FailureDetectorRegistry.scala
index d06aa856ef..25b2dc15d4 100644
--- 
a/remote/src/main/scala/org/apache/pekko/remote/FailureDetectorRegistry.scala
+++ 
b/remote/src/main/scala/org/apache/pekko/remote/FailureDetectorRegistry.scala
@@ -67,7 +67,7 @@ private[pekko] object FailureDetectorLoader {
 
   /**
    * Loads and instantiates a given [[FailureDetector]] implementation. The 
class to be loaded must have a constructor
-   * that accepts a [[com.typesafe.config.Config]] and an 
[[pekko.event.EventStream]] parameter. Will throw ConfigurationException
+   * that accepts a [[com.typesafe.config.Config]] and a 
[[pekko.event.EventStream]] parameter. Will throw ConfigurationException
    * if the implementation cannot be loaded.
    *
    * @param fqcn Fully qualified class name of the implementation to be loaded.
@@ -91,7 +91,7 @@ private[pekko] object FailureDetectorLoader {
 
   /**
    * Loads and instantiates a given [[FailureDetector]] implementation. The 
class to be loaded must have a constructor
-   * that accepts a [[com.typesafe.config.Config]] and an 
[[pekko.event.EventStream]] parameter. Will throw ConfigurationException
+   * that accepts a [[com.typesafe.config.Config]] and a 
[[pekko.event.EventStream]] parameter. Will throw ConfigurationException
    * if the implementation cannot be loaded. Use 
[[FailureDetectorLoader#load]] if no implicit [[pekko.actor.ActorContext]] is
    * available.
    *
diff --git 
a/remote/src/main/scala/org/apache/pekko/remote/serialization/ProtobufSerializer.scala
 
b/remote/src/main/scala/org/apache/pekko/remote/serialization/ProtobufSerializer.scala
index 142148d7ff..1b67aac092 100644
--- 
a/remote/src/main/scala/org/apache/pekko/remote/serialization/ProtobufSerializer.scala
+++ 
b/remote/src/main/scala/org/apache/pekko/remote/serialization/ProtobufSerializer.scala
@@ -31,7 +31,7 @@ object ProtobufSerializer {
   private val ARRAY_OF_BYTE_ARRAY = Array[Class[_]](classOf[Array[Byte]])
 
   /**
-   * Helper to serialize an [[pekko.actor.ActorRef]] to Pekko's
+   * Helper to serialize a [[pekko.actor.ActorRef]] to Pekko's
    * protobuf representation.
    */
   def serializeActorRef(ref: ActorRef): ActorRefData = {
@@ -39,7 +39,7 @@ object ProtobufSerializer {
   }
 
   /**
-   * Helper to materialize (lookup) an [[pekko.actor.ActorRef]]
+   * Helper to materialize (lookup) a [[pekko.actor.ActorRef]]
    * from Pekko's protobuf representation in the supplied
    * [[pekko.actor.ActorSystem]].
    */
diff --git 
a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala 
b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala
index a4610f5fee..ecc4f0b5b7 100644
--- 
a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala
+++ 
b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala
@@ -72,7 +72,7 @@ private[remote] trait PekkoPduCodec {
   import PekkoPduCodec._
 
   /**
-   * Returns an [[pekko.remote.transport.PekkoPduCodec.PekkoPdu]] instance 
that represents the PDU contained in the raw
+   * Returns a [[pekko.remote.transport.PekkoPduCodec.PekkoPdu]] instance that 
represents the PDU contained in the raw
    * ByteString.
    *
    * @param raw
@@ -83,7 +83,7 @@ private[remote] trait PekkoPduCodec {
   def decodePdu(raw: ByteString): PekkoPdu
 
   /**
-   * Takes an [[pekko.remote.transport.PekkoPduCodec.PekkoPdu]] representation 
of a Pekko PDU and returns its encoded
+   * Takes a [[pekko.remote.transport.PekkoPduCodec.PekkoPdu]] representation 
of a Pekko PDU and returns its encoded
    * form as a [[pekko.util.ByteString]].
    *
    * For the same effect the constructXXX methods might be called directly, 
taking method parameters instead of the
diff --git 
a/remote/src/main/scala/org/apache/pekko/remote/transport/Transport.scala 
b/remote/src/main/scala/org/apache/pekko/remote/transport/Transport.scala
index 6244ed66d4..cf835b48a7 100644
--- a/remote/src/main/scala/org/apache/pekko/remote/transport/Transport.scala
+++ b/remote/src/main/scala/org/apache/pekko/remote/transport/Transport.scala
@@ -76,7 +76,7 @@ object Transport {
  * underlying transmission mechanism and setting up logical links between 
transport entities.
  *
  * Transport implementations that are loaded dynamically by the remoting must 
have a constructor that accepts a
- * [[com.typesafe.config.Config]] and an [[pekko.actor.ExtendedActorSystem]] 
as parameters.
+ * [[com.typesafe.config.Config]] and a [[pekko.actor.ExtendedActorSystem]] as 
parameters.
  */
 @deprecated("Classic remoting is deprecated, use Artery", "Akka 2.6.0")
 trait Transport {
@@ -112,7 +112,7 @@ trait Transport {
   /**
    * Asynchronously attempts to setup the transport layer to listen and accept 
incoming associations. The result of the
    * attempt is wrapped by a Future returned by this method. The pair 
contained in the future contains a Promise for an
-   * ActorRef. By completing this Promise with an 
[[pekko.remote.transport.Transport.AssociationEventListener]], that
+   * ActorRef. By completing this Promise with a 
[[pekko.remote.transport.Transport.AssociationEventListener]], that
    * listener becomes responsible for handling incoming associations. Until 
the Promise is not completed, no associations
    * are processed.
    *
@@ -130,14 +130,14 @@ trait Transport {
    * real transport-layer connection (TCP), more lightweight connections 
provided over datagram protocols (UDP with
    * additional services), substreams of multiplexed connections (SCTP) or 
physical links (serial port).
    *
-   * This call returns a future of an 
[[pekko.remote.transport.AssociationHandle]]. A failed future indicates that
+   * This call returns a future of a 
[[pekko.remote.transport.AssociationHandle]]. A failed future indicates that
    * the association attempt was unsuccessful. If the exception is 
[[pekko.remote.transport.Transport.InvalidAssociationException]]
    * then the association request was invalid, and it is impossible to recover.
    *
    * @param remoteAddress
    *   The address of the remote transport entity.
    * @return
-   *   A status instance representing failure or a success containing an 
[[pekko.remote.transport.AssociationHandle]]
+   *   A status instance representing failure or a success containing a 
[[pekko.remote.transport.AssociationHandle]]
    */
   def associate(remoteAddress: Address): Future[AssociationHandle]
 
@@ -166,7 +166,7 @@ trait Transport {
 object AssociationHandle {
 
   /**
-   * Trait for events that the registered listener for an 
[[pekko.remote.transport.AssociationHandle]] might receive.
+   * Trait for events that the registered listener for a 
[[pekko.remote.transport.AssociationHandle]] might receive.
    */
   sealed trait HandleEvent extends NoSerializationVerificationNeeded
 
@@ -199,7 +199,7 @@ object AssociationHandle {
   case object Quarantined extends DisassociateInfo
 
   /**
-   * An interface that needs to be implemented by the user of an 
[[pekko.remote.transport.AssociationHandle]]
+   * An interface that needs to be implemented by the user of a 
[[pekko.remote.transport.AssociationHandle]]
    * to listen to association events.
    */
   trait HandleEventListener {
@@ -249,7 +249,7 @@ trait AssociationHandle {
   def remoteAddress: Address
 
   /**
-   * The Promise returned by this call must be completed with an 
[[pekko.remote.transport.AssociationHandle.HandleEventListener]]
+   * The Promise returned by this call must be completed with a 
[[pekko.remote.transport.AssociationHandle.HandleEventListener]]
    * to register a listener responsible for handling incoming payload. Until 
the listener is not registered the
    * transport SHOULD buffer incoming messages.
    *
diff --git 
a/stream-typed/src/main/scala/org/apache/pekko/stream/typed/javadsl/ActorFlow.scala
 
b/stream-typed/src/main/scala/org/apache/pekko/stream/typed/javadsl/ActorFlow.scala
index 343d016296..7548319108 100644
--- 
a/stream-typed/src/main/scala/org/apache/pekko/stream/typed/javadsl/ActorFlow.scala
+++ 
b/stream-typed/src/main/scala/org/apache/pekko/stream/typed/javadsl/ActorFlow.scala
@@ -47,8 +47,8 @@ object ActorFlow {
    * still be in the mailbox, so defaulting to sending the second one a bit 
earlier than when first ask has replied maintains
    * a slightly healthier throughput.
    *
-   * The operator fails with an 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated,
-   * or with an [[java.util.concurrent.TimeoutException]] in case the ask 
exceeds the timeout passed in.
+   * The operator fails with a 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated,
+   * or with a [[java.util.concurrent.TimeoutException]] in case the ask 
exceeds the timeout passed in.
    *
    * Adheres to the [[pekko.stream.ActorAttributes.SupervisionStrategy]] 
attribute.
    *
@@ -103,8 +103,8 @@ object ActorFlow {
    *
    * otherwise `Nothing` will be assumed, which is most likely not what you 
want.
    *
-   * The operator fails with an 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated,
-   * or with an [[java.util.concurrent.TimeoutException]] in case the ask 
exceeds the timeout passed in.
+   * The operator fails with a 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated,
+   * or with a [[java.util.concurrent.TimeoutException]] in case the ask 
exceeds the timeout passed in.
    *
    * Adheres to the [[pekko.stream.ActorAttributes.SupervisionStrategy]] 
attribute.
    *
diff --git 
a/stream-typed/src/main/scala/org/apache/pekko/stream/typed/javadsl/ActorSource.scala
 
b/stream-typed/src/main/scala/org/apache/pekko/stream/typed/javadsl/ActorSource.scala
index e7da04a0d0..6b0df3ae26 100644
--- 
a/stream-typed/src/main/scala/org/apache/pekko/stream/typed/javadsl/ActorSource.scala
+++ 
b/stream-typed/src/main/scala/org/apache/pekko/stream/typed/javadsl/ActorSource.scala
@@ -26,7 +26,7 @@ import pekko.stream.javadsl._
 object ActorSource {
 
   /**
-   * Creates a `Source` that is materialized as an 
[[pekko.actor.typed.ActorRef]].
+   * Creates a `Source` that is materialized as a 
[[pekko.actor.typed.ActorRef]].
    * Messages sent to this actor will be emitted to the stream if there is 
demand from downstream,
    * otherwise they will be buffered until request for demand is received.
    *
@@ -77,7 +77,7 @@ object ActorSource {
   }
 
   /**
-   * Creates a `Source` that is materialized as an [[pekko.actor.ActorRef]].
+   * Creates a `Source` that is materialized as a [[pekko.actor.ActorRef]].
    * Messages sent to this actor will be emitted to the stream if there is 
demand from downstream,
    * and a new message will only be accepted after the previous messages has 
been consumed and acknowledged back.
    * The stream will complete with failure if a message is sent before the 
acknowledgement has been replied back.
diff --git 
a/stream-typed/src/main/scala/org/apache/pekko/stream/typed/scaladsl/ActorFlow.scala
 
b/stream-typed/src/main/scala/org/apache/pekko/stream/typed/scaladsl/ActorFlow.scala
index 2bb082065c..4463761dc4 100644
--- 
a/stream-typed/src/main/scala/org/apache/pekko/stream/typed/scaladsl/ActorFlow.scala
+++ 
b/stream-typed/src/main/scala/org/apache/pekko/stream/typed/scaladsl/ActorFlow.scala
@@ -81,8 +81,8 @@ object ActorFlow {
    * still be in the mailbox, so defaulting to sending the second one a bit 
earlier than when first ask has replied maintains
    * a slightly healthier throughput.
    *
-   * The operator fails with an 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated,
-   * or with an [[java.util.concurrent.TimeoutException]] in case the ask 
exceeds the timeout passed in.
+   * The operator fails with a 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated,
+   * or with a [[java.util.concurrent.TimeoutException]] in case the ask 
exceeds the timeout passed in.
    *
    * Adheres to the [[ActorAttributes.SupervisionStrategy]] attribute.
    *
@@ -120,8 +120,8 @@ object ActorFlow {
    *
    * otherwise `Nothing` will be assumed, which is most likely not what you 
want.
    *
-   * The operator fails with an 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated,
-   * or with an [[java.util.concurrent.TimeoutException]] in case the ask 
exceeds the timeout passed in.
+   * The operator fails with a 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated,
+   * or with a [[java.util.concurrent.TimeoutException]] in case the ask 
exceeds the timeout passed in.
    *
    * Adheres to the [[ActorAttributes.SupervisionStrategy]] attribute.
    *
diff --git 
a/stream-typed/src/main/scala/org/apache/pekko/stream/typed/scaladsl/ActorSource.scala
 
b/stream-typed/src/main/scala/org/apache/pekko/stream/typed/scaladsl/ActorSource.scala
index 388c0f396a..7e68037117 100644
--- 
a/stream-typed/src/main/scala/org/apache/pekko/stream/typed/scaladsl/ActorSource.scala
+++ 
b/stream-typed/src/main/scala/org/apache/pekko/stream/typed/scaladsl/ActorSource.scala
@@ -26,7 +26,7 @@ object ActorSource {
   import pekko.actor.typed.scaladsl.adapter._
 
   /**
-   * Creates a `Source` that is materialized as an 
[[pekko.actor.typed.ActorRef]].
+   * Creates a `Source` that is materialized as a 
[[pekko.actor.typed.ActorRef]].
    * Messages sent to this actor will be emitted to the stream if there is 
demand from downstream,
    * otherwise they will be buffered until request for demand is received.
    *
@@ -70,7 +70,7 @@ object ActorSource {
       .mapMaterializedValue(actorRefAdapter)
 
   /**
-   * Creates a `Source` that is materialized as an 
[[pekko.actor.typed.ActorRef]].
+   * Creates a `Source` that is materialized as a 
[[pekko.actor.typed.ActorRef]].
    * Messages sent to this actor will be emitted to the stream if there is 
demand from downstream,
    * and a new message will only be accepted after the previous messages has 
been consumed and acknowledged back.
    * The stream will complete with failure if a message is sent before the 
acknowledgement has been replied back.
diff --git 
a/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala 
b/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala
index cba9e5338c..3e234c5069 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala
@@ -37,7 +37,7 @@ private[pekko] object ActorMaterializer {
   /**
    * Scala API: Creates an ActorMaterializer that can materialize stream 
blueprints as running streams.
    *
-   * The required [[pekko.actor.ActorRefFactory]] (which can be either an 
[[pekko.actor.ActorSystem]] or an [[pekko.actor.ActorContext]])
+   * The required [[pekko.actor.ActorRefFactory]] (which can be either a 
[[pekko.actor.ActorSystem]] or a [[pekko.actor.ActorContext]])
    * will be used to create one actor that in turn creates actors for the 
transformation steps.
    *
    * The materializer's [[pekko.stream.ActorMaterializerSettings]] will be 
obtained from the
@@ -62,7 +62,7 @@ private[pekko] object ActorMaterializer {
    * Scala API: Creates an ActorMaterializer that can materialize stream 
blueprints as running streams.
    *
    * The required [[pekko.actor.ActorRefFactory]]
-   * (which can be either an [[pekko.actor.ActorSystem]] or an 
[[pekko.actor.ActorContext]])
+   * (which can be either a [[pekko.actor.ActorSystem]] or a 
[[pekko.actor.ActorContext]])
    * will be used to create these actors, therefore it is *forbidden* to pass 
this object
    * to another actor if the factory is an ActorContext.
    *
@@ -96,7 +96,7 @@ private[pekko] object ActorMaterializer {
    * Scala API: Creates an ActorMaterializer that can materialize stream 
blueprints as running streams.
    *
    * The required [[pekko.actor.ActorRefFactory]]
-   * (which can be either an [[pekko.actor.ActorSystem]] or an 
[[pekko.actor.ActorContext]])
+   * (which can be either a [[pekko.actor.ActorSystem]] or a 
[[pekko.actor.ActorContext]])
    * will be used to create these actors, therefore it is *forbidden* to pass 
this object
    * to another actor if the factory is an ActorContext.
    *
@@ -114,7 +114,7 @@ private[pekko] object ActorMaterializer {
    * Java API: Creates an ActorMaterializer that can materialize stream 
blueprints as running streams.
    *
    * The required [[pekko.actor.ActorRefFactory]]
-   * (which can be either an [[pekko.actor.ActorSystem]] or an 
[[pekko.actor.ActorContext]])
+   * (which can be either a [[pekko.actor.ActorSystem]] or a 
[[pekko.actor.ActorContext]])
    * will be used to create these actors, therefore it is *forbidden* to pass 
this object
    * to another actor if the factory is an ActorContext.
    *
@@ -176,7 +176,7 @@ final class AbruptStageTerminationException(logic: 
GraphStageLogic)
 private[pekko] object ActorMaterializerSettings {
 
   /**
-   * Create [[ActorMaterializerSettings]] from the settings of an 
[[pekko.actor.ActorSystem]] (Scala).
+   * Create [[ActorMaterializerSettings]] from the settings of a 
[[pekko.actor.ActorSystem]] (Scala).
    *
    * Prefer using either config for defaults or attributes for per-stream 
config.
    * See migration guide for details 
https://doc.akka.io/docs/akka/2.6/project/migration-guide-2.5.x-2.6.x.html";
diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Flow.scala 
b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Flow.scala
index 010ce0b34d..317f402af6 100755
--- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Flow.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Flow.scala
@@ -884,7 +884,7 @@ final class Flow[In, Out, Mat](delegate: scaladsl.Flow[In, 
Out, Mat]) extends Gr
    * as they are illegal as stream elements - according to the Reactive 
Streams specification.
    *
    * This operator doesn't handle upstream's completion signal since the state 
kept in the closure can be lost.
-   * Use [[FlowOps.statefulMap]], or return an 
[[StatefulMapConcatAccumulator]] instead.
+   * Use [[FlowOps.statefulMap]], or return a [[StatefulMapConcatAccumulator]] 
instead.
    *
    * Adheres to the [[ActorAttributes.SupervisionStrategy]] attribute.
    *
@@ -1051,7 +1051,7 @@ final class Flow[In, Out, Mat](delegate: 
scaladsl.Flow[In, Out, Mat]) extends Gr
    * still be in the mailbox, so defaulting to sending the second one a bit 
earlier than when first ask has replied maintains
    * a slightly healthier throughput.
    *
-   * The operator fails with an 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
+   * The operator fails with a 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
    *
    * Adheres to the [[ActorAttributes.SupervisionStrategy]] attribute.
    *
@@ -1081,7 +1081,7 @@ final class Flow[In, Out, Mat](delegate: 
scaladsl.Flow[In, Out, Mat]) extends Gr
    * Please note that the elements emitted by this operator are in-order with 
regards to the asks being issued
    * (i.e. same behavior as mapAsync).
    *
-   * The operator fails with an 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
+   * The operator fails with a 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
    *
    * Adheres to the [[ActorAttributes.SupervisionStrategy]] attribute.
    *
@@ -1099,7 +1099,7 @@ final class Flow[In, Out, Mat](delegate: 
scaladsl.Flow[In, Out, Mat]) extends Gr
     new Flow(delegate.ask[S](parallelism)(ref)(timeout, ClassTag(mapTo)))
 
   /**
-   * The operator fails with an 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
+   * The operator fails with a 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
    *
    * '''Emits when''' upstream emits
    *
diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Sink.scala 
b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Sink.scala
index 4530ca26e7..091caba216 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Sink.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Sink.scala
@@ -477,7 +477,7 @@ object Sink {
   }
 
   /**
-   * Creates a `Sink` that is materialized as an 
[[pekko.stream.javadsl.SinkQueueWithCancel]].
+   * Creates a `Sink` that is materialized as a 
[[pekko.stream.javadsl.SinkQueueWithCancel]].
    * [[pekko.stream.javadsl.SinkQueueWithCancel.pull]] method is pulling 
element from the stream and returns ``CompletionStage[Option[T]]``.
    * `CompletionStage` completes when element is available.
    *
@@ -498,7 +498,7 @@ object Sink {
     new 
Sink(scaladsl.Sink.queue[T](maxConcurrentPulls).mapMaterializedValue(_.asJava))
 
   /**
-   * Creates a `Sink` that is materialized as an 
[[pekko.stream.javadsl.SinkQueueWithCancel]].
+   * Creates a `Sink` that is materialized as a 
[[pekko.stream.javadsl.SinkQueueWithCancel]].
    * [[pekko.stream.javadsl.SinkQueueWithCancel.pull]] method is pulling 
element from the stream and returns ``CompletionStage[Option[T]]``.
    * `CompletionStage` completes when element is available.
    *
diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Source.scala 
b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Source.scala
index 522be44914..75f52cc720 100755
--- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Source.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Source.scala
@@ -423,7 +423,7 @@ object Source {
     new Source(scaladsl.Source.asSubscriber)
 
   /**
-   * Creates a `Source` that is materialized as an [[pekko.actor.ActorRef]].
+   * Creates a `Source` that is materialized as a [[pekko.actor.ActorRef]].
    * Messages sent to this actor will be emitted to the stream if there is 
demand from downstream,
    * otherwise they will be buffered until request for demand is received.
    *
@@ -481,7 +481,7 @@ object Source {
       }, bufferSize, overflowStrategy))
 
   /**
-   * Creates a `Source` that is materialized as an [[pekko.actor.ActorRef]].
+   * Creates a `Source` that is materialized as a [[pekko.actor.ActorRef]].
    * Messages sent to this actor will be emitted to the stream if there is 
demand from downstream,
    * and a new message will only be accepted after the previous messages has 
been consumed and acknowledged back.
    * The stream will complete with failure if a message is sent before the 
acknowledgement has been replied back.
@@ -599,7 +599,7 @@ object Source {
   }
 
   /**
-   * Creates a `Source` that is materialized as an 
[[pekko.stream.BoundedSourceQueue]].
+   * Creates a `Source` that is materialized as a 
[[pekko.stream.BoundedSourceQueue]].
    * You can push elements to the queue and they will be emitted to the stream 
if there is demand from downstream,
    * otherwise they will be buffered until request for demand is received. The 
buffer size is passed in as a parameter.
    * Elements in the buffer will be discarded if downstream is terminated.
@@ -660,7 +660,7 @@ object Source {
     scaladsl.Source.create(bufferSize)(producer(_)).asJava
 
   /**
-   * Creates a `Source` that is materialized as an 
[[pekko.stream.javadsl.SourceQueueWithComplete]].
+   * Creates a `Source` that is materialized as a 
[[pekko.stream.javadsl.SourceQueueWithComplete]].
    * You can push elements to the queue and they will be emitted to the stream 
if there is demand from downstream,
    * otherwise they will be buffered until request for demand is received. 
Elements in the buffer will be discarded
    * if downstream is terminated.
@@ -697,7 +697,7 @@ object Source {
       scaladsl.Source.queue[T](bufferSize, overflowStrategy, 
maxConcurrentOffers = 1).mapMaterializedValue(_.asJava))
 
   /**
-   * Creates a `Source` that is materialized as an 
[[pekko.stream.javadsl.SourceQueueWithComplete]].
+   * Creates a `Source` that is materialized as a 
[[pekko.stream.javadsl.SourceQueueWithComplete]].
    * You can push elements to the queue and they will be emitted to the stream 
if there is demand from downstream,
    * otherwise they will be buffered until request for demand is received. 
Elements in the buffer will be discarded
    * if downstream is terminated.
@@ -2779,7 +2779,7 @@ final class Source[Out, Mat](delegate: 
scaladsl.Source[Out, Mat]) extends Graph[
    * as they are illegal as stream elements - according to the Reactive 
Streams specification.
    *
    * This operator doesn't handle upstream's completion signal since the state 
kept in the closure can be lost.
-   * Use [[FlowOps.statefulMap]], or return an 
[[StatefulMapConcatAccumulator]] instead.
+   * Use [[FlowOps.statefulMap]], or return a [[StatefulMapConcatAccumulator]] 
instead.
    *
    * Adheres to the [[ActorAttributes.SupervisionStrategy]] attribute.
    *
@@ -2948,7 +2948,7 @@ final class Source[Out, Mat](delegate: 
scaladsl.Source[Out, Mat]) extends Graph[
    * still be in the mailbox, so defaulting to sending the second one a bit 
earlier than when first ask has replied maintains
    * a slightly healthier throughput.
    *
-   * The operator fails with an 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
+   * The operator fails with a 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
    *
    * Adheres to the [[ActorAttributes.SupervisionStrategy]] attribute.
    *
@@ -2978,7 +2978,7 @@ final class Source[Out, Mat](delegate: 
scaladsl.Source[Out, Mat]) extends Graph[
    * Please note that the elements emitted by this operator are in-order with 
regards to the asks being issued
    * (i.e. same behavior as mapAsync).
    *
-   * The operator fails with an 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
+   * The operator fails with a 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
    *
    * Adheres to the [[ActorAttributes.SupervisionStrategy]] attribute.
    *
@@ -2996,7 +2996,7 @@ final class Source[Out, Mat](delegate: 
scaladsl.Source[Out, Mat]) extends Graph[
     new Source(delegate.ask[S](parallelism)(ref)(timeout, ClassTag(mapTo)))
 
   /**
-   * The operator fails with an 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
+   * The operator fails with a 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
    *
    * '''Emits when''' upstream emits
    *
diff --git 
a/stream/src/main/scala/org/apache/pekko/stream/javadsl/StreamConverters.scala 
b/stream/src/main/scala/org/apache/pekko/stream/javadsl/StreamConverters.scala
index fa5f39ec5f..f62f27fe5e 100644
--- 
a/stream/src/main/scala/org/apache/pekko/stream/javadsl/StreamConverters.scala
+++ 
b/stream/src/main/scala/org/apache/pekko/stream/javadsl/StreamConverters.scala
@@ -73,7 +73,7 @@ object StreamConverters {
     new Sink(scaladsl.StreamConverters.fromOutputStream(() => f.create(), 
autoFlush).toCompletionStage())
 
   /**
-   * Creates a Sink which when materialized will return an 
[[java.io.InputStream]] which it is possible
+   * Creates a Sink which when materialized will return a 
[[java.io.InputStream]] which it is possible
    * to read the values produced by the stream this Sink is attached to.
    *
    * This method uses a default read timeout, use 
[[#inputStream(java.time.Duration)]] to explicitly
@@ -89,7 +89,7 @@ object StreamConverters {
   def asInputStream(): Sink[ByteString, InputStream] = new 
Sink(scaladsl.StreamConverters.asInputStream())
 
   /**
-   * Creates a Sink which when materialized will return an 
[[java.io.InputStream]] which it is possible
+   * Creates a Sink which when materialized will return a 
[[java.io.InputStream]] which it is possible
    * to read the values produced by the stream this Sink is attached to.
    *
    * This Sink is intended for inter-operation with legacy APIs since it is 
inherently blocking.
@@ -105,7 +105,7 @@ object StreamConverters {
     new Sink(scaladsl.StreamConverters.asInputStream(readTimeout.toScala))
 
   /**
-   * Creates a Source from an [[java.io.InputStream]] created by the given 
function.
+   * Creates a Source from a [[java.io.InputStream]] created by the given 
function.
    * Emitted elements are up to `chunkSize` sized [[pekko.util.ByteString]] 
elements.
    * The actual size of the emitted elements depends on how much data the 
underlying
    * [[java.io.InputStream]] returns on each read invocation. Such chunks will
@@ -126,7 +126,7 @@ object StreamConverters {
     new Source(scaladsl.StreamConverters.fromInputStream(() => in.create(), 
chunkSize).toCompletionStage())
 
   /**
-   * Creates a Source from an [[java.io.InputStream]] created by the given 
function.
+   * Creates a Source from a [[java.io.InputStream]] created by the given 
function.
    * Emitted elements are up to 8192 bytes sized [[pekko.util.ByteString]] 
elements.
    * The actual size of the emitted elements depends on how much data the 
underlying
    * [[java.io.InputStream]] returns on each read invocation. Such chunks will
@@ -144,7 +144,7 @@ object StreamConverters {
     fromInputStream(in, 8192)
 
   /**
-   * Creates a Source which when materialized will return an 
[[java.io.OutputStream]] which it is possible
+   * Creates a Source which when materialized will return a 
[[java.io.OutputStream]] which it is possible
    * to write the ByteStrings to the stream this Source is attached to.
    *
    * This Source is intended for inter-operation with legacy APIs since it is 
inherently blocking.
@@ -161,7 +161,7 @@ object StreamConverters {
     new Source(scaladsl.StreamConverters.asOutputStream(writeTimeout.toScala))
 
   /**
-   * Creates a Source which when materialized will return an 
[[java.io.OutputStream]] which it is possible
+   * Creates a Source which when materialized will return a 
[[java.io.OutputStream]] which it is possible
    * to write the ByteStrings to the stream this Source is attached to. The 
write timeout for OutputStreams
    * materialized will default to 5 seconds, @see 
[[#outputStream(java.time.Duration)]] if you want to override it.
    *
diff --git 
a/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubFlow.scala 
b/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubFlow.scala
index 61a32a81fd..79ccd6a908 100755
--- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubFlow.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubFlow.scala
@@ -362,7 +362,7 @@ final class SubFlow[In, Out, Mat](
    * as they are illegal as stream elements - according to the Reactive 
Streams specification.
    *
    * This operator doesn't handle upstream's completion signal since the state 
kept in the closure can be lost.
-   * Use [[FlowOps.statefulMap]], or return an 
[[StatefulMapConcatAccumulator]] instead.
+   * Use [[FlowOps.statefulMap]], or return a [[StatefulMapConcatAccumulator]] 
instead.
    *
    * Adheres to the [[ActorAttributes.SupervisionStrategy]] attribute.
    *
diff --git 
a/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubSource.scala 
b/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubSource.scala
index 0466e999e4..6055f28760 100755
--- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubSource.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubSource.scala
@@ -353,7 +353,7 @@ final class SubSource[Out, Mat](
    * as they are illegal as stream elements - according to the Reactive 
Streams specification.
    *
    * This operator doesn't handle upstream's completion signal since the state 
kept in the closure can be lost.
-   * Use [[pekko.stream.javadsl.Flow.statefulMap]], or return an 
[[StatefulMapConcatAccumulator]] instead.
+   * Use [[pekko.stream.javadsl.Flow.statefulMap]], or return a 
[[StatefulMapConcatAccumulator]] instead.
    *
    * Adheres to the [[ActorAttributes.SupervisionStrategy]] attribute.
    *
diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Tcp.scala 
b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Tcp.scala
index 22fe45c4eb..2fe12dd0d8 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Tcp.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Tcp.scala
@@ -198,7 +198,7 @@ class Tcp(system: ExtendedActorSystem) extends 
pekko.actor.Extension {
         .mapMaterializedValue(_.map(new ServerBinding(_))(parasitic).asJava))
 
   /**
-   * Creates an [[Tcp.OutgoingConnection]] instance representing a prospective 
TCP client connection to the given endpoint.
+   * Creates a [[Tcp.OutgoingConnection]] instance representing a prospective 
TCP client connection to the given endpoint.
    *
    * Note that the ByteString chunk boundaries are not retained across the 
network,
    * to achieve application level chunks you have to introduce explicit 
framing in your streams,
@@ -236,7 +236,7 @@ class Tcp(system: ExtendedActorSystem) extends 
pekko.actor.Extension {
         .mapMaterializedValue(_.map(new 
OutgoingConnection(_))(parasitic).asJava))
 
   /**
-   * Creates an [[Tcp.OutgoingConnection]] without specifying options.
+   * Creates a [[Tcp.OutgoingConnection]] without specifying options.
    * It represents a prospective TCP client connection to the given endpoint.
    *
    * Note that the ByteString chunk boundaries are not retained across the 
network,
@@ -250,7 +250,7 @@ class Tcp(system: ExtendedActorSystem) extends 
pekko.actor.Extension {
         .mapMaterializedValue(_.map(new 
OutgoingConnection(_))(parasitic).asJava))
 
   /**
-   * Creates an [[Tcp.OutgoingConnection]] with TLS.
+   * Creates a [[Tcp.OutgoingConnection]] with TLS.
    * The returned flow represents a TCP client connection to the given 
endpoint where all bytes in and
    * out go through TLS.
    *
@@ -268,7 +268,7 @@ class Tcp(system: ExtendedActorSystem) extends 
pekko.actor.Extension {
         .mapMaterializedValue(_.map(new 
OutgoingConnection(_))(parasitic).asJava))
 
   /**
-   * Creates an [[Tcp.OutgoingConnection]] with TLS.
+   * Creates a [[Tcp.OutgoingConnection]] with TLS.
    * The returned flow represents a TCP client connection to the given 
endpoint where all bytes in and
    * out go through TLS.
    *
diff --git a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala 
b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala
index 1123b52a1b..6e498d1ca5 100755
--- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Flow.scala
@@ -1269,7 +1269,7 @@ trait FlowOps[+Out, +Mat] {
    * as they are illegal as stream elements - according to the Reactive 
Streams specification.
    *
    * This operator doesn't handle upstream's completion signal since the state 
kept in the closure can be lost.
-   * Use [[FlowOps.statefulMap]], or return an 
[[StatefulMapConcatAccumulator]] instead.
+   * Use [[FlowOps.statefulMap]], or return a [[StatefulMapConcatAccumulator]] 
instead.
    *
    * Adheres to the [[ActorAttributes.SupervisionStrategy]] attribute.
    *
@@ -1453,7 +1453,7 @@ trait FlowOps[+Out, +Mat] {
    * Similar to the plain ask pattern, the target actor is allowed to reply 
with `org.apache.pekko.util.Status`.
    * An `org.apache.pekko.util.Status#Failure` will cause the operator to fail 
with the cause carried in the `Failure` message.
    *
-   * The operator fails with an 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
+   * The operator fails with a 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
    *
    * Adheres to the [[ActorAttributes.SupervisionStrategy]] attribute.
    *
@@ -1487,8 +1487,8 @@ trait FlowOps[+Out, +Mat] {
    * Please note that the elements emitted by this operator are in-order with 
regards to the asks being issued
    * (i.e. same behavior as mapAsync).
    *
-   * The operator fails with an 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated,
-   * or with an [[java.util.concurrent.TimeoutException]] in case the ask 
exceeds the timeout passed in.
+   * The operator fails with a 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated,
+   * or with a [[java.util.concurrent.TimeoutException]] in case the ask 
exceeds the timeout passed in.
    *
    * Adheres to the [[ActorAttributes.SupervisionStrategy]] attribute.
    *
@@ -1527,7 +1527,7 @@ trait FlowOps[+Out, +Mat] {
   }
 
   /**
-   * The operator fails with an 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
+   * The operator fails with a 
[[pekko.stream.WatchedActorTerminatedException]] if the target actor is 
terminated.
    *
    * '''Emits when''' upstream emits
    *
diff --git a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala 
b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala
index 8407ba5a0e..b5b0a3c2d2 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala
@@ -696,7 +696,7 @@ object Sink {
     actorRefWithAck(ref, _ => identity, _ => onInitMessage, None, 
onCompleteMessage, onFailureMessage)
 
   /**
-   * Creates a `Sink` that is materialized as an 
[[pekko.stream.scaladsl.SinkQueueWithCancel]].
+   * Creates a `Sink` that is materialized as a 
[[pekko.stream.scaladsl.SinkQueueWithCancel]].
    * [[pekko.stream.scaladsl.SinkQueueWithCancel.pull]] method is pulling 
element from the stream and returns ``Future[Option[T]``.
    * `Future` completes when element is available.
    *
@@ -717,7 +717,7 @@ object Sink {
     Sink.fromGraph(new QueueSink(maxConcurrentPulls))
 
   /**
-   * Creates a `Sink` that is materialized as an 
[[pekko.stream.scaladsl.SinkQueueWithCancel]].
+   * Creates a `Sink` that is materialized as a 
[[pekko.stream.scaladsl.SinkQueueWithCancel]].
    * [[pekko.stream.scaladsl.SinkQueueWithCancel.pull]] method is pulling 
element from the stream and returns ``Future[Option[T]]``.
    * `Future` completes when element is available.
    *
diff --git 
a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Source.scala 
b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Source.scala
index 6f60be9f56..e598bdac47 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Source.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Source.scala
@@ -710,7 +710,7 @@ object Source {
     fromGraph(new SubscriberSource[T](DefaultAttributes.subscriberSource, 
shape("SubscriberSource")))
 
   /**
-   * Creates a `Source` that is materialized as an [[pekko.actor.ActorRef]].
+   * Creates a `Source` that is materialized as a [[pekko.actor.ActorRef]].
    * Messages sent to this actor will be emitted to the stream if there is 
demand from downstream,
    * otherwise they will be buffered until request for demand is received.
    *
@@ -769,7 +769,7 @@ object Source {
   }
 
   /**
-   * Creates a `Source` that is materialized as an [[pekko.actor.ActorRef]].
+   * Creates a `Source` that is materialized as a [[pekko.actor.ActorRef]].
    * Messages sent to this actor will be emitted to the stream if there is 
demand from downstream,
    * and a new message will only be accepted after the previous messages has 
been consumed and acknowledged back.
    * The stream will complete with failure if a message is sent before the 
acknowledgement has been replied back.
@@ -900,7 +900,7 @@ object Source {
   }
 
   /**
-   * Creates a `Source` that is materialized as an 
[[pekko.stream.BoundedSourceQueue]].
+   * Creates a `Source` that is materialized as a 
[[pekko.stream.BoundedSourceQueue]].
    * You can push elements to the queue and they will be emitted to the stream 
if there is demand from downstream,
    * otherwise they will be buffered until request for demand is received. The 
buffer size is passed in as a parameter.
    * Elements in the buffer will be discarded if downstream is terminated.
@@ -970,7 +970,7 @@ object Source {
     }).withAttributes(DefaultAttributes.create))
 
   /**
-   * Creates a `Source` that is materialized as an 
[[pekko.stream.scaladsl.SourceQueueWithComplete]].
+   * Creates a `Source` that is materialized as a 
[[pekko.stream.scaladsl.SourceQueueWithComplete]].
    * You can push elements to the queue and they will be emitted to the stream 
if there is demand from downstream,
    * otherwise they will be buffered until request for demand is received. 
Elements in the buffer will be discarded
    * if downstream is terminated.
@@ -1006,7 +1006,7 @@ object Source {
     queue(bufferSize, overflowStrategy, maxConcurrentOffers = 1)
 
   /**
-   * Creates a `Source` that is materialized as an 
[[pekko.stream.scaladsl.SourceQueueWithComplete]].
+   * Creates a `Source` that is materialized as a 
[[pekko.stream.scaladsl.SourceQueueWithComplete]].
    * You can push elements to the queue and they will be emitted to the stream 
if there is demand from downstream,
    * otherwise they will be buffered until request for demand is received. 
Elements in the buffer will be discarded
    * if downstream is terminated.
diff --git a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Tcp.scala 
b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Tcp.scala
index 9d5ff66355..c9b984c60c 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Tcp.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Tcp.scala
@@ -194,7 +194,7 @@ final class Tcp(system: ExtendedActorSystem) extends 
pekko.actor.Extension {
   }
 
   /**
-   * Creates an [[Tcp.OutgoingConnection]] instance representing a prospective 
TCP client connection to the given endpoint.
+   * Creates a [[Tcp.OutgoingConnection]] instance representing a prospective 
TCP client connection to the given endpoint.
    *
    * Note that the ByteString chunk boundaries are not retained across the 
network,
    * to achieve application level chunks you have to introduce explicit 
framing in your streams,
@@ -241,7 +241,7 @@ final class Tcp(system: ExtendedActorSystem) extends 
pekko.actor.Extension {
   }
 
   /**
-   * Creates an [[Tcp.OutgoingConnection]] without specifying options.
+   * Creates a [[Tcp.OutgoingConnection]] without specifying options.
    * It represents a prospective TCP client connection to the given endpoint.
    *
    * Note that the ByteString chunk boundaries are not retained across the 
network,
@@ -252,7 +252,7 @@ final class Tcp(system: ExtendedActorSystem) extends 
pekko.actor.Extension {
     outgoingConnection(InetSocketAddress.createUnresolved(host, port))
 
   /**
-   * Creates an [[Tcp.OutgoingConnection]] with TLS.
+   * Creates a [[Tcp.OutgoingConnection]] with TLS.
    * The returned flow represents a TCP client connection to the given 
endpoint where all bytes in and
    * out go through TLS.
    *
@@ -275,7 +275,7 @@ final class Tcp(system: ExtendedActorSystem) extends 
pekko.actor.Extension {
       closing = IgnoreComplete)
 
   /**
-   * Creates an [[Tcp.OutgoingConnection]] with TLS.
+   * Creates a [[Tcp.OutgoingConnection]] with TLS.
    * The returned flow represents a TCP client connection to the given 
endpoint where all bytes in and
    * out go through TLS.
    *
diff --git 
a/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala 
b/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala
index e9a35a78b6..5e1aec586c 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala
@@ -1338,7 +1338,7 @@ abstract class GraphStageLogic private[stream] (val 
inCount: Int, val outCount:
     _subInletsAndOutlets -= outlet
 
   /**
-   * Initialize a [[GraphStageLogic.StageActorRef]] which can be used to 
interact with from the outside world "as-if" an [[pekko.actor.Actor]].
+   * Initialize a [[GraphStageLogic.StageActorRef]] which can be used to 
interact with from the outside world "as-if" a [[pekko.actor.Actor]].
    * The messages are looped through the [[getAsyncCallback]] mechanism of 
[[GraphStage]] so they are safe to modify
    * internal state of this operator.
    *
diff --git 
a/stream/src/main/scala/org/apache/pekko/stream/stage/StageLogging.scala 
b/stream/src/main/scala/org/apache/pekko/stream/stage/StageLogging.scala
index a2ac9fc0f9..71e2175c4a 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/stage/StageLogging.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/stage/StageLogging.scala
@@ -19,7 +19,7 @@ import pekko.event.NoLogging
 import pekko.stream.MaterializerLoggingProvider
 
 /**
- * Simple way to obtain a [[pekko.event.LoggingAdapter]] when used together 
with an [[pekko.stream.Materializer]].
+ * Simple way to obtain a [[pekko.event.LoggingAdapter]] when used together 
with a [[pekko.stream.Materializer]].
  * If used with a different materializer [[pekko.event.NoLogging]] will be 
returned.
  *
  * Make sure to only access `log` from GraphStage callbacks (such as `pull`, 
`push` or the async-callback).
diff --git a/testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala 
b/testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala
index d228ebd640..5431a82e10 100644
--- a/testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala
+++ b/testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala
@@ -253,7 +253,7 @@ trait TestKitBase {
 
   /**
    * Obtain time remaining for execution of the innermost enclosing `within`
-   * block or throw an [[java.lang.AssertionError]] if no `within` block 
surrounds this
+   * block or throw a [[java.lang.AssertionError]] if no `within` block 
surrounds this
    * call.
    */
   def remaining: FiniteDuration = end match {
diff --git 
a/testkit/src/main/scala/org/apache/pekko/testkit/javadsl/TestKit.scala 
b/testkit/src/main/scala/org/apache/pekko/testkit/javadsl/TestKit.scala
index 19f4e47023..59aca8c6ce 100644
--- a/testkit/src/main/scala/org/apache/pekko/testkit/javadsl/TestKit.scala
+++ b/testkit/src/main/scala/org/apache/pekko/testkit/javadsl/TestKit.scala
@@ -141,7 +141,7 @@ class TestKit(system: ActorSystem) {
 
   /**
    * Obtain time remaining for execution of the innermost enclosing `within`
-   * block or throw an [[java.lang.AssertionError]] if no `within` block 
surrounds this
+   * block or throw a [[java.lang.AssertionError]] if no `within` block 
surrounds this
    * call.
    */
   def getRemaining: java.time.Duration = tp.remaining.toJava


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]


Reply via email to