Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Part 2 - Sequence Basics/1. Creating a sequence.md
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ If you're interested in the results of the `Future` for a limited amount of time
```java
Observable<Integer> values = Observable.from(f, 1000, TimeUnit.MILLISECONDS);
```
If the `Future` has not completed the specified amount of time, the observable will ignore it and fail with a `TimeoutException`.
If the `Future` has not completed in the specified amount of time, the observable will ignore it and fail with a `TimeoutException`.

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.

Expand Down
2 changes: 1 addition & 1 deletion Part 2 - Sequence Basics/2. Reducing a sequence.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Most of the operators here will be familiar to anyone who has worked with Java's

### Marble diagrams

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.
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.

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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ No experience with either reactive or functional programming is needed to follow

### Structure

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.
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.

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