Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9A60911254 for ; Mon, 15 Sep 2014 16:20:35 +0000 (UTC) Received: (qmail 91651 invoked by uid 500); 15 Sep 2014 16:20:35 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 91628 invoked by uid 500); 15 Sep 2014 16:20:35 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 91619 invoked by uid 99); 15 Sep 2014 16:20:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Sep 2014 16:20:35 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 15 Sep 2014 16:20:29 +0000 Received: (qmail 91107 invoked by uid 99); 15 Sep 2014 16:20:09 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Sep 2014 16:20:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9A2C5A13A15; Mon, 15 Sep 2014 16:20:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: richard@apache.org To: commits@brooklyn.incubator.apache.org Date: Mon, 15 Sep 2014 16:20:13 -0000 Message-Id: <1c2314e6dfd346dfade6d82cebd17c8b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/10] git commit: Merge and close #9 X-Virus-Checked: Checked by ClamAV on apache.org Merge and close #9 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/commit/0b05f7ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/tree/0b05f7ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/diff/0b05f7ac Branch: refs/heads/master Commit: 0b05f7ac02921871d57d82cda9576e895e528b06 Parents: 7505612 ebc709c Author: Richard Downer Authored: Mon Sep 15 14:38:17 2014 +0100 Committer: Richard Downer Committed: Mon Sep 15 14:38:17 2014 +0100 ---------------------------------------------------------------------- community/index.md | 8 ++-- documentation.md | 2 + glossary.md | 92 +++++++++++++++++++++++++++++++++++++++ learnmore.md | 4 +- learnmore/catalog/index.html | 14 +++--- 5 files changed, 108 insertions(+), 12 deletions(-) ----------------------------------------------------------------------