You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by ch...@apache.org on 2018/03/01 21:36:45 UTC
[8/8] predictionio git commit: Merge remote-tracking branch
'origin/livedoc' into develop
Merge remote-tracking branch 'origin/livedoc' into develop
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/8999cdef
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/8999cdef
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/8999cdef
Branch: refs/heads/develop
Commit: 8999cdef514f8585f9b71411aa625b168a320d48
Parents: 6eda07f 29fb5f2
Author: Chan Lee <ch...@gmail.com>
Authored: Thu Mar 1 13:33:34 2018 -0800
Committer: Chan Lee <ch...@gmail.com>
Committed: Thu Mar 1 13:33:34 2018 -0800
----------------------------------------------------------------------
build.sbt | 12 ++++++++++--
docs/manual/config.rb | 1 -
docs/manual/data/nav/main.yml | 6 +++---
docs/manual/source/index.html.md.erb | 12 ++++++------
4 files changed, 19 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/predictionio/blob/8999cdef/build.sbt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/predictionio/blob/8999cdef/docs/manual/source/index.html.md.erb
----------------------------------------------------------------------
diff --cc docs/manual/source/index.html.md.erb
index cef8e7a,2c8fe44..09eaed8
--- a/docs/manual/source/index.html.md.erb
+++ b/docs/manual/source/index.html.md.erb
@@@ -65,7 -65,7 +65,7 @@@ Foundation are on GitHu
## Licensing
- Apache PredictionIO is licensed under the Apache License, Version
+ Apache PredictionIO® is licensed under the Apache License, Version
2.0. See
-[LICENSE](https://github.com/apache/incubator-predictionio/blob/master/LICENSE.txt)
+[LICENSE](https://github.com/apache/predictionio/blob/master/LICENSE.txt)
for the full license text.