Merge branch 'livedoc' into develop
diff --git a/docs/manual/data/nav/main.yml b/docs/manual/data/nav/main.yml
index 24ad8d6..95516be 100644
--- a/docs/manual/data/nav/main.yml
+++ b/docs/manual/data/nav/main.yml
@@ -118,7 +118,7 @@
body: 'Event Server Plugin'
url: '/datacollection/plugin/'
-
- body: 'Choosing an Algorithm(s)'
+ body: 'Choosing an Algorithm'
url: '#'
children:
-
diff --git a/docs/manual/source/community/contribute-sdk.html.md b/docs/manual/source/community/contribute-sdk.html.md
index 7065e30..2f9f7a2 100644
--- a/docs/manual/source/community/contribute-sdk.html.md
+++ b/docs/manual/source/community/contribute-sdk.html.md
@@ -19,9 +19,9 @@
limitations under the License.
-->
-A SDK should provide convenient methods for client applications to easily
-record users' behaviors in Apache PredictionIO's Event Server and
-also query recommendations from the ML Engines. Therefore, a SDK typically has 2
+A SDK should provide convenient methods for client applications to easily record
+users' behaviors in Apache PredictionIO's Event Server and also query
+recommendations from machine learning Engines. Therefore, a SDK typically has 2
corresponding clients: `Event Client` and `Engine Client`.
The following guideline bases on the REST API provided by Apache PredictionIO's
diff --git a/docs/manual/source/demo/community.html.md b/docs/manual/source/demo/community.html.md
index e88196c..afd2bac 100644
--- a/docs/manual/source/demo/community.html.md
+++ b/docs/manual/source/demo/community.html.md
@@ -51,9 +51,7 @@
Beer recommendation app built by [Victor Leung](https://twitter.com/victorleungtw).
-URL: http://ontappapp.com/
-
-Writeup: http://victorleungtw.com/prediction-io/
+Writeup: https://medium.com/@victorleungtw/beer-recommendation-engine-using-predictionio-36488ea0c50d
## Yelpio
diff --git a/docs/manual/source/evaluation/index.html.md b/docs/manual/source/evaluation/index.html.md
index 66943e1..1cf01f4 100644
--- a/docs/manual/source/evaluation/index.html.md
+++ b/docs/manual/source/evaluation/index.html.md
@@ -1,5 +1,5 @@
---
-title: ML Tuning and Evaluation
+title: Tuning and Evaluation
---
<!--
diff --git a/docs/manual/source/index.html.md.erb b/docs/manual/source/index.html.md.erb
index 09eaed8..db320e5 100644
--- a/docs/manual/source/index.html.md.erb
+++ b/docs/manual/source/index.html.md.erb
@@ -45,9 +45,9 @@
and **Elasticsearch**, which simplifies and accelerates scalable machine
learning infrastructure management.
-| Getting Started | Developer Guides | ML Education and Usage | PredictionIO SDKs |
-| --------------- | ---------------- | ---------------------- | ----------------- |
-| [Quick Intro](/start/) | [System Architecture](/system/) | [Comics Recommendation](/demo/tapster/) | [Java](/sdk/java/) |
+| Getting Started | Developer Guides | Machine Learning Education and Usage | PredictionIO SDKs |
+| --------------- | ---------------- | ------------------------------------ | ----------------- |
+| [Quick Intro](/start/) | [System Architecture](/system/) | [Demo: Recommending Comics](/demo/tapster/) | [Java](/sdk/java/) |
| [Installation Guide](/install/) | [Event Server Overview](/datacollection/) | [Text Classification](/demo/textclassification/) | [PHP](/sdk/php/) |
| [Downloading Template](/start/download/) | [Collecting Data](/datacollection/eventapi/) | [Community Contributed Demo](/demo/community/) | [Python](/sdk/python/) |
| [Deploying an Engine](/start/deploy/) | [Learning DASE](/customize/) |[Dimensionality Reduction](/machinelearning/dimensionalityreduction/)| [Ruby](/sdk/ruby/) |
@@ -59,9 +59,8 @@
## Release Notes
-A summary of the changes in each release before migrating to Apache Software
-Foundation are on GitHub
-[here](https://github.com/PredictionIO/PredictionIO/blob/master/RELEASE.md).
+A summary of changes in each release can be found
+[here](https://github.com/apache/predictionio/blob/master/RELEASE.md).
## Licensing
diff --git a/docs/manual/source/install/install-sourcecode.html.md.erb b/docs/manual/source/install/install-sourcecode.html.md.erb
index 8abc448..897f7e8 100644
--- a/docs/manual/source/install/install-sourcecode.html.md.erb
+++ b/docs/manual/source/install/install-sourcecode.html.md.erb
@@ -32,23 +32,16 @@
* Hadoop 2.7.3
* Elasticsearch 5.5.2
-Download binary release from an [Apache mirror](https://www.apache.org/dyn/closer.cgi/predictionio/<%=
-data.versions.pio %>/apache-predictionio-<%= data.versions.pio %>-bin.tar.gz)
-and verify the release.
-
-Extract the binary distribution and proceed to
-[Installing Dependencies](#installing-dependencies).
-
-```
-$ tar zxvf apache-predictionio-<%= data.versions.pio %>.tar.gz
-```
-
-## Downloading Source Code
-
-Download Apache PredictionIO source <%= data.versions.pio %> from an
-[Apache mirror](https://www.apache.org/dyn/closer.cgi/predictionio/<%=
-data.versions.pio %>/apache-predictionio-<%= data.versions.pio %>.tar.gz) and
-verify the release.
+Download [binary release from an Apache
+mirror](https://www.apache.org/dyn/closer.lua/predictionio/<%= data.versions.pio
+%>/apache-predictionio-<%= data.versions.pio %>-bin.tar.gz) and verify the
+release with the corresponding
+[signature](https://archive.apache.org/dist/predictionio/<%=
+data.versions.pio %>/apache-predictionio-<%= data.versions.pio
+%>-bin.tar.gz.asc) and
+[checksum](https://archive.apache.org/dist/predictionio/<%=
+data.versions.pio %>/apache-predictionio-<%= data.versions.pio
+%>-bin.tar.gz.sha512).
### Verifying Release
@@ -69,6 +62,53 @@
gpg: Good signature from "Chan Lee <chanlee@apache.org>" [ultimate]
```
+For further information, the [official guide from
+Apache](https://www.apache.org/info/verification.html) has the most up-to-date
+and complete information.
+
+### Installation
+
+Extract the binary distribution and proceed to
+[Installing Dependencies](#installing-dependencies).
+
+```
+$ tar zxvf apache-predictionio-<%= data.versions.pio %>.tar.gz
+```
+
+## Downloading Source Code
+
+Download [source release from an Apache
+mirror](https://www.apache.org/dyn/closer.cgi/predictionio/<%= data.versions.pio
+%>/apache-predictionio-<%= data.versions.pio %>.tar.gz) and verify the release
+with the corresponding
+[signature](https://archive.apache.org/dist/predictionio/<%= data.versions.pio
+%>/apache-predictionio-<%= data.versions.pio %>.tar.gz.asc) and
+[checksum](https://archive.apache.org/dist/predictionio/<%= data.versions.pio
+%>/apache-predictionio-<%= data.versions.pio %>.tar.gz.sha512).
+
+### Verifying Release
+
+Verify binary/source release using [signatures and checksums]
+(https://www.apache.org/dist/predictionio/<%= data.versions.pio %>/)
+and [project release KEYS](https://www.apache.org/dist/predictionio/KEYS).
+
+```
+$ gpg --import KEYS
+$ gpg --verify apache-predictionio-<%= data.versions.pio %>.tar.gz.asc apache-predictionio-<%= data.versions.pio %>.tar.gz
+```
+
+You should see something like this.
+
+```
+gpg: Signature made Tue Sep 26 22:55:22 2017 PDT
+gpg: using RSA key 7E2363D84719A8F4
+gpg: Good signature from "Chan Lee <chanlee@apache.org>" [ultimate]
+```
+
+For further information, the [official guide from
+Apache](https://www.apache.org/info/verification.html) has the most up-to-date
+and complete information.
+
## Building
Run the following at the directory where you downloaded the source code to build
diff --git a/docs/manual/source/partials/_footer.html.slim b/docs/manual/source/partials/_footer.html.slim
index 5a5c1a2..f7b91b8 100644
--- a/docs/manual/source/partials/_footer.html.slim
+++ b/docs/manual/source/partials/_footer.html.slim
@@ -34,8 +34,8 @@
= image_tag 'logos/logo-white.png', alt: 'PredictionIO'
span ®
#social-icons-wrapper
- a.github-button> href="https://github.com/apache/predictionio" data-style="mega" data-count-href="/apache/predictionio/stargazers" data-count-api="/repos/apache/predictionio#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star apache/predictionio on GitHub" Star
- a.github-button> href="https://github.com/apache/predictionio/fork" data-icon="octicon-git-branch" data-style="mega" data-count-href="/apache/predictionio/network" data-count-api="/repos/apache/predictionio#forks_count" data-count-aria-label="# forks on GitHub" aria-label="Fork apache/predictionio on GitHub" Fork
+ a.github-button> href="https://github.com/apache/predictionio" data-icon="octicon-star" data-show-count="true" aria-label="Star apache/predictionio on GitHub" Star
+ a.github-button> href="https://github.com/apache/predictionio/fork" data-icon="octicon-repo-forked" data-show-count="true" aria-label="Fork apache/predictionio on GitHub" Fork
script#github-bjs(async defer src="https://buttons.github.io/buttons.js")
a> href="https://twitter.com/predictionio" target="blank"
= image_tag 'icons/twitter.png', alt: 'PredictionIO on Twitter'
