Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
julgus committed Aug 30, 2023
2 parents 9b694b3 + 541e8df commit 3eaa3c1
Show file tree
Hide file tree
Showing 135 changed files with 1,887 additions and 1,669 deletions.
12 changes: 0 additions & 12 deletions DISCLAIMER.md

This file was deleted.

3 changes: 0 additions & 3 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,6 @@ We gladly welcome any form of contributions, whether it is comments and question

Before we can accept your patches we need to establish a common legal ground to protect your rights to your contributions and the users of JPAstreamer. This is done by signing a Contributor License Agreement (link:https://github.com/speedment/jpa-streamer/blob/master/CONTRIBUTOR_LICENSE_AGREEMENT[CLA]) with Speedment, Inc. The details of this process is laid out link:https://github.com/speedment/jpa-streamer/blob/master/CONTRIBUTING.md[here].

== Phone Home
JPAstreamer sends certain data back to servers as described link:https://github.com/speedment/jpa-streamer/blob/master/DISCLAIMER.md[here]. If you wish to disable this feature, please contact us at [email protected].

== License
JPAstreamer is released under the link:https://github.com/speedment/jpa-streamer/blob/master/LICENSE[LGPL 2.1 License].

Expand Down
2 changes: 1 addition & 1 deletion docs/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

name: jpa-streamer
title: JPAStreamer Docs
version: 3.0.3
version: 3.0.4-SNAPSHOT
start_page: introduction:introduction.adoc
nav:
- modules/ROOT/nav.adoc
Expand Down
3 changes: 0 additions & 3 deletions docs/modules/introduction/pages/introduction.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,3 @@ If you wish to learn more about the Java Stream API, start with the chapter xref
- Website - https://www.jpastreamer.org
- GitHub - https://github.com/speedment/jpa-streamer

== Phone Home
JPAstreamer sends certain anonymous usage data to Google Analytics as described link:https://github.com/speedment/jpa-streamer/blob/master/DISCLAIMER.md[here]. If you wish to disable this feature, please contact us at [email protected].

329 changes: 198 additions & 131 deletions docs/modules/stream-fundamentals/pages/intermediate_operations.adoc

Large diffs are not rendered by default.

Loading

0 comments on commit 3eaa3c1

Please sign in to comment.