Merge and close PR #4
diff --git a/LICENSE b/LICENSE
index ca60394..739a8a4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -214,6 +214,13 @@
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
Copyright (c) Twitter, Inc. (2012)
+This project includes the software: codemirror.js
+ Available at: http://codemirror.net/
+ Inclusive of: codemirror.{js,css}, show-hint.{js,css}, placeholder.js, anyword-hint.js, yaml.js
+ Version used: 5.11.1
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ CodeMirror (c) Marijn Haverbeke and others
+
This project includes the software: handlebars.js
Available at: https://github.com/wycats/handlebars.js
Developed by: Yehuda Katz (https://github.com/wycats/)
@@ -278,10 +285,17 @@
This project includes the software: js-yaml.js
Available at: https://github.com/nodeca/
Developed by: Vitaly Puzrin (https://github.com/nodeca/)
- Version used: 3.2.7
+ Version used: 3.5.2
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Vitaly Puzrin (2011-2015)
+This project includes the software: marked.js
+ Available at: https://github.com/chjj/marked
+ Developed by: Christopher Jeffrey (https://github.com/chjj)
+ Version used: 0.3.1
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) Christopher Jeffrey (2011-2014)
+
This project includes the software: moment.js
Available at: http://momentjs.com
Developed by: Tim Wood (http://momentjs.com)
@@ -323,17 +337,10 @@
Arpad Borsos (2012)
Used under the BSD 2-Clause license.
-This project includes the software: Swagger JS
- Available at: https://github.com/wordnik/swagger-js
- Inclusive of: swagger.js
- Version used: 1.0.1
- Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- Copyright (c) SmartBear Software (2011-2015)
-
This project includes the software: Swagger UI
- Available at: https://github.com/wordnik/swagger-ui
- Inclusive of: swagger-ui.js
- Version used: 1.0.1
+ Available at: https://github.com/swagger-api/swagger-ui
+ Inclusive of: swagger*.{js,css,html}
+ Version used: 2.1.4
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
Copyright (c) SmartBear Software (2011-2015)
diff --git a/NOTICE b/NOTICE
index f790f13..6d1f608 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Brooklyn
-Copyright 2014-2015 The Apache Software Foundation
+Copyright 2014-2016 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/README.md b/README.md
index d267935..90d13f0 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,11 @@
It supports blueprints in YAML or Java, and deploys them to many clouds and other target environments.
It monitors those deployments, maintains a live model, and runs autonomic policies to maintain their health.
-For more information visit **[ brooklyn.apache.org ]( https://brooklyn.apache.org/ )**,
+For more information visit **[brooklyn.apache.org]( https://brooklyn.apache.org/ )**,
where you'll find:
* **[ Pre-built binaries ]( https://brooklyn.apache.org/download/ )**
* **[ Getting Started instructions ]( https://brooklyn.apache.org/v/latest/start/running.html )**
-* **[ A Product Tour ](https://brooklyn.apache.org/learnmore/index.html)**
+* **[ A Product Tour ](https://brooklyn.apache.org/learnmore/)**
### Quick Start
@@ -33,27 +33,20 @@
pushd brooklyn-dist/usage/dist/target/brooklyn-dist/brooklyn/
bin/brooklyn launch
-For more on the code, sub-modules, not using sub-modules, and other topics, see below.
-
### Resources
<!--- BROOKLYN_VERSION_BELOW -->
-The **Developer Guide** contains more detail on working with the codebase. It is available for [this version/branch -- 0.9.0-SNAPSHOT](https://brooklyn.apache.org/v/0.9.0-SNAPSHOT/dev/) (permalink, also used below) or for [the latest released version](https://brooklyn.apache.org/v/latest/dev/).
+The **[Developers](https://brooklyn.apache.org/developers/)** section of the main website contains more detail on working with the codebase. There is also a more **Developer Guide** specific to each version, including [this branch (0.9.0-SNAPSHOT)](https://brooklyn.apache.org/v/0.9.0-SNAPSHOT/dev/), [latest stable](https://brooklyn.apache.org/v/latest/dev/), and [older releases](https://brooklyn.apache.org/meta/versions.html).
Useful topics include:
-<!--- BROOKLYN_VERSION_BELOW -->
-* working with the **[source code](https://brooklyn.apache.org/v/0.9.0-SNAPSHOT/dev/code)**
+* getting the **[source code](https://brooklyn.apache.org/developers/code/)**
+
+* **[setting up Git](https://brooklyn.apache.org/developers/code/git-more.html)** with forks, submodules (or alternatively [avoiding submodules](https://brooklyn.apache.org/developers/code/git-more.html#not-using-submodules)) and other productivity hints
<!--- BROOKLYN_VERSION_BELOW -->
-* using **[git sub-modules](https://brooklyn.apache.org/v/0.9.0-SNAPSHOT/dev/code/submodules.html)** effectively
+* **[project structure](https://brooklyn.apache.org/v/0.9.0-SNAPSHOT/dev/code/structure.html)** of the codebase and submodules
-<!--- BROOKLYN_VERSION_BELOW -->
-* **[avoiding](https://brooklyn.apache.org/v/0.9.0-SNAPSHOT/dev/code/no-submodules.html)** sub-modules
+* the **[people](https://brooklyn.apache.org/community/)** behind Apache Brooklyn
-<!--- BROOKLYN_VERSION_BELOW -->
-* **[project structure](https://brooklyn.apache.org/v/0.9.0-SNAPSHOT/dev/code/structure.html)**
-
-<!--- BROOKLYN_VERSION_BELOW -->
-* the **[people](https://brooklyn.apache.org/community/index.html)** behind Apache Brooklyn
