raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Remove or replace master/slave terminology from tests and API docs (#29252)

Browse source 
* Remove or replace master/slave terminology from tests and API docs
* Replace master where it would potentially imply being master/slave
This commit is contained in:
Johan Andrén 2020-06-18 08:17:46 +02:00 • committed by GitHub
parent 0a986bf13d
commit 25ea7b7f5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 101 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-docs/src/main/paradox/stream/stream-substream.md
View file

@ -54,9 +54,9 @@ Java
![stream-substream-groupBy2.png](../../images/stream-substream-groupBy2.png)
Also substreams, more precisely, `SubFlow` and `SubSource` have methods that allow you to
merge or concat substreams into the master stream again.
merge or concat substreams into the main stream again.
The `mergeSubstreams` method merges an unbounded number of substreams back to the master stream.
The `mergeSubstreams` method merges an unbounded number of substreams back to the main stream.
Scala
: @@snip [SubstreamDocSpec.scala](/akka-docs/src/test/scala/docs/stream/SubstreamDocSpec.scala) { #groupBy3 }