Repository: incubator-brooklyn Updated Branches: refs/heads/master 3f44d56a0 -> ab88260c7
Change brooklyn.incubator.apache.org URLs ...to new site brooklyn.apache.org Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ab88260c Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ab88260c Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ab88260c Branch: refs/heads/master Commit: ab88260c76727eec94de24b1afdc27eb5b27573d Parents: de01e02 Author: Richard Downer <[email protected]> Authored: Mon Nov 23 22:43:40 2015 +0000 Committer: Richard Downer <[email protected]> Committed: Mon Nov 23 22:56:20 2015 +0000 ---------------------------------------------------------------------- docs/README.md | 6 +++--- docs/_build/config-production.yml | 4 ++-- docs/guide/dev/index.md | 2 +- docs/website/community/how-to-contribute-docs.md | 4 ++-- .../developers/committers/release-process/announce.md | 8 ++++---- docs/website/learnmore/catalog/index.html | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ab88260c/docs/README.md ---------------------------------------------------------------------- diff --git a/docs/README.md b/docs/README.md index 22c8697..0ca223f 100644 --- a/docs/README.md +++ b/docs/README.md @@ -11,8 +11,8 @@ familiarise yourself with the standard workflow for Apache Brooklyn: * [Guide for contributors][CONTRIB] * [Guide for committers][COMMIT] -[CONTRIB]: https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html -[COMMIT]: https://brooklyn.incubator.apache.org/developers/committers/index.html +[CONTRIB]: https://brooklyn.apache.org/community/how-to-contribute-docs.html +[COMMIT]: https://brooklyn.apache.org/developers/committers/index.html Workstation Setup @@ -131,7 +131,7 @@ The two micro-sites above are installed on the live website as follows: * `/v/<version>`: contains specific versions of the guide, with the special folder `/v/latest` containing the recent preferred stable/milestone version -The site itself is hosted at `brooklyn.incubator.apache.org` with a `CNAME` +The site itself is hosted at `brooklyn.apache.org` with a `CNAME` record from `brooklyn.io`. Content is published to the site by updating an http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ab88260c/docs/_build/config-production.yml ---------------------------------------------------------------------- diff --git a/docs/_build/config-production.yml b/docs/_build/config-production.yml index 277641a..445b7a1 100644 --- a/docs/_build/config-production.yml +++ b/docs/_build/config-production.yml @@ -1,6 +1,6 @@ # in production we always set the URL and dependencies should come from the remote source -url: https://brooklyn.incubator.apache.org -url_root: https://brooklyn.incubator.apache.org +url: https://brooklyn.apache.org +url_root: https://brooklyn.apache.org dependency_mode: remote http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ab88260c/docs/guide/dev/index.md ---------------------------------------------------------------------- diff --git a/docs/guide/dev/index.md b/docs/guide/dev/index.md index 450055a..e2d3ed7 100644 --- a/docs/guide/dev/index.md +++ b/docs/guide/dev/index.md @@ -15,7 +15,7 @@ children: - tips/logging.md - tips/debugging-remote-brooklyn.md - rest/rest-api-doc.md -- { link: "http://brooklyn.incubator.apache.org/v/latest/misc/javadoc";, title: "Javadoc" } +- { link: "https://brooklyn.apache.org/v/latest/misc/javadoc";, title: "Javadoc" } --- {% comment %} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ab88260c/docs/website/community/how-to-contribute-docs.md ---------------------------------------------------------------------- diff --git a/docs/website/community/how-to-contribute-docs.md b/docs/website/community/how-to-contribute-docs.md index 51da1f3..2873c3a 100644 --- a/docs/website/community/how-to-contribute-docs.md +++ b/docs/website/community/how-to-contribute-docs.md @@ -49,8 +49,8 @@ In particular, note that the Brooklyn documentation is split into two parts: - **Version-specific user guide**. These pages have a URL with a path that begins /v/*version-number*: for example, - https://brooklyn.incubator.apache.org/v/0.8.0-incubating and {% comment %}BROOKLYN_VERSION{% endcomment %} - the special *latest* set at https://brooklyn.incubator.apache.org/v/latest. Content for this is in the `guide` directory. + https://brooklyn.apache.org/v/0.8.0-incubating and {% comment %}BROOKLYN_VERSION{% endcomment %} + the special *latest* set at https://brooklyn.apache.org/v/latest. Content for this is in the `guide` directory. The main user guide shown on this site is for the most recent stable version, currently {{ site.brooklyn-stable-version }}. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ab88260c/docs/website/developers/committers/release-process/announce.md ---------------------------------------------------------------------- diff --git a/docs/website/developers/committers/release-process/announce.md b/docs/website/developers/committers/release-process/announce.md index 81ee49b..f982631 100644 --- a/docs/website/developers/committers/release-process/announce.md +++ b/docs/website/developers/committers/release-process/announce.md @@ -15,7 +15,7 @@ Brooklyn 0.7.0-incubating. Apache Brooklyn is a framework for modelling, monitoring, and managing applications through autonomic blueprints. More details on Apache Brooklyn -can be found at http://brooklyn.incubator.apache.org/ +can be found at https://brooklyn.apache.org/ Version 0.7.0 is a major step for Apache Brooklyn. It is the first full release of the project as part of the Apache incubator. @@ -27,13 +27,13 @@ As well as a source code release, we offer a full binary distribution download, and a full set of Maven artifacts for developers. Release notes: -https://brooklyn.incubator.apache.org/v/0.7.0-incubating/misc/release-notes.html +https://brooklyn.apache.org/v/0.7.0-incubating/misc/release-notes.html Download: -https://brooklyn.incubator.apache.org/download/ +https://brooklyn.apache.org/download/ User guide: -https://brooklyn.incubator.apache.org/v/0.7.0-incubating/ +https://brooklyn.apache.org/v/0.7.0-incubating/ Maven artifacts have also been made available on repository.apache.org and Maven Central. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ab88260c/docs/website/learnmore/catalog/index.html ---------------------------------------------------------------------- diff --git a/docs/website/learnmore/catalog/index.html b/docs/website/learnmore/catalog/index.html index 0ef8d95..10257c0 100644 --- a/docs/website/learnmore/catalog/index.html +++ b/docs/website/learnmore/catalog/index.html @@ -37,7 +37,7 @@ under the License. <div id="container"> <div id="header"> <div id="identity"> - <a href="https://brooklyn.incubator.apache.org/"; rel="home">Brooklyn</a> + <a href="https://brooklyn.apache.org/"; rel="home">Brooklyn</a> </div> </div>
