Skip to content

Commit 565dd06

Browse files
committed
Merge pull request Froussios#17 from Froussios/Unpublished-content
Tiny fixes
2 parents 882a1fa + b1f5922 commit 565dd06

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Part 2 - Sequence Basics/1. Creating a sequence.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ If you're interested in the results of the `Future` for a limited amount of time
275275
```java
276276
Observable<Integer> values = Observable.from(f, 1000, TimeUnit.MILLISECONDS);
277277
```
278-
If the `Future` has not completed the specified amount of time, the observable will ignore it and fail with a `TimeoutException`.
278+
If the `Future` has not completed in the specified amount of time, the observable will ignore it and fail with a `TimeoutException`.
279279

280280
You can also turn any collection into an observable using the overloads of `Observable.from` that take arrays and iterables. This will result in every item in the collection being emitted and then a final onCompleted event.
281281

Part 2 - Sequence Basics/2. Reducing a sequence.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Most of the operators here will be familiar to anyone who has worked with Java's
66

77
### Marble diagrams
88

9-
This is an appropriate time to introduce to concept of marble diagrams. It is a popular way of explaining the operators in Rx, because of their intuitive and graphical nature. They are present a lot in the documentation of RxJava and it only makes sense that we take advantage of their explanatory nature. The format is mostly self-explanatory: time flows left to right, shapes represent values, a slash is a onCompletion, an X is an error. The operator is applied to the top sequence and the result is the sequence below.
9+
This is an appropriate time to introduce to concept of marble diagrams. It is a popular way of explaining the operators in Rx, because of their intuitive and graphical nature. They are present a lot in the documentation of RxJava and it only makes sense that we take advantage of their explanatory nature. The format is mostly self-explanatory: time flows left to right, shapes represent values, a slash is an onCompletion, an X is an error. The operator is applied to the top sequence and the result is the sequence below.
1010

1111
![](https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/legend.png)
1212

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ No experience with either reactive or functional programming is needed to follow
88

99
### Structure
1010

11-
The content of this book is meant to be read from start to finish. It begins with the basics and every subsequent chapter introduces increasingly advanced features and concepts. Sections of the book are intended to be self-containing and to-the-point, so that the book can be referred back to by non-beginners.
11+
The content of this book is meant to be read from start to finish. It is bigger than your average tutorial and smaller than an actual book. It begins with the basics and every subsequent chapter introduces increasingly advanced features and concepts. Sections of the book are intended to be self-containing and to-the-point, so that the book can be referred back to by non-beginners.
1212

1313
The examples used in the book are also [available in compilable java files](/tests/java/itrx) in two formats:
1414
* Examples that print to standard output (recommended for first-time readers)

0 commit comments

Comments
 (0)