From 6df57df1c46c0d3b90cca2bd21ad107ced354043 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Tue, 24 Oct 2023 21:30:51 +0100
Subject: [PATCH] prefix Akka HTTP versions (#342)

* prefix Akka HTTP versions

* javafmt
---
 docs/src/main/paradox/.htaccess                               | 2 +-
 .../apache/pekko/http/javadsl/model/headers/HttpCookie.java   | 4 ++--
 .../pekko/http/scaladsl/settings/ConnectionPoolSettings.scala | 2 +-
 project/Doc.scala                                             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/src/main/paradox/.htaccess b/docs/src/main/paradox/.htaccess
index fcc7f4dfc..2d3e973b4 100644
--- a/docs/src/main/paradox/.htaccess
+++ b/docs/src/main/paradox/.htaccess
@@ -1,4 +1,4 @@
-# Since 10.0.9
+# Since Akka HTTP 10.0.9
 RedirectMatch 301 ^(.*)/common/de-coding.html$ $1/common/encoding.html
 RedirectMatch 301 ^(.*)/low-level-server-side-api.html$ $1/server-side/low-level-api.html
 RedirectMatch 301 ^(.*)/server-side-https-support.html$ $1/server-side/https-support.html
diff --git a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/HttpCookie.java b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/HttpCookie.java
index c8a9970b2..e79eb585e 100644
--- a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/HttpCookie.java
+++ b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/HttpCookie.java
@@ -75,8 +75,8 @@ public static HttpCookie create(
   }
 
   /**
-   * @deprecated Since 10.2.0. Use {@link #create(String, String, Optional, OptionalLong, Optional,
-   *     Optional, boolean, boolean, Optional, Optional)} instead.
+   * @deprecated Since Akka HTTP 10.2.0. Use {@link #create(String, String, Optional, OptionalLong,
+   *     Optional, Optional, boolean, boolean, Optional, Optional)} instead.
    */
   @SuppressWarnings("unchecked")
   public static HttpCookie create(
diff --git a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ConnectionPoolSettings.scala b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ConnectionPoolSettings.scala
index 02e23f4a3..772d43df8 100644
--- a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ConnectionPoolSettings.scala
+++ b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ConnectionPoolSettings.scala
@@ -99,7 +99,7 @@ abstract class ConnectionPoolSettings extends js.ConnectionPoolSettings { self:
     self.copyDeep(_.withResponseEntitySubscriptionTimeout(newValue), responseEntitySubscriptionTimeout = newValue)
 
   /**
-   * Since 10.1.0, the transport is configured in [[ClientConnectionSettings]]. This method is a shortcut for
+   * Since Akka HTTP 10.1.0, the transport is configured in [[ClientConnectionSettings]]. This method is a shortcut for
    * `withUpdatedConnectionSettings(_.withTransport(newTransport))`.
    */
   def withTransport(newValue: ClientTransport): ConnectionPoolSettings =
diff --git a/project/Doc.scala b/project/Doc.scala
index f4d4bede7..6dd58c462 100644
--- a/project/Doc.scala
+++ b/project/Doc.scala
@@ -155,7 +155,7 @@ object UnidocRoot extends AutoPlugin {
       if (isJdk8) Seq("-Xdoclint:none")
       else Seq("-Xdoclint:none", "--ignore-source-errors")),
     // genjavadoc needs to generate synthetic methods since the java code uses them
-    // fails since 10.0.11 disabled to get the doc gen to pass, see #1584
+    // fails since Akka HTTP 10.0.11 disabled to get the doc gen to pass, see #1584
     // scalacOptions += "-P:genjavadoc:suppressSynthetic=false",
     // FIXME: see https://github.com/akka/akka-http/issues/230
     JavaUnidoc / unidoc / sources ~= (_.filterNot(