brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [10/13] incubator-brooklyn git commit: configure htmlproof (now as ruby script) to give useful info, and fix broken links
Date Tue, 20 Jan 2015 16:12:28 GMT
configure htmlproof (now as ruby script) to give useful info, and fix broken links

all internal broken links fixed!


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/48c63265
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/48c63265
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/48c63265

Branch: refs/heads/master
Commit: 48c6326560c76f564e0d004512b697bfd2e4b8a0
Parents: 3add5d2
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Tue Jan 20 14:59:56 2015 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Tue Jan 20 14:59:56 2015 +0000

----------------------------------------------------------------------
 docs/_build/build.sh                            |  25 ++++++++++---------
 docs/_build/htmlproof-brooklyn.sh               |  19 ++++++++++++++
 docs/_includes/sitemap-item.html                |   2 +-
 docs/_layouts/base.html                         |   6 ++---
 ...ooklyn-flow-websequencediagrams.com-w400.png | Bin 0 -> 58518 bytes
 .../brooklyn-flow-websequencediagrams.com.png   | Bin 0 -> 106928 bytes
 docs/guide/concepts/execution.md                |   4 +--
 .../concepts/lifecycle-managementcontext.md     |   2 +-
 docs/guide/dev/code/index.md                    |   9 ++++---
 docs/guide/dev/env/ide/index.md                 |   3 +--
 docs/guide/dev/env/maven-build.md               |   8 ++----
 docs/guide/dev/index.md                         |   2 +-
 docs/guide/dev/tips/index.md                    |   4 +--
 docs/guide/java/defining-and-deploying.md       |  16 ++++++------
 docs/guide/misc/download.md                     |  10 +++++---
 docs/guide/ops/brooklyn_properties.md           |   2 ++
 ...ooklyn-flow-websequencediagrams.com-w400.png | Bin 58518 -> 0 bytes
 .../brooklyn-flow-websequencediagrams.com.png   | Bin 106928 -> 0 bytes
 docs/guide/yaml/setting-locations.md            |   2 ++
 docs/website/community/links.md                 |  22 ----------------
 docs/website/developers/links.md                |  22 ++++++++++++++++
 docs/website/index.md                           |   3 +--
 docs/website/meta/versions.md                   |   6 +++--
 23 files changed, 96 insertions(+), 71 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/_build/build.sh
----------------------------------------------------------------------
diff --git a/docs/_build/build.sh b/docs/_build/build.sh
index cca232e..51fa197 100755
--- a/docs/_build/build.sh
+++ b/docs/_build/build.sh
@@ -32,7 +32,8 @@ function help() {
   echo "* --quick-javadoc : to do a quick javadoc build (for testing)"
   echo "* --serve : serve files from _site after building (for testing)"
   echo "* --install : install files from _site to the appropriate place in "'$'"BROOKLYN_SITE_DIR
(or ../../incubator-brooklyn-site-public)"
-  echo "* --skip-test : skip the HTML Proof run on _site"
+  echo "* --skip-htmlproof : skip the HTML Proof run on _site"
+  echo "* --quick-htmlproof : do a fast HTML Proof run on _site (not checking external links)"
   echo ""
 }
 
@@ -141,10 +142,14 @@ function parse_arguments() {
       INSTALL_AFTERWARDS=true
       shift
       ;;
-    "--skip-test")
+    "--skip-htmlproof")
       SKIP_TEST=true
       shift
       ;;
+    "--quick-htmlproof")
+      QUICK_TEST=true
+      shift
+      ;;
     *)
       echo "ERROR: invalid argument '"$1"'"
       exit 1
@@ -160,16 +165,12 @@ function test_site() {
   fi
   echo "Running htmlproof on _site"
   mkdir -p target
-  LOG="target/htmlproof.log"
-  # TODO for now exclude all javadoc; in time it would be nice to police that also
-  # (but not sure this is properly working yet)
-  htmlproof _site \
-    --href_ignore "https?://127.*" \
-    --href_ignore "https?://github.com/apache/incubator-brooklyn/edit/.*" \
-    --href_ignore "/" \
-    --alt_ignore ".*" \
-    --file_ignore ".*/javadoc/.*" \
-    2>&1 | tee $LOG
+  LOG="_build/target/htmlproof.log"
+  HTMLPROOF_OPTS=""
+  if [ "$QUICK_TEST" == "true" ]; then
+    HTMLPROOF_OPTS="$HTMLPROOF_OPTS --disable_external"
+  fi
+  _build/htmlproof-brooklyn.sh $HTMLPROOF_OPTS 2>&1 | tee $LOG
 }
 
 function make_jekyll() {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/_build/htmlproof-brooklyn.sh
----------------------------------------------------------------------
diff --git a/docs/_build/htmlproof-brooklyn.sh b/docs/_build/htmlproof-brooklyn.sh
new file mode 100755
index 0000000..ae07065
--- /dev/null
+++ b/docs/_build/htmlproof-brooklyn.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby_executable_hooks
+
+# supports --disable_external
+
+require 'html/proofer'
+
+HTML::Proofer.new("./_site", {
+  :href_ignore => [
+      /https?:\/\/127.*/,
+      /https?:\/\/github.com\/apache\/incubator-brooklyn\/edit.*/,
+      ],
+  :alt_ignore => [/.*/], 
+  # don't scan javadoc files (too many errors) 
+  # or autogen catalog items (their style files are wrong in some modes; reinstate when cleaner)
+  :disable_external => (ARGV.include? "--disable_external"),
+  :file_ignore => [ /.*\/(javadoc|apidoc|learnmore\/catalog)\/.*/ ]
+  # bug - must do above - see https://github.com/gjtorikian/html-proofer/issues/145 
+#  :file_ignore => [ /.*\/javadoc\/.*/, /.*\/learnmore\/catalog\/.*/ ]
+  }).run

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/_includes/sitemap-item.html
----------------------------------------------------------------------
diff --git a/docs/_includes/sitemap-item.html b/docs/_includes/sitemap-item.html
index eebc513..e2034f5 100644
--- a/docs/_includes/sitemap-item.html
+++ b/docs/_includes/sitemap-item.html
@@ -11,7 +11,7 @@
  {% endunless %}
 {% endunless %}
 
-<a id="{{ item_path }}"></a>
+<a id="{{ item_path }}" name="{{ item_path }}" href="javascript:void(0);"></a>
 <li>
  {% if visited contains item_path %}
   {{ item['title'] }} &nbsp; <a href="#{{ item_path }}"><span class="octicon
octicon-link-external flip"></span></a>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/_layouts/base.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/base.html b/docs/_layouts/base.html
index 6c51578..b803569 100644
--- a/docs/_layouts/base.html
+++ b/docs/_layouts/base.html
@@ -145,9 +145,9 @@ TODO insert the warning html at generation-time (jekyll) rather than runtime
(JS
                   msg += "<p>Is this deliberate?</p>";
                 }
                 msg += "<center><p class='warning_banner_buttons'>";
-                msg += "<a href = '#' onclick=\"set_user_version('"+thisversion+"');\">Yes,
hide this warning</a>";
-                msg += "<a href = '{{ site.page.guide }}'>No, take me to the latest
version guide</a>";
-                msg += "<a href = '{{ site.page.website }}/meta/versions.html'>Show
all versions</a>";
+                msg += "<a href = 'javascript:void(0);' onclick=\"set_user_version('"+thisversion+"');\">Yes,
hide this warning</a>";
+                msg += "<a href = '{{ site.path.guide }}'>No, take me to the latest
version guide</a>";
+                msg += "<a href = '{{ site.path.website }}/meta/versions.html'>Show
all versions</a>";
                 msg += "</p></center>"
                             
                 $('#page_notes').html(msg);

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/guide/concepts/brooklyn-flow-websequencediagrams.com-w400.png
----------------------------------------------------------------------
diff --git a/docs/guide/concepts/brooklyn-flow-websequencediagrams.com-w400.png b/docs/guide/concepts/brooklyn-flow-websequencediagrams.com-w400.png
new file mode 100644
index 0000000..c2b48ba
Binary files /dev/null and b/docs/guide/concepts/brooklyn-flow-websequencediagrams.com-w400.png
differ

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/guide/concepts/brooklyn-flow-websequencediagrams.com.png
----------------------------------------------------------------------
diff --git a/docs/guide/concepts/brooklyn-flow-websequencediagrams.com.png b/docs/guide/concepts/brooklyn-flow-websequencediagrams.com.png
new file mode 100644
index 0000000..78eb5c8
Binary files /dev/null and b/docs/guide/concepts/brooklyn-flow-websequencediagrams.com.png
differ

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/guide/concepts/execution.md
----------------------------------------------------------------------
diff --git a/docs/guide/concepts/execution.md b/docs/guide/concepts/execution.md
index f58f738..7b81fd0 100644
--- a/docs/guide/concepts/execution.md
+++ b/docs/guide/concepts/execution.md
@@ -1,8 +1,6 @@
 ---
 title: Execution
 layout: website-normal
-toc: ../guide_toc.json
-categories: [use, guide, defining-applications]
 ---
 
 All processing, whether an effector invocation or a policy cycle, are tracked as ***tasks***.
This allows several important capabilities:
@@ -31,6 +29,6 @@ For example, a ``TomcatServer`` may implement start and other effectors
using a
 Particularly for sensors, some technologies are used so frequently that they are
 packaged as ***feeds*** which can discover their configuration (including from drivers).
These include JMX and HTTP (see ``JmxFeed`` and ``HttpFeed``).
 
-Brooklyn comes with entity implementations for a growing number of commonly used systems,
including various web application servers, databases and NoSQL data stores, and messaging
systems. See: [Extras]({{site.path.guide}}/use/guide/extras/index.html).
+Brooklyn comes with entity implementations for a growing number of commonly used systems,
including various web application servers, databases and NoSQL data stores, and messaging
systems.
 
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/guide/concepts/lifecycle-managementcontext.md
----------------------------------------------------------------------
diff --git a/docs/guide/concepts/lifecycle-managementcontext.md b/docs/guide/concepts/lifecycle-managementcontext.md
index 84831d1..90cedcf 100644
--- a/docs/guide/concepts/lifecycle-managementcontext.md
+++ b/docs/guide/concepts/lifecycle-managementcontext.md
@@ -16,7 +16,7 @@ An application entity (``Application`` class) is responsible for starting
the de
 An ``Application``'s ``start()`` method begins provisioning the child entities of the application
(and their entities, recursively). 
 
 Provisioning of entities typically happens in parallel automatically,
-although this can be customized. This is implemented as ***tasks*** which are tracked by
the management plane and is visible in the [web-based management console]({{site.path.guide}}/use/guide/management/index.html#console).
+although this can be customized. This is implemented as ***tasks*** which are tracked by
the management plane and is accessible in the web-based management console and REST API.
 
 Customized provisioning can be useful where two starting entities depend on each other. For
example, it is often necessary to delay start of one entity until another entity reaches a
certain state, and to supply run-time information about the latter to the former.
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/guide/dev/code/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/code/index.md b/docs/guide/dev/code/index.md
index 1d4407b..6436023 100644
--- a/docs/guide/dev/code/index.md
+++ b/docs/guide/dev/code/index.md
@@ -25,11 +25,14 @@ cd usage/dist/target/brooklyn-dist/
 bin/brooklyn launch
 {% endhighlight %}
 
+{% comment %}
+TODO examples
 Plenty of examples are in the **examples** sub-dir,
 described [here]({{site.path.guide}}/use/examples).
+{% endcomment %}
 
 Information on using Brooklyn -- configuring locations (in `brooklyn.properties`) 
-and adding new projects to a catalog -- can be found in the [User's Guide]({{site.path.guide}}/use/guide/quickstart/index.html).
+and adding new projects to a catalog -- can be found in the [User's Guide]({{site.path.guide}}).
 This document is intended to help people become familiar with the codebase.
 
 ## Project Structure
@@ -74,8 +77,8 @@ Brooklyn is split into the following projects and sub-projects:
     * **scripts**: various scripts useful for building, updating, etc. (see comments in the
scripts)
     * **qa**: longevity and stress tests
     * **test-support**: provides Brooklyn-specific support for tests, used by nearly all
projects in scope ``test``
-* **``docs``**: the markdown source code for this documentation, as described [here]({{site.path.guide}}/dev/tips/update-docs.html)
-* **``examples``**: some canonical examples, as listed [here]({{site.path.guide}}/use/examples)
+* **``docs``**: the markdown source code for this documentation
+* **``examples``**: some canonical examples
 * **``sandbox``**: various projects, entities, and policies which the Brooklyn Project is
incubating
 
  

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/guide/dev/env/ide/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/env/ide/index.md b/docs/guide/dev/env/ide/index.md
index ac56a18..0dddfc1 100644
--- a/docs/guide/dev/env/ide/index.md
+++ b/docs/guide/dev/env/ide/index.md
@@ -75,9 +75,8 @@ find . \( -path "*/src/main" -or -path "*/src/test" \) -exec echo {} \;
-exec mk
   but for others (older ones) you may need to handcraft these 
   (either right-click the project in the Package Explorer and choose Configure,
   or edit the ``.project`` manually adding it to the project properties).
-  The tips [for jclouds maven-eclipse](http://www.jclouds.org/documentation/devguides/using-eclipse)
might be helpful. 
 
-If the pain starts to be too much, come find us on IRC #brooklyncentral or [elsewhere]({{site.path.guide}}/meta/contact.html)
and we can hopefully share our pearls.
+If the pain starts to be too much, come find us on IRC #brooklyncentral or [elsewhere]({{site.path.website}}/community/)
and we can hopefully share our pearls.
 (And if you have a tip we haven't mentioned please let us know that too!)
 
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/guide/dev/env/maven-build.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/env/maven-build.md b/docs/guide/dev/env/maven-build.md
index f64970a..e9b0f2e 100644
--- a/docs/guide/dev/env/maven-build.md
+++ b/docs/guide/dev/env/maven-build.md
@@ -24,12 +24,12 @@ Key things to note if you're new to Maven:
 * Add ``-DskipTests`` to skip tests. 
 
 * Run ``-PIntegration`` to run integration tests, or ``-PLive`` to run live tests
-  ([tests described here](tests.html))
+  ([tests described here](../code/tests.html))
 
 * Nearly all the gory details are in the root ``pom.xml``, which is referenced by child project
poms.
 
 * You can also open and use the code in your favourite IDE,
-  although you may hit a few **[snags](ide.html)**
+  although you may hit a few **[snags](ide/)**
   (that link has some tips for resolving them too)
 
 
@@ -72,10 +72,6 @@ If there is a good reason that a file, pattern, or directory should be
permanent
   
   ``examples/simple-web-cluster% mvnf ../../{software/webapp,usage/all}`` 
 
-* The **developers catalog** ([developers-catalog.xml](developers-catalog.xml)) uses artifacts
from your local `~/.m2/repository/...` (after building from source). This avoids unnecessary
web requests to Maven Central or Sonatype, and will allow you to work off-line.
-  
-  ``wget {{site.url_root}}{{site.path.guide}}/dev/build/developers-catalog.xml > ~/.brooklyn/catalog.xml``

-
 ## Appendix: Sample Output
 
 A healthy build will look something like the following,

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/guide/dev/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/index.md b/docs/guide/dev/index.md
index dd709de..a4f6ef9 100644
--- a/docs/guide/dev/index.md
+++ b/docs/guide/dev/index.md
@@ -8,7 +8,7 @@ breadcrumbs:
 children:
 - env/
 - code/
-- { link: "http://github.com/apache/incubating-brooklyn", title: "GitHub" }
+- { link: "http://github.com/apache/incubator-brooklyn", title: "GitHub" }
 - code/tests.md
 - tips/
 - tips/logging.md

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/guide/dev/tips/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/tips/index.md b/docs/guide/dev/tips/index.md
index e5e9eda..ac173c0 100644
--- a/docs/guide/dev/tips/index.md
+++ b/docs/guide/dev/tips/index.md
@@ -12,7 +12,7 @@ title: Miscellaneous Tips and Tricks
   
 * When debugging an entity, make sure the  [brooklyn.SSH logger](logging.html) is set to
DEBUG and accessible.
  
-* Use tests heavily!  These are pretty good to run in the IDE (once you've completed [IDE
setup]({{site.path.guide}}/dev/build/ide.html)),
+* Use tests heavily!  These are pretty good to run in the IDE (once you've completed [IDE
setup]({{site.path.guide}}/dev/env/ide/)),
   and far quicker to spot problems than runtime, plus we get early-warning of problems introduced
in the future.
   (In particular, Groovy's laxity with compilation means it is easy to introduce silly errors
which good test coverage will find much faster.)
   
@@ -36,7 +36,7 @@ title: Miscellaneous Tips and Tricks
   Clusters will take such a ``MachineProvisioningLocation`` (or a singleton list); fabircs
take a list of locations.
   Some PaaS systems have their own location model, such as ``OpenShiftLocation``.
 
-Finally, don't be shy about [talking with others]({{site.path.guide}}/meta/contact.html),

+Finally, don't be shy about [talking with others]({{site.path.website}}/community/), 
 that's far better than spinning your wheels (or worse, having a bad experience),
 plus it means we can hopefully improve things for other people!
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/guide/java/defining-and-deploying.md
----------------------------------------------------------------------
diff --git a/docs/guide/java/defining-and-deploying.md b/docs/guide/java/defining-and-deploying.md
index 4f05b0b..8f56000 100644
--- a/docs/guide/java/defining-and-deploying.md
+++ b/docs/guide/java/defining-and-deploying.md
@@ -33,8 +33,8 @@ provides a template to follow.
 
 ## Deploying the Application
 
-If you have not already done so, follow the section in the 
-[Getting Started Guide]({{site.path.guide}}/use/guide/quickstart/index.html) to create a
`brooklyn.properties` 
+If you have not already done so, follow the instructions 
+[here]({{site.path.guide}}/ops/locations/) to create a `brooklyn.properties` 
 file containing credentials for your preferred cloud provider. 
 
 To launch this application, build the project and run the `start.sh` script in the resulting
assembly:
@@ -69,17 +69,19 @@ and exposes operations ("effectors") that can be performed on entities.
 ## What Next?
  
 In addition to the sample project created by the archetype, with its README and
-`assembly` build, you can find additional code related to this example included with Brooklyn
as the ``simple-web-cluster`` example,
+`assembly` build, you can find additional code related to this example included with Brooklyn
as the ``simple-web-cluster`` example.
+{% comment %}
 described [in detail here]({{site.path.guide}}/use/examples/webcluster).
+{% endcomment %}
 
 For your applications, you might want to mix in other data stores, messaging systems, or
on-line services including PaaS.
 Brooklyn supports some of these out-of-the-box, including a wide-range of tools which it
can use Whirr to provision, such as Hadoop.
 But if you have something you don't see, 
-[let us know]({{site.path.guide}}/meta/contact.html) -- 
+[let us know]({{site.path.website}}/community/) -- 
 we want to work with you to 
-[write a new entity]({{site.path.guide}}/dev/code/entity.html) or
-[policy]({{site.path.guide}}/dev/code/policy.html) 
-and [contribute it]({{site.path.guide}}/dev/how-to-contrib.html).
+[write a new entity]({{site.path.guide}}/java/entity.html) or
+[policy]({{site.path.guide}}/java/policy.html) 
+and [contribute it]({{site.path.website}}/developers/how-to-contribute.html).
 
 
 <!--

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/guide/misc/download.md
----------------------------------------------------------------------
diff --git a/docs/guide/misc/download.md b/docs/guide/misc/download.md
index ff8f469..02bad9e 100644
--- a/docs/guide/misc/download.md
+++ b/docs/guide/misc/download.md
@@ -4,7 +4,7 @@ title: Downloads
 ---
 {% include fields.md %}
 
-First time user? The [getting started]({{ site.path.guide }}/use/guide/quickstart/index.html)
guide will walk you through downloading Brooklyn, setup of your `brooklyn.properties` and
`catalog.xml` files, and then trying the [examples](#examples). 
+First time user? The [getting started]({{ site.path.guide }}/start/) guide will walk you
through downloading Brooklyn and running an example. 
 
 ## Download Version {{ site.brooklyn-version }}
 
@@ -12,7 +12,7 @@ First time user? The [getting started]({{ site.path.guide }}/use/guide/quickstar
   <tr>
 	<th style='text-align:left'>Download</th>
 	<th style='text-align:left'>File/Format</th>
-	<th>checksums <small><a href="/meta/verify.html" title='Instructions on verifying
the integrity of your downloads.'>(?)</a></small></th>
+	<th>checksums <small><a href="{{ site.path.website }}/download/verify.html"
title='Instructions on verifying the integrity of your downloads.'>(?)</a></small></th>
   </tr>
   <tr>
 	<td style='text-align:left;vertical-align:top' rowspan='2'>Distro</td>
@@ -84,9 +84,10 @@ and [Sonatype]({{ sonatype_repo_groupid_url }}brooklyn-all/) for snapshot
versio
 
 ## Release Notes
 
-Release notes can be found [here]({{ site.path.guide }}/start/release-notes.html).
-
+Release notes can be found [here]({{ site.path.guide }}/misc/release-notes.html).
 
+{% comment %}
+TODO
 <a name="examples"></a>
 
 ## Examples
@@ -95,6 +96,7 @@ Examples can be found in the main Brooklyn codebase, in the `/examples`
director
 
 A good example to start with is the [Elastic Web Cluster]({{site.path.guide}}/use/examples/webcluster.html).
 
+{% endcomment %}
 
 <a name="maven"></a>
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/guide/ops/brooklyn_properties.md
----------------------------------------------------------------------
diff --git a/docs/guide/ops/brooklyn_properties.md b/docs/guide/ops/brooklyn_properties.md
index 0485afe..da8b848 100644
--- a/docs/guide/ops/brooklyn_properties.md
+++ b/docs/guide/ops/brooklyn_properties.md
@@ -10,6 +10,8 @@ children:
 - { section: HTTPS Configuration }
 ---
 
+{% include fields.md %}
+
 The file `~/.brooklyn/brooklyn.properties` is read when Brooklyn starts
 to load server configuration values.
 A different properties file can be specified either additionally or instead

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/guide/yaml/brooklyn-flow-websequencediagrams.com-w400.png
----------------------------------------------------------------------
diff --git a/docs/guide/yaml/brooklyn-flow-websequencediagrams.com-w400.png b/docs/guide/yaml/brooklyn-flow-websequencediagrams.com-w400.png
deleted file mode 100644
index c2b48ba..0000000
Binary files a/docs/guide/yaml/brooklyn-flow-websequencediagrams.com-w400.png and /dev/null
differ

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/guide/yaml/brooklyn-flow-websequencediagrams.com.png
----------------------------------------------------------------------
diff --git a/docs/guide/yaml/brooklyn-flow-websequencediagrams.com.png b/docs/guide/yaml/brooklyn-flow-websequencediagrams.com.png
deleted file mode 100644
index 78eb5c8..0000000
Binary files a/docs/guide/yaml/brooklyn-flow-websequencediagrams.com.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/guide/yaml/setting-locations.md
----------------------------------------------------------------------
diff --git a/docs/guide/yaml/setting-locations.md b/docs/guide/yaml/setting-locations.md
index 7f5dfc4..ab92369 100644
--- a/docs/guide/yaml/setting-locations.md
+++ b/docs/guide/yaml/setting-locations.md
@@ -5,6 +5,8 @@ toc: ../guide_toc.json
 categories: [use, guide, defining-applications]
 ---
 
+{% include fields.md %}
+
 Brooklyn supports a very wide range of target locations -- localhost is mainly a convenience
for testing.
 With deep integration to [Apache jclouds](http://jclouds.org), most well-known clouds and
cloud platforms are supported.
 The following example is for Amazon EC2:

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/website/community/links.md
----------------------------------------------------------------------
diff --git a/docs/website/community/links.md b/docs/website/community/links.md
deleted file mode 100644
index e684e1c..0000000
--- a/docs/website/community/links.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: website-normal
-title: Development Bookmarks
-menu_proxy_for: index.md
----
-
-{% include fields.md %}
-
-Handy places:
-
-* **Code** is in Github at [https://github.com/apache/incubator-brooklyn/](https://github.com/apache/incubator-brooklyn/)
-
-* **Issues** are in Jira at [https://issues.apache.org/jira/browse/BROOKLYN/](https://issues.apache.org/jira/browse/BROOKLYN/)
-
-* **Maven repositories** are:
-  * [Apache releases]({{ apache_releases_repo_groupid_url }})
-  * [Apache snapshots]({{ apache_snapshots_repo_groupid_url }})
-  * Other repositories are at [http://developers.cloudsoftcorp.com/download/maven2/](http://developers.cloudsoftcorp.com/download/maven2/)
for releases 
-  and [http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/](http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/)
for snapshots
-            
-* **CI server** is a jenkins server at: [https://builds.apache.org/job/incubator-brooklyn-master-build/](https://builds.apache.org/job/incubator-brooklyn-master-build/)
-

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/website/developers/links.md
----------------------------------------------------------------------
diff --git a/docs/website/developers/links.md b/docs/website/developers/links.md
new file mode 100644
index 0000000..e684e1c
--- /dev/null
+++ b/docs/website/developers/links.md
@@ -0,0 +1,22 @@
+---
+layout: website-normal
+title: Development Bookmarks
+menu_proxy_for: index.md
+---
+
+{% include fields.md %}
+
+Handy places:
+
+* **Code** is in Github at [https://github.com/apache/incubator-brooklyn/](https://github.com/apache/incubator-brooklyn/)
+
+* **Issues** are in Jira at [https://issues.apache.org/jira/browse/BROOKLYN/](https://issues.apache.org/jira/browse/BROOKLYN/)
+
+* **Maven repositories** are:
+  * [Apache releases]({{ apache_releases_repo_groupid_url }})
+  * [Apache snapshots]({{ apache_snapshots_repo_groupid_url }})
+  * Other repositories are at [http://developers.cloudsoftcorp.com/download/maven2/](http://developers.cloudsoftcorp.com/download/maven2/)
for releases 
+  and [http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/](http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/)
for snapshots
+            
+* **CI server** is a jenkins server at: [https://builds.apache.org/job/incubator-brooklyn-master-build/](https://builds.apache.org/job/incubator-brooklyn-master-build/)
+

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/website/index.md
----------------------------------------------------------------------
diff --git a/docs/website/index.md b/docs/website/index.md
index 1eac218..a23cac9 100644
--- a/docs/website/index.md
+++ b/docs/website/index.md
@@ -15,9 +15,8 @@ children:
   - { path: /guide/ops/index.md, title_in_menu: Operations,
       menu_customization: { dropdown_section_header: true } }
   - { path: /guide/dev/index.md, title_in_menu: Developer Guide }
-  - { path: documentation/faq.md, title_in_menu: FAQ,
+  - { path: documentation/other-docs.md, title_in_menu: Other Resources,
       menu_customization: { dropdown_new_section: true } }
-  - { path: documentation/other-docs.md, title_in_menu: Other Resources }
 - community/
 - developers/
 ---

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48c63265/docs/website/meta/versions.md
----------------------------------------------------------------------
diff --git a/docs/website/meta/versions.md b/docs/website/meta/versions.md
index 5ce3c3f..47cc32a 100644
--- a/docs/website/meta/versions.md
+++ b/docs/website/meta/versions.md
@@ -28,6 +28,8 @@ therefore **they are not endorsed by Apache** and are not hosted by Apache
or th
 You can obtain the source code by [inspecting the branches of the pre-Apache GitHub repository](https://github.com/brooklyncentral/brooklyn/branches/stale)

 and binary releases by [querying Maven Central for io.brooklyn:brooklyn.dist](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22io.brooklyn%22%20AND%20a%3A%22brooklyn-dist%22).
 
+* **[0.7.0-M1](/v/0.7.0-M1/)**: YAML, Chef, catalog, persistence (Apr 2014)
+
 * **[0.6.0](/v/0.6.0/)**: use of spec objects, chef and windows support, more clouds (Nov
2013)
 
 * **[0.5.0](/v/0.5.0/)**: includes new JS GUI and REST API, rebind/persistence support, cleaner
model and naming conventions, more entities (May 2013)
@@ -37,8 +39,8 @@ and binary releases by [querying Maven Central for io.brooklyn:brooklyn.dist](ht
 Note: To prevent accidentally referring to out-of-date information,
 a banner is displayed when accessing content from specific versions in the archive.
 You may 
-<a href="#" onclick="set_user_versions_all();">disable all warnings</a> or
-<a href="#" onclick="clear_user_versions();">re-enable all warnings</a>.
+<a href="javascript:void(0);" onclick="set_user_versions_all();">disable all warnings</a>
or
+<a href="javascript:void(0);" onclick="clear_user_versions();">re-enable all warnings</a>.
 
 
 ### Versioning


Mime
View raw message