Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 05C4B200C30 for ; Tue, 7 Mar 2017 19:55:09 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 0477A160B82; Tue, 7 Mar 2017 18:55:09 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 54487160B68 for ; Tue, 7 Mar 2017 19:55:08 +0100 (CET) Received: (qmail 28494 invoked by uid 500); 7 Mar 2017 18:55:07 -0000 Mailing-List: contact commits-help@predictionio.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@predictionio.incubator.apache.org Delivered-To: mailing list commits@predictionio.incubator.apache.org Received: (qmail 28435 invoked by uid 99); 7 Mar 2017 18:55:07 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Mar 2017 18:55:07 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 20ECEC3173 for ; Tue, 7 Mar 2017 18:55:07 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.568 X-Spam-Level: X-Spam-Status: No, score=-3.568 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_NEUTRAL=0.652, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 7zVo6h4ef_nd for ; Tue, 7 Mar 2017 18:55:04 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id D50085FDDC for ; Tue, 7 Mar 2017 18:55:03 +0000 (UTC) Received: (qmail 28238 invoked by uid 99); 7 Mar 2017 18:55:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Mar 2017 18:55:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D2E92DF9A3; Tue, 7 Mar 2017 18:55:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: donald@apache.org To: commits@predictionio.incubator.apache.org Date: Tue, 07 Mar 2017 18:55:07 -0000 Message-Id: <2c1a08ff51aa4e51bfd9c96de931be11@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] incubator-predictionio git commit: Merge branch 'livedoc' into develop archived-at: Tue, 07 Mar 2017 18:55:09 -0000 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/8fd59fdf Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/8fd59fdf Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/8fd59fdf Branch: refs/heads/develop Commit: 8fd59fdf1ad194e500c48dc5e333b488e7d05a7a Parents: 19c47ad 3525049 Author: Donald Szeto Authored: Tue Mar 7 10:54:53 2017 -0800 Committer: Donald Szeto Committed: Tue Mar 7 10:54:53 2017 -0800 ---------------------------------------------------------------------- docs/manual/data/nav/main.yml | 89 ++++++++++++++++++++ .../datacollection/eventmodel.html.md.erb | 2 +- docs/manual/source/gallery/templates.yaml | 14 +-- docs/manual/source/partials/_footer.html.slim | 4 +- docs/manual/source/templates/index.html.md | 11 +++ .../templates/recommendation/how-to.html.md | 1 + 6 files changed, 111 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/8fd59fdf/docs/manual/source/datacollection/eventmodel.html.md.erb ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/8fd59fdf/docs/manual/source/gallery/templates.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/8fd59fdf/docs/manual/source/templates/recommendation/how-to.html.md ----------------------------------------------------------------------