Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/dd77e93b Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/dd77e93b Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/dd77e93b Branch: refs/heads/master Commit: dd77e93b6902a0b9fb0f375a8c4ae864890679ed Parents: 7ec32e4 a9ca113 Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Thu Mar 10 11:49:36 2016 +0000 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Thu Mar 10 11:49:36 2016 +0000 ---------------------------------------------------------------------- README.md | 8 +- _build/build-pdf.sh | 29 ++ _build/build.sh | 6 +- _build/buildPDF.sh | 28 -- _plugins/page_structure.rb | 220 ++++++++++ _plugins/site_structure.rb | 29 ++ contributing/index.md | 15 + contributing/inline-children.md | 54 +++ contributing/ordering.md | 48 ++ contributing/pdf-manual.md | 58 +++ contributing/site-structure.md | 29 ++ guide/ops/locations/byon.md | 74 ++++ guide/ops/locations/clouds.md | 248 +++++++++++ guide/ops/locations/index.md | 439 +------------------ .../inheritance-and-named-locations.md | 80 ++++ guide/ops/locations/localhost.md | 33 ++ guide/ops/locations/more-clouds.md | 8 +- guide/ops/locations/more-locations.md | 55 --- guide/ops/locations/special-locations.md | 54 +++ guide/ops/locations/ssh-keys.md | 13 +- guide/ops/locations/vpc-issues.md | 32 -- guide/start/policies.md | 95 +++- style/css/printable.css | 9 + style/css/singlePage.css | 12 + 24 files changed, 1099 insertions(+), 577 deletions(-) ----------------------------------------------------------------------
