Skip to content

Commit 88679d3

Browse files
committed
strict mode. resolve conflicts.
1 parent 72aa432 commit 88679d3

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

build-doc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ mvn clean install -DskipTests # or guava-shaded can not be found
1313
mvn javadoc:aggregate
1414

1515
# Build manual with API references
16-
mkdocs build # or `mkdocs serve` to preview
16+
mkdocs build -s # strict, so it fails with warning. You can also use `mkdocs serve` to preview

manual/core/non_blocking/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ should not be used if strict lock-freedom is enforced.
155155
The `RateLimitingRequestThrottler` is currently blocking. The `ConcurrencyLimitingRequestThrottler`
156156
is lock-free.
157157

158-
See the section about [throttling](../throttling) for details about these components. Depending on
158+
See the section about [throttling](../throttling/README.md) for details about these components. Depending on
159159
how many requests are being executed in parallel, the thread contention on these locks can be high:
160160
in short, if your application enforces strict lock-freedom, then you should not use the
161161
`RateLimitingRequestThrottler`.

manual/core/request_id/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Usage:
3434

3535
### Request Id Generator Configuration
3636

37-
Request ID generator can be declared in the [configuration](../configuration/) as follows:
37+
Request ID generator can be declared in the [configuration](../configuration/README.md) as follows:
3838

3939
```
4040
datastax-java-driver.advanced.request-id.generator {

mkdocs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ nav:
6666
- Compression: manual/core/compression/README.md
6767
- Address Resolution: manual/core/address_resolution/README.md
6868
- Request Tracker: manual/core/request_tracker/README.md
69+
- Request ID: manual/core/request_id/README.md
6970
- Throttling: manual/core/throttling/README.md
7071
- Tracing: manual/core/tracing/README.md
7172
- Performance: manual/core/performance/README.md

0 commit comments

Comments
 (0)