Merge branch 'release/0.13.0' into livedoc
diff --git a/docs/manual/data/nav/main.yml b/docs/manual/data/nav/main.yml
index 95516be..846fea8 100644
--- a/docs/manual/data/nav/main.yml
+++ b/docs/manual/data/nav/main.yml
@@ -134,7 +134,7 @@
         body: 'Adding Your Own Algorithms'
         url: '/algorithm/custom/'
   -
-    body: 'ML Tuning and Evaluation'
+    body: 'Tuning and Evaluation'
     url: '#'
     children:
       -
diff --git a/docs/manual/source/sdk/java.html.md.erb b/docs/manual/source/sdk/java.html.md.erb
index 26275f7..7539201 100644
--- a/docs/manual/source/sdk/java.html.md.erb
+++ b/docs/manual/source/sdk/java.html.md.erb
@@ -21,7 +21,8 @@
 
 ## API Docs
 
-[View API documentation](http://predictionio.apache.org/java/api/) for version <%= data.versions.pio %>.
+[View API documentation](https://javadoc.io/doc/org.apache.predictionio/predictionio-sdk-java-client/0.13.0)
+(compatible with PredictionIO version <%= data.versions.pio %>).
 
 ## Central Repository
 
@@ -29,11 +30,11 @@
 
 ## GitHub
 
-<iframe src="/github/?user=PredictionIO&repo=PredictionIO-Java-SDK&type=fork&count=true&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="170" height="30"></iframe>
-<iframe src="/github/?user=PredictionIO&repo=PredictionIO-Java-SDK&type=watch&count=true&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="170" height="30"></iframe>
+<iframe src="/github/?user=apache&repo=predictionio-sdk-java&type=fork&count=true&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="170" height="30"></iframe>
+<iframe src="/github/?user=apache&repo=predictionio-sdk-java&type=watch&count=true&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="170" height="30"></iframe>
 
-[View code](https://github.com/PredictionIO/PredictionIO-Java-SDK) on GitHub.
+[View code](https://github.com/apache/predictionio-sdk-java) on GitHub.
 
 ## License
 
-[Apache License 2.0](https://github.com/PredictionIO/PredictionIO-Java-SDK/blob/develop/LICENSE).
+[Apache License 2.0](https://github.com/apache/predictionio-sdk-java/blob/develop/LICENSE).
diff --git a/docs/manual/source/sdk/php.html.md.erb b/docs/manual/source/sdk/php.html.md.erb
index 24d4b8b..cf14ea8 100644
--- a/docs/manual/source/sdk/php.html.md.erb
+++ b/docs/manual/source/sdk/php.html.md.erb
@@ -21,7 +21,8 @@
 
 ## API Docs
 
-[View API documentation](http://predictionio.apache.org/php/api/) for version <%= data.versions.pio %>.
+[View API documentation](/sdk/php/api/)
+(compatible with PredictionIO version <%= data.versions.pio %>).
 
 ## Packagist
 
@@ -29,11 +30,11 @@
 
 ## GitHub
 
-<iframe src="/github/?user=PredictionIO&repo=PredictionIO-PHP-SDK&type=fork&count=true&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="170" height="30"></iframe>
-<iframe src="/github/?user=PredictionIO&repo=PredictionIO-PHP-SDK&type=watch&count=true&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="170" height="30"></iframe>
+<iframe src="/github/?user=apache&repo=predictionio-sdk-php&type=fork&count=true&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="170" height="30"></iframe>
+<iframe src="/github/?user=apache&repo=predictionio-sdk-php&type=watch&count=true&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="170" height="30"></iframe>
 
-[View code](https://github.com/PredictionIO/PredictionIO-PHP-SDK) on GitHub.
+[View code](https://github.com/apache/predictionio-sdk-php) on GitHub.
 
 ## License
 
-[Apache License 2.0](https://github.com/PredictionIO/PredictionIO-PHP-SDK/blob/develop/LICENSE).
+[Apache License 2.0](https://github.com/apache/predictionio-sdk-php/blob/develop/LICENSE).
diff --git a/docs/manual/source/system/index.html.md b/docs/manual/source/system/index.html.md
index dcff342..8e9667d 100644
--- a/docs/manual/source/system/index.html.md
+++ b/docs/manual/source/system/index.html.md
@@ -19,20 +19,33 @@
 limitations under the License.
 -->
 
-This section explains general rules-of-thumb for how they are used in PredictionIO. The actual implementation of the Template will define how much of this applies. PredictionIO is flexible about much of this configuration but its Templates generally fit the Lambda model for integrating real-time serving with background periodic model updates.
+This section explains general rules-of-thumb for how they are used in
+PredictionIO. The actual implementation of the Template will define how much of
+this applies. PredictionIO is flexible about much of this configuration but its
+Templates generally fit the Lambda model for integrating real-time serving with
+background periodic model updates.
 
 ![PredictionIO Systems](/images/pio-architecture.svg)
 
-**HBase**: Event Server uses Apache HBase (or JDBC DB for small data) as the data store. It stores imported
-events. If you are not using the PredictionIO Event Server, you do not need to
-install HBase.
+**HBase**: Event Server uses Apache HBase (or JDBC DB for small data) as the
+data store. It stores imported events. If you are not using the PredictionIO
+Event Server, you do not need to install HBase.
 
-**Apache Spark**: Spark is a large-scale data processing engine that powers the data preparation and input to the algorithm, training, and sometimes the serving processing. PredictionIO allows for different engines to be used in training but many algorithms come from Spark's MLlib.
+**Apache Spark**: Spark is a large-scale data processing engine that powers the
+data preparation and input to the algorithm, training, and sometimes the
+serving processing. PredictionIO allows for different engines to be used in
+training but many algorithms come from Spark's MLlib.
 
-**HDFS**: is a distributed filesystem from Hadoop. It allows storage to be shared among clustered machines. It is used to stage data for batch import into PIO, for export of Event Server datasets, and for storage of some models (see your template for details).
+**HDFS**: is a distributed filesystem from Hadoop. It allows storage to be
+shared among clustered machines. It is used to stage data for batch import into
+PredictionIO, for export of Event Server datasets, and for storage of some
+models (see your template for details).
 
 
-The output of training has two parts: a model and its meta-data. The
-model is then stored in HDFS, a local file system, or Elasticsearch. See the details of your algorithm.
+The output of training has two parts: a model and its meta-data. The model is
+then stored in HDFS, a local file system, or Elasticsearch. See the details of
+your algorithm.
 
-**Elasticsearch**: stores metadata such as model versions, engine versions, access key and app id mappings, evaluation results, etc. For some templates it may store the model.
+**Elasticsearch**: stores metadata such as model versions, engine versions,
+access key and app ID mappings, evaluation results, etc. For some templates it
+may store the model.