Skip to content

Commit

Permalink
2.x: enable link to external JDK, fix Schedulers style (#5271)
Browse files Browse the repository at this point in the history
  • Loading branch information
akarnokd authored Apr 7, 2017
1 parent 879d60f commit 80d9b90
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ javadoc {
options.addStringOption('top').value = ''
options.addStringOption('doctitle').value = ''
options.addStringOption('header').value = ''
options.links("http://docs.oracle.com/javase/7/docs/api/")
if (JavaVersion.current().isJava7()) {
// "./gradle/stylesheet.css" only supports Java 7
options.addStringOption('stylesheetfile', rootProject.file('./gradle/stylesheet.css').toString())
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/io/reactivex/schedulers/Schedulers.java
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ private Schedulers() {
* <p>
* You can control certain properties of this standard scheduler via system properties that have to be set
* before the {@link Schedulers} class is referenced in your code.
* <br><strong>Supported system properties ({@code System.getProperty()}):</strong>
* <p><strong>Supported system properties ({@code System.getProperty()}):</strong>
* <ul>
* <li>{@code rx2.computation-threads} (int): sets the number of threads in the {@link #computation()} Scheduler, default is the number of available CPUs</li>
* <li>{@code rx2.computation-priority} (int): sets the thread priority of the {@link #computation()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
Expand Down Expand Up @@ -153,7 +153,7 @@ public static Scheduler computation() {
* <p>
* You can control certain properties of this standard scheduler via system properties that have to be set
* before the {@link Schedulers} class is referenced in your code.
* <br><strong>Supported system properties ({@code System.getProperty()}):</strong>
* <p><strong>Supported system properties ({@code System.getProperty()}):</strong>
* <ul>
* <li>{@code rx2.io-priority} (int): sets the thread priority of the {@link #io()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
* </ul>
Expand Down Expand Up @@ -211,7 +211,7 @@ public static Scheduler trampoline() {
* <p>
* You can control certain properties of this standard scheduler via system properties that have to be set
* before the {@link Schedulers} class is referenced in your code.
* <br><strong>Supported system properties ({@code System.getProperty()}):</strong>
* <p><strong>Supported system properties ({@code System.getProperty()}):</strong>
* <ul>
* <li>{@code rx2.newthread-priority} (int): sets the thread priority of the {@link #newThread()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
* </ul>
Expand Down Expand Up @@ -260,7 +260,7 @@ public static Scheduler newThread() {
* <p>
* You can control certain properties of this standard scheduler via system properties that have to be set
* before the {@link Schedulers} class is referenced in your code.
* <br><strong>Supported system properties ({@code System.getProperty()}):</strong>
* <p><strong>Supported system properties ({@code System.getProperty()}):</strong>
* <ul>
* <li>{@code rx2.single-priority} (int): sets the thread priority of the {@link #single()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
* </ul>
Expand Down

0 comments on commit 80d9b90

Please sign in to comment.