Return-Path: X-Original-To: apmail-brooklyn-dev-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B85DAC729 for ; Wed, 17 Dec 2014 16:31:06 +0000 (UTC) Received: (qmail 87664 invoked by uid 500); 17 Dec 2014 16:31:06 -0000 Delivered-To: apmail-brooklyn-dev-archive@brooklyn.apache.org Received: (qmail 87630 invoked by uid 500); 17 Dec 2014 16:31:06 -0000 Mailing-List: contact dev-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 dev@brooklyn.incubator.apache.org Received: (qmail 87616 invoked by uid 99); 17 Dec 2014 16:31:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Dec 2014 16:31:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_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; Wed, 17 Dec 2014 16:31:04 +0000 Received: (qmail 75979 invoked by uid 99); 17 Dec 2014 16:29:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Dec 2014 16:29:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BEA1882EDD1; Wed, 17 Dec 2014 16:29:28 +0000 (UTC) From: ahgittin To: dev@brooklyn.incubator.apache.org Reply-To: dev@brooklyn.incubator.apache.org References: In-Reply-To: Subject: [GitHub] incubator-brooklyn pull request: merging website docs into brookly... Content-Type: text/plain Message-Id: <20141217162928.BEA1882EDD1@tyr.zones.apache.org> Date: Wed, 17 Dec 2014 16:29:28 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org GitHub user ahgittin reopened a pull request: https://github.com/apache/incubator-brooklyn/pull/398 merging website docs into brooklyn docs, with versioned things (the content wot woz here) into "guide" completed, i think @rdowner can you have a look now? i know there's a lot, but mostly dumb stuff, updating brooklyncentral links and download links when done i think we want to: * merge https://github.com/apache/incubator-brooklyn-site/pull/18 * request https://github.com/apache/incubator-brooklyn-site/pull/19 be applied to brooklyn (btw we had two brooklyn.properties, this is now fixed) * DONE - install latest version w snapshot docs into svn * DONE - install old versions into svn * DONE - brooklyncentral.github.com html page should redirect to brooklyn.io * request deletion of incubator-brooklyn-site on github (update: i didn't mean to push svn site but i forgot svn ci is git ci plus git push :( -- it's going live, still uploading but should be finished soon) You can merge this pull request into a Git repository by running: $ git pull https://github.com/ahgittin/incubator-brooklyn docs-merge Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-brooklyn/pull/398.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #398 ---- commit 04474d3a04577de6b662ad6f3168356c07b964e1 Author: Alex Heneveld Date: 2014-12-15T11:10:40Z rename layout to guide-normal commit 1868e660beeeeac3cb1000a720ed3e5fecef5130 Author: Alex Heneveld Date: 2014-12-15T11:25:32Z move tests and build things to _build commit e1bd9bd9c60fb455ddb7423097375a297ea9ded5 Author: Alex Heneveld Date: 2014-12-15T11:37:32Z move deps to deps dir; and upgrade to jquery 2.1.1 (as used in main website) and install bootstrap (also used for main website) commit 3eb9c9f3062f2e06d3de266fdf2d6ffe6bb0895e Author: Alex Heneveld Date: 2014-12-15T11:47:43Z restructure css and images for guide (versioned files) to align with main website commit 28db336c5721d239ced32204a2af748d03875829 Author: Alex Heneveld Date: 2014-12-15T11:51:40Z add bootstrap fonts, and point to subdir of deps for clean isolation commit a78cd74816044247553108eb0604632f9c98cce9 Author: Alex Heneveld Date: 2014-12-15T16:42:36Z add underscore libs used by main website (in prep for import) commit ba6612ecdb0427a5350c5a62f56c23b019f3a590 Author: Alex Heneveld Date: 2014-12-15T16:54:07Z move version-specific things to "guide" "guide" is where versioned content will live when primary website is moved in (to "website" dir); note this does not yet build; update fixing that to follow commit 2ac0c6d67eae1eeee6cb34827aaa1fdb1b67f11a Author: Alex Heneveld Date: 2014-12-15T16:56:12Z fix paths and links so that guide/ subdir build works nicely commit 2b8a4910fad5a7a4edff1f2665c6c38cde4a0a5c Author: Alex Heneveld Date: 2014-12-15T21:12:58Z use Pathname ruby api in plugin so relative paths are resolved better commit 4824a945d978e72d6977a295263638d9c7e4c598 Author: Alex Heneveld Date: 2014-12-15T21:50:41Z ensure host is included when needed commit f03feef9d98cd53bb6f9baca28651f965c68976b Author: Alex Heneveld Date: 2014-12-15T22:07:59Z tidy up config.yml comments, and set encoding utf-8 so accents etc work commit ff06bfe11acf56aa6fe3ab031b445dcaf517327a Author: Alex Heneveld Date: 2014-12-16T09:26:26Z new build script which can write docs to root, to /guide, or to /v/VERSION commit b86cbf049bb3277ac444b8529edf35fab37e2368 Author: Alex Heneveld Date: 2014-12-16T10:40:10Z add website files, and update the build.sh script appropriately commit 09b7b58e6ed5d9cd3e9b7c95e720309285e73f89 Author: Alex Heneveld Date: 2014-12-16T10:52:52Z install javadoc to the right place commit 08068213e1bd5cb6f223c89a1363010b37805c92 Author: Alex Heneveld Date: 2014-12-16T17:07:34Z updated README and added options to build.sh for building the website, guide, or both and corresponding `_build/config-*` files and tweaks elsewhere commit d6cfde4060e9ff06d62bbb5bc4378ac72c980d1b Author: Alex Heneveld Date: 2014-12-16T19:03:39Z serve static content from `_site` using the new `--serve` option experimented with using file urls so files could be read directly in the browser (as @rdowner had done with `build-preview` in the original website), but the `url` and `baseurl` are not inserted everywhere (and since we prefer relative links we probably don't want them everywhere, and filesystem doesn't work nicely in ``)), so that doesn't work too well; serving is a nice and simple option commit be3bdd7b6e68e24d269e6a4c87a2bed255c5683e Author: Alex Heneveld Date: 2014-12-16T19:58:14Z add `--install` option and updated README, so website is automatically installed to svn staging area commit 19d29158103598eb029bd7fb0bfa5b8f485545d0 Author: Alex Heneveld Date: 2014-12-17T00:37:45Z update Gemfile and move to root commit 4fc20766a60dbd14181816afb523c4a791e93362 Author: Alex Heneveld Date: 2014-12-17T00:56:48Z tidy build script commit e8c107385974b9a06eb7f4b68d85ac4727f59524 Author: Alex Heneveld Date: 2014-12-17T00:59:57Z fix "edit this page" link commit f8521f4e237c27245c0c851bb4ab0c02df74eeca Author: Alex Heneveld Date: 2014-12-17T01:15:21Z minor website tidy -- capitalization consistency mostly commit c3bf7215604f96b4dcccc922d8d1415e9c5991a3 Author: Alex Heneveld Date: 2014-12-17T01:46:44Z improve the links between website and guide commit ddcd1cfeb956c162427937e7e456a6b8d5a05b6d Author: Alex Heneveld Date: 2014-12-17T09:27:26Z update the docs on the docs themselves add info on the docs plugins/code to docs README, and update/simplify the documentation re docs in the website and guide; more desired on this latter but the minimum has been done here I think commit 816f80369514ea3a14bd0944ae9c613b571ea801 Author: Alex Heneveld Date: 2014-12-17T09:49:04Z fix formatting of download page (new markdown processor) commit d3c0469df2d9113a88b3e26e8b10f8ca48e7bc57 Author: Alex Heneveld Date: 2014-12-17T11:05:48Z update javadoc datestamp and simplify it, and remove old stuff from help file commit 2373c35299c835d24daea0b31141bcd07494d60b Author: Alex Heneveld Date: 2014-12-17T11:06:25Z put content in release notes the template looked foolish (insincere thanks!), plus we are best off updating this as we go along i think commit e23af8de5b0559fe9e28d3d4e3cda0edc0cb38ce Author: Alex Heneveld Date: 2014-12-17T11:07:19Z fix download links in guide commit 767d3d18aeff00e51010424a2ae5ac59ad2ad60c Author: Alex Heneveld Date: 2014-12-17T11:15:43Z add a link on the download page to the latest version snapshot download page commit ef5944790a87c157d9aff9e684ee9af77ba82353 Author: Alex Heneveld Date: 2014-12-17T12:12:32Z replace references to brooklyncentral repo and examples and other old things commit a2d916091f2b277f355913c009df2c01b7c50862 Author: Alex Heneveld Date: 2014-12-17T12:36:45Z add support for previewing the public site ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---