From bfec267c39ffca6626e955804a5fbeb1023d0bff Mon Sep 17 00:00:00 2001 From: David Moncka Date: Sun, 6 Mar 2016 23:10:45 +0100 Subject: [PATCH 1/5] Update index.html.md fixed typo --- docs/manual/source/deploy/index.html.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/source/deploy/index.html.md b/docs/manual/source/deploy/index.html.md index 1c69a6ab16..84baea451b 100644 --- a/docs/manual/source/deploy/index.html.md +++ b/docs/manual/source/deploy/index.html.md @@ -15,7 +15,7 @@ After you have [downloaded an Engine Template](/start/download/), you can deplo A deployed engine listens to port 8000 by default. Your application can [send query to retrieve prediction](/appintegration/) in real-time through the REST interface. -**Note**: a new engine depoyed as above will have no data to start with. Your engine may come with a `data/` directory with some sample data that you can import, not all have this. Check the quickstart instructions for your template. +**Note**: a new engine deployed as above will have no data to start with. Your engine may come with a `data/` directory with some sample data that you can import, not all have this. Check the quickstart instructions for your template. ## Update Model with New Data From 8a68d5bd19491d6b3ec277119f09f7b220d2f3ce Mon Sep 17 00:00:00 2001 From: Donald Szeto Date: Mon, 28 Mar 2016 17:16:04 -0700 Subject: [PATCH 2/5] Upgrade nokogiri --- docs/manual/Gemfile | 2 +- docs/manual/Gemfile.lock | 9 ++++--- docs/manual/data/nav/main.yml | 3 --- docs/manual/source/index.html.md.erb | 38 +++++++++++++++++++--------- 4 files changed, 33 insertions(+), 19 deletions(-) diff --git a/docs/manual/Gemfile b/docs/manual/Gemfile index 8494ccd553..2a20508bfd 100644 --- a/docs/manual/Gemfile +++ b/docs/manual/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '2.2.0' +ruby '2.2.1' gem 'middleman', '~> 3.3.10' gem 'middleman-livereload', '~> 3.4.2' diff --git a/docs/manual/Gemfile.lock b/docs/manual/Gemfile.lock index bde1138e11..7f8b018517 100644 --- a/docs/manual/Gemfile.lock +++ b/docs/manual/Gemfile.lock @@ -152,7 +152,7 @@ GEM middleman-core (~> 3.2) rouge (~> 1.0) mime-types (2.4.3) - mini_portile (0.6.2) + mini_portile2 (2.0.0) minitest (5.6.0) multi_json (1.11.0) multipart-post (2.0.0) @@ -161,8 +161,8 @@ GEM net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (2.9.2) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) oj (2.12.2) padrino-helpers (0.12.5) i18n (~> 0.6, >= 0.6.7) @@ -260,3 +260,6 @@ DEPENDENCIES travis tzinfo-data wdm (~> 0.1.0) + +BUNDLED WITH + 1.11.2 diff --git a/docs/manual/data/nav/main.yml b/docs/manual/data/nav/main.yml index 05895d697a..4c26ee21e6 100644 --- a/docs/manual/data/nav/main.yml +++ b/docs/manual/data/nav/main.yml @@ -6,9 +6,6 @@ root: - body: 'Welcome to PredictionIO' url: '/' - - - body: 'Release Notes' - url: '/release-notes/' - body: 'Getting Started' url: '#' diff --git a/docs/manual/source/index.html.md.erb b/docs/manual/source/index.html.md.erb index 3370443991..2b5214357a 100644 --- a/docs/manual/source/index.html.md.erb +++ b/docs/manual/source/index.html.md.erb @@ -1,29 +1,39 @@ --- -title: Welcome to PredictionIO! +title: Welcome to PredictionIO! description: PredictionIO Open Source Machine Learning Server --- ## What is PredictionIO? -PredictionIO is an **open source Machine Learning Server** built on top of state-of-the-art open source stack for developers and data scientists create predictive engines for any machine learning task. It lets you: +PredictionIO is an **open source Machine Learning Server** built on top of +state-of-the-art open source stack for developers and data scientists create +predictive engines for any machine learning task. It lets you: -* quickly build and deploy an engine as a web service on production with [customizable templates](http://templates.prediction.io); +* quickly build and deploy an engine as a web service on production with + [customizable templates](http://templates.prediction.io); * respond to dynamic queries in **real-time** once deployed as a web service; * evaluate and tune multiple engine variants systematically; -* unify data from multiple platforms in batch or in real-time for comprehensive predictive analytics; -* speed up machine learning modeling with systematic processes and pre-built evaluation measures; -* support machine learning and data processing libraries such as Spark MLLib and OpenNLP; -* implement your own machine learning models and seamlessly incorporate them into your engine; +* unify data from multiple platforms in batch or in real-time for comprehensive + predictive analytics; +* speed up machine learning modeling with systematic processes and pre-built + evaluation measures; +* support machine learning and data processing libraries such as Spark MLLib and + OpenNLP; +* implement your own machine learning models and seamlessly incorporate them + into your engine; * simplify data infrastructure management. -PredictionIO can be [installed](https://docs.prediction.io/install/) as a full machine learning stack, bundled with **Apache Spark**, **MLlib**, **HBase**, **Spray** and **Elasticsearch**, which simplifies and accelerates scalable machine learning infrastructure management. +PredictionIO can be [installed](https://docs.prediction.io/install/) as a full +machine learning stack, bundled with **Apache Spark**, **MLlib**, **HBase**, +**Spray** 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/) | | [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/) | +| [Deploying an Engine](/start/deploy/) | [Learning DASE](/customize/) |[Dimensionality Reduction](/machinelearning/dimensionalityreduction/)| [Ruby](/sdk/ruby/) | | [Customizing an Engine](/start/customize/) | [Implementing DASE](/customize/dase/) ||[Community Contributed](/sdk/community/) | | [App Integration Overview](/appintegration/) | [Evaluation Overview](/evaluation/) ||| || [Intellij IDEA Guide](/resources/intellij/) ||| @@ -32,12 +42,16 @@ PredictionIO can be [installed](https://docs.prediction.io/install/) as a full m ## Release Notes -A summary of the changes in each release in the current series are on Github [here](https://github.com/PredictionIO/PredictionIO/blob/master/RELEASE.md) +A summary of the changes in each release in the current series are on GitHub +[here](https://github.com/PredictionIO/PredictionIO/blob/master/RELEASE.md) ## Licensing -PredictionIO is licensed under the Apache License, Version 2.0. See [LICENSE](https://github.com/PredictionIO/PredictionIO/blob/master/LICENSE.txt) for the full license text. +PredictionIO is licensed under the Apache License, Version 2.0. See +[LICENSE](https://github.com/PredictionIO/PredictionIO/blob/master/LICENSE.txt) +for the full license text. ### Documentation -Documentation is under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License](http://creativecommons.org/licenses/by-nc-sa/3.0/). +Documentation is under a [Creative Commons Attribution-NonCommercial-ShareAlike +3.0 License](http://creativecommons.org/licenses/by-nc-sa/3.0/). From 1e27c3b71002af3d5e25b5d0139dc01dbf8202ba Mon Sep 17 00:00:00 2001 From: Donald Szeto Date: Mon, 28 Mar 2016 17:20:01 -0700 Subject: [PATCH 3/5] Update gems --- docs/manual/Gemfile.lock | 57 +++++++++++++++-------------------- docs/manual/data/nav/main.yml | 2 +- 2 files changed, 25 insertions(+), 34 deletions(-) diff --git a/docs/manual/Gemfile.lock b/docs/manual/Gemfile.lock index 7f8b018517..5cfff32497 100644 --- a/docs/manual/Gemfile.lock +++ b/docs/manual/Gemfile.lock @@ -7,20 +7,19 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - addressable (2.3.8) + addressable (2.4.0) ansi (1.5.0) - autoprefixer-rails (5.1.9) + autoprefixer-rails (5.1.11) execjs json - backports (3.6.4) - bootstrap-sass (3.3.4.1) + backports (3.6.8) + bootstrap-sass (3.3.5.1) autoprefixer-rails (>= 5.0.0.1) - sass (>= 3.2.19) + sass (>= 3.3.0) builder (3.2.2) celluloid (0.16.0) timers (~> 4.0.0) chunky_png (1.3.4) - coderay (1.1.0) coffee-script (2.4.1) coffee-script-source execjs @@ -41,16 +40,16 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - ethon (0.7.3) + ethon (0.8.1) ffi (>= 1.3.0) eventmachine (1.0.7) excon (0.45.1) - execjs (2.5.2) - faraday (0.9.1) + execjs (2.6.0) + faraday (0.9.2) multipart-post (>= 1.2, < 3) - faraday_middleware (0.9.1) + faraday_middleware (0.10.0) faraday (>= 0.7.4, < 0.10) - ffi (1.9.8) + ffi (1.9.10) fog-aws (0.1.2) fog-core (~> 1.27) fog-json (~> 1.0) @@ -79,7 +78,7 @@ GEM net-http-pipeline haml (4.0.6) tilt - highline (1.7.1) + highline (1.7.8) hike (1.2.3) hitimes (1.2.2) hooks (0.4.0) @@ -88,7 +87,7 @@ GEM http_parser.rb (0.6.0) i18n (0.7.0) ipaddress (0.8.0) - json (1.8.2) + json (1.8.3) kramdown (1.6.0) launchy (2.4.3) addressable (~> 2.3) @@ -98,7 +97,6 @@ GEM rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) map (6.5.5) - method_source (0.8.2) middleman (3.3.10) coffee-script (~> 2.2) compass (>= 1.0.0, < 2.0.0) @@ -154,7 +152,7 @@ GEM mime-types (2.4.3) mini_portile2 (2.0.0) minitest (5.6.0) - multi_json (1.11.0) + multi_json (1.11.2) multipart-post (2.0.0) net-http-persistent (2.9.4) net-http-pipeline (1.0.1) @@ -163,7 +161,7 @@ GEM net-ssh (2.9.2) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) - oj (2.12.2) + oj (2.15.0) padrino-helpers (0.12.5) i18n (~> 0.6, >= 0.6.7) padrino-support (= 0.12.5) @@ -171,11 +169,7 @@ GEM padrino-support (0.12.5) activesupport (>= 3.1) pmap (1.0.2) - pry (0.9.12.6) - coderay (~> 1.0) - method_source (~> 0.8) - slop (~> 3.4) - pusher-client (0.6.0) + pusher-client (0.6.2) json websocket (~> 1.0) rack (1.6.0) @@ -183,19 +177,18 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rainbow (2.0.0) + rainbow (2.1.0) rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.3.2) + redcarpet (3.3.4) ref (1.0.5) rouge (1.8.0) ruby-progressbar (1.7.5) - sass (3.4.13) - slim (3.0.3) + sass (3.4.22) + slim (3.0.6) temple (~> 0.7.3) tilt (>= 1.3.3, < 2.1) - slop (3.6.0) sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) @@ -206,7 +199,7 @@ GEM sprockets-sass (1.3.1) sprockets (~> 2.0) tilt (~> 1.1) - temple (0.7.5) + temple (0.7.6) therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref @@ -215,19 +208,17 @@ GEM tilt (1.4.1) timers (4.0.1) hitimes - travis (1.7.6) - addressable (~> 2.3) + travis (1.8.2) backports faraday (~> 0.9) faraday_middleware (~> 0.9, >= 0.9.1) gh (~> 0.13) highline (~> 1.6) launchy (~> 2.1) - pry (~> 0.9, < 0.10) pusher-client (~> 0.4) typhoeus (~> 0.6, >= 0.6.8) - typhoeus (0.7.1) - ethon (>= 0.7.1) + typhoeus (0.8.0) + ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) uber (0.0.13) @@ -237,7 +228,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.6) - websocket (1.2.1) + websocket (1.2.2) PLATFORMS ruby diff --git a/docs/manual/data/nav/main.yml b/docs/manual/data/nav/main.yml index 4c26ee21e6..c9f4485c36 100644 --- a/docs/manual/data/nav/main.yml +++ b/docs/manual/data/nav/main.yml @@ -154,7 +154,7 @@ root: body: 'Architecture Overview' url: '/system/' - - body: 'Production Deployment with Cloudformation' + body: 'Production Deployment with AWS CloudFormation' url: '/system/deploy-cloudformation/' - body: 'Using Another Data Store' From 20a4c208ebb69e3978e6d92d52456c753328be31 Mon Sep 17 00:00:00 2001 From: Donald Szeto Date: Mon, 28 Mar 2016 17:22:07 -0700 Subject: [PATCH 4/5] Update Ruby version for Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a2cc237dd4..12ad02e638 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ branches: language: ruby rvm: - - 2.2.0 + - 2.2.1 gemfile: docs/manual/Gemfile From da837dab766f3b21f647cd68c341d27e8929069d Mon Sep 17 00:00:00 2001 From: Donald Szeto Date: Mon, 28 Mar 2016 17:23:17 -0700 Subject: [PATCH 5/5] Use Travis containers --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 12ad02e638..06c6b9a1e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,8 @@ rvm: gemfile: docs/manual/Gemfile +sudo: false + script: - cd docs/manual - bundle exec middleman build