You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by ta...@apache.org on 2017/08/29 01:06:49 UTC
[1/2] incubator-predictionio git commit: Update eventmodel.html.md.erb
Repository: incubator-predictionio
Updated Branches:
refs/heads/develop 6789dbeb7 -> 08ebd6b55
Update eventmodel.html.md.erb
Closes #422
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/350b183c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/350b183c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/350b183c
Branch: refs/heads/develop
Commit: 350b183cacb96122dd3136f48c731f3ac17aa57c
Parents: 8e96d1b
Author: Nilmax Moura <ni...@gmail.com>
Authored: Tue Aug 29 10:03:06 2017 +0900
Committer: Naoki Takezoe <ta...@apache.org>
Committed: Tue Aug 29 10:04:45 2017 +0900
----------------------------------------------------------------------
docs/manual/source/datacollection/eventmodel.html.md.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/350b183c/docs/manual/source/datacollection/eventmodel.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/manual/source/datacollection/eventmodel.html.md.erb b/docs/manual/source/datacollection/eventmodel.html.md.erb
index f40880c..47aee72 100644
--- a/docs/manual/source/datacollection/eventmodel.html.md.erb
+++ b/docs/manual/source/datacollection/eventmodel.html.md.erb
@@ -25,7 +25,7 @@ This section explains how to model your application data as events.
For example, your application may have users and some items which the user can interact with. Then you can model them as two entity types: **user** and **item** and the entityId can uniquely identify the entity within each entityType (e.g. user with ID 1, item with ID 1).
-An entity may peform some events (e.g user 1 does something), and entity may have properties associated with it (e.g. user may have gender, age, email etc). Hence, **events** involve **entities** and there are two types of events, respectively:
+An entity may peform some events (e.g user 1 does something), and entity may have properties associated with it (e.g. user may have gender, age, email etc). Hence, **events** involve **entities** and there are three types of events, respectively:
1. Generic events performed by an entity.
2. Special events for recording changes of an entity's properties
[2/2] incubator-predictionio git commit: Merge branch 'livedoc' into
develop
Posted by ta...@apache.org.
Merge branch 'livedoc' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/08ebd6b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/08ebd6b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/08ebd6b5
Branch: refs/heads/develop
Commit: 08ebd6b5538b09be303915c9487725f24b5675af
Parents: 6789dbe 350b183
Author: Naoki Takezoe <ta...@apache.org>
Authored: Tue Aug 29 10:06:34 2017 +0900
Committer: Naoki Takezoe <ta...@apache.org>
Committed: Tue Aug 29 10:06:34 2017 +0900
----------------------------------------------------------------------
docs/manual/source/datacollection/eventmodel.html.md.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/08ebd6b5/docs/manual/source/datacollection/eventmodel.html.md.erb
----------------------------------------------------------------------