This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git
The following commit(s) were added to refs/heads/main by this push:
new 374ff95eb fix some cases where 'the the' is used (#69)
374ff95eb is described below
commit 374ff95eb56674f508ec05d8b2714cbcb814be3c
Author: PJ Fanning <[email protected]>
AuthorDate: Sat Feb 18 15:29:21 2023 +0100
fix some cases where 'the the' is used (#69)
---
docs/src/main/paradox/common/http-model.md | 4 ++--
.../main/paradox/routing-dsl/directives/caching-directives/index.md | 2 +-
docs/src/main/paradox/routing-dsl/directives/index.md | 4 ++--
.../scala/org/apache/pekko/http/javadsl/testkit/TestRouteResult.scala | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/src/main/paradox/common/http-model.md
b/docs/src/main/paradox/common/http-model.md
index 0c70a39ac..b4d6b9979 100644
--- a/docs/src/main/paradox/common/http-model.md
+++ b/docs/src/main/paradox/common/http-model.md
@@ -144,12 +144,12 @@ Java
## HttpEntity
An @apidoc[HttpEntity] carries the data bytes of a message together with its
Content-Type and, if known, its Content-Length.
-In Apache Pekko HTTP there are five different kinds of entities which model
the various ways that message content can be
+In Apache Pekko HTTP, there are five different kinds of entities which model
the various ways that message content can be
received or sent:
@scala[HttpEntity.Strict]@java[HttpEntityStrict]
: The simplest entity, which is used when all the entity are already available
in memory.
-It wraps a plain @apidoc[org.apache.pekko.util.ByteString] and represents a
standard, unchunked entity with a known `Content-Length`.
+It wraps a plain @apidoc[org.apache.pekko.util.ByteString] and represents a
standard, unchunked entity with a known `Content-Length`.
@scala[HttpEntity.Default]@java[HttpEntityDefault]
: The general, unchunked HTTP/1.1 message entity.
diff --git
a/docs/src/main/paradox/routing-dsl/directives/caching-directives/index.md
b/docs/src/main/paradox/routing-dsl/directives/caching-directives/index.md
index 7fb4d7e64..d88d4c5a2 100644
--- a/docs/src/main/paradox/routing-dsl/directives/caching-directives/index.md
+++ b/docs/src/main/paradox/routing-dsl/directives/caching-directives/index.md
@@ -1,7 +1,7 @@
# CachingDirectives
Use these directives to "wrap" expensive operations with a caching layer that
-runs the wrapped operation only once and returns the the cached value for all
+runs the wrapped operation only once and returns the cached value for all
future accesses for the same key (as long as the respective entry has not
expired).
See @ref[caching](../../../common/caching.md) for an introduction to how the
caching support works.
diff --git a/docs/src/main/paradox/routing-dsl/directives/index.md
b/docs/src/main/paradox/routing-dsl/directives/index.md
index 0f422dbee..2101122e1 100644
--- a/docs/src/main/paradox/routing-dsl/directives/index.md
+++ b/docs/src/main/paradox/routing-dsl/directives/index.md
@@ -298,7 +298,7 @@ Again, instead of extracting own combined directives to its
own method, we can m
@@snip
[DirectiveExamplesTest.java](/docs/src/test/java/docs/http/javadsl/server/DirectiveExamplesTest.java)
{ #composeNestingAllOf }
-In this previous example, the the inner route function provided to `allOf`
will be called when the request is a `GET` and with the extracted client IP
obtained from the second directive.
+In this previous example, the inner route function provided to `allOf` will be
called when the request is a `GET` and with the extracted client IP obtained
from the second directive.
As you have already seen in the previous section, you can also use the
`concat` method defined in @apidoc[RouteDirectives] as an alternative to
`orElse` chaining. Here you can see the first example again, rewritten using
`concat`:
@@ -327,7 +327,7 @@ use their power to define your web service behavior at the
level of abstraction
@@@ note { .group-scala }
Gotcha: forgetting the `~` (tilde) character in between directives can result
in perfectly valid
-Scala code that compiles but does not work as expected. What would be intended
as a single expression would actually be multiple expressions, and only the
final one would be used as the result of the parent directive. Because of this,
the recommended way to compose routes is with the the `concat` combinator.
+Scala code that compiles but does not work as expected. What would be intended
as a single expression would actually be multiple expressions, and only the
final one would be used as the result of the parent directive. Because of this,
the recommended way to compose routes is with the `concat` combinator.
@@@
@@@ div { .group-scala }
diff --git
a/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/TestRouteResult.scala
b/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/TestRouteResult.scala
index 774730126..96a752cd0 100644
---
a/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/TestRouteResult.scala
+++
b/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/TestRouteResult.scala
@@ -66,7 +66,7 @@ abstract class TestRouteResult(_result: Future[RouteResult],
awaitAtMost: Finite
def contentTypeString: String = contentType.toString
/**
- * Returns the media-type of the the response's content-type
+ * Returns the media-type of the response's content-type
*/
def mediaType: MediaType = contentType.mediaType
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
