Merge pull request #12137 from mkurz/docs_backport

[2.9.x] Backporting small docs changes

documentation/manual/General.md

@@ -21,7 +21,7 @@ Our top priority is to prevent Play Framework users from inadvertently falling u
 
 ### Introducing Apache Pekko and Play 3.0
 
-We released [Play 3.0](https://www.playframework.com/documentation/latest/Highlights30) at the beginning of October 2023. This release replaced Akka and Akka HTTP with Pekko and Pekko HTTP: [Apache Pekko](https://pekko.apache.org/) represents a community fork of Akka 2.6 and Akka HTTP 10.2, developed by highly engaged and motivated individuals, some of whom were formerly part of the Lightbend Akka team. Pekko is undergoing active development. For example, Pekko HTTP has already been ported to Scala 3, a feature that is currently accessible only starting from the BSL-licensed Akka HTTP version 10.4. Also, Pekko has already fixed bugs and security vulnerabilities that have not been addressed in Akka 2.6 and Akka HTTP 10.2 anymore.
+We released [Play 3.0](https://www.playframework.com/documentation/latest/Highlights30) in October 2023. This release replaced Akka and Akka HTTP with Pekko and Pekko HTTP: [Apache Pekko](https://pekko.apache.org/) represents a community fork of Akka 2.6 and Akka HTTP 10.2, developed by highly engaged and motivated individuals, some of whom were formerly part of the Lightbend Akka team. Pekko is undergoing active development. For example, Pekko HTTP has already been ported to Scala 3, a feature that is currently accessible only starting from the BSL-licensed Akka HTTP version 10.4. Also, Pekko has already fixed bugs and security vulnerabilities that have not been addressed in Akka 2.6 and Akka HTTP 10.2 anymore.
 
 Aside from utilizing different frameworks under the hood, [[Play 2.9|Highlights29]] and [Play 3.0](https://www.playframework.com/documentation/latest/Highlights30) offer the same features and receive parallel maintenance, benefiting from identical enhancements and bug fixes.
 

documentation/manual/about/Philosophy.md

@@ -2,6 +2,8 @@
 
 # Introducing Play 2
 
+> This page also applies to [Play 3](https://www.playframework.com/documentation/latest/Highlights30), released in October 2023.
+
 Since 2007, we have been working on making Java web application development easier. Play started as an internal project at Zenexity (now [Zengularity](https://zengularity.com/en)) and was heavily influenced by our way of doing web projects: focusing on developer productivity, respecting web architecture, and using a fresh approach to packaging conventions from the start — breaking so-called JEE best practices where it made sense.
 
 In 2009, we decided to share these ideas with the community as an open source project. The immediate feedback was extremely positive, and the project gained a lot of traction. Today — after years of active public development — Play has several versions, an active community of more than 10,000 people, with a growing number of applications running in production all over the globe.
@@ -18,6 +20,8 @@ Today’s web applications are integrating more concurrent real-time data, so we
 
 Play 2 is architected from the start under the assumption that every request is potentially long-lived. But that’s not all: we also need a powerful way to schedule and run long-running tasks. The Actor-based model is unquestionably the best model today to handle highly concurrent systems, and the best implementation of that model available for both Java and Scala is Akka — so it’s going in. Play 2 provides native [Akka](https://akka.io/) support for Play applications, making it possible to write highly-distributed systems.
 
+> Play 3 replaced Akka with [Pekko](https://pekko.apache.org/), more details can be found [[here|General#How-Play-Deals-with-Akkas-License-Change]].
+
 ## Focused on type safety
 
 One benefit of using a statically-typed programming language for writing Play applications is that the compiler can check parts of your code. This is not only useful for detecting mistakes early in the development process, but it also makes it a lot easier to work on large projects with a lot developers involved.