Fix broken links
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/5f7dd64e Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/5f7dd64e Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/5f7dd64e Branch: refs/heads/master Commit: 5f7dd64ee6a6e11e86f50ac488102c3268591eb3 Parents: 260fb27 Author: Thomas Bouron <[email protected]> Authored: Wed Oct 25 13:20:53 2017 +0100 Committer: Thomas Bouron <[email protected]> Committed: Wed Oct 25 13:20:53 2017 +0100 ---------------------------------------------------------------------- book.json | 8 +- guide/SUMMARY.md | 1 + guide/blueprints/java/entitlements.md | 2 +- guide/blueprints/winrm/index.md | 2 +- .../provisioned-machine-requirements.md | 6 +- guide/misc/download.md | 91 +++++++++++--------- guide/ops/logging.md | 6 +- .../going-deep-in-java-and-logs.md | 2 +- guide/start/running.md | 2 +- 9 files changed, 65 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/5f7dd64e/book.json ---------------------------------------------------------------------- diff --git a/book.json b/book.json index d44f9e5..6dbe117 100644 --- a/book.json +++ b/book.json @@ -100,11 +100,13 @@ "brooklyn_version_stable": "0.12.0", "url": { "brooklyn_website": "https://brooklyn.apache.org";, - "brooklyn_javadoc": "https://brooklyn.apache.org/v/latest/misc/javadoc"; + "brooklyn_javadoc": "https://brooklyn.apache.org/v/latest/misc/javadoc";, + "brooklyn_git": "https://github.com/apache/brooklyn/tree";, + "brooklyn_sever_git": "https://github.com/apache/brooklyn-server/tree";, + "brooklyn_library_git": "https://github.com/apache/brooklyn-library/tree"; }, "path": { "docs": "" - }, - "url_root": "http://0.0.0.0:4000"; + } } } http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/5f7dd64e/guide/SUMMARY.md ---------------------------------------------------------------------- diff --git a/guide/SUMMARY.md b/guide/SUMMARY.md index 1ef6219..29a4889 100644 --- a/guide/SUMMARY.md +++ b/guide/SUMMARY.md @@ -124,6 +124,7 @@ * [SoftwareProcess Entities](ops/troubleshooting/softwareprocess.md) * [Going Deep in Java and Logs](ops/troubleshooting/going-deep-in-java-and-logs.md) * [Monitoring Memory Usage](ops/troubleshooting/memory-usage.md) + * [Paths breakdown](ops/paths.md) * [Other 0.12.0 Resources](misc/index.md) * [Glossary](GLOSSARY.md) * [Versions](https://brooklyn.apache.org/meta/versions.html) http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/5f7dd64e/guide/blueprints/java/entitlements.md ---------------------------------------------------------------------- diff --git a/guide/blueprints/java/entitlements.md b/guide/blueprints/java/entitlements.md index 50ee35e..5d5dbe0 100644 --- a/guide/blueprints/java/entitlements.md +++ b/guide/blueprints/java/entitlements.md @@ -31,7 +31,7 @@ brooklyn.entitlements.global=org.apache.brooklyn.core.mgmt.entitlement.AcmeEntit ``` The example above refers to a sample manager which is included in the test JARs of Brooklyn, -which you can see [here]({{ book.brooklyn.url.git }}/core/src/test/java/org/apache/brooklyn/core/mgmt/entitlement/AcmeEntitlementManagerTest.java), +which you can see [here]({{book.url.brooklyn_sever_git}}/{{"master" if 'SNAPSHOT' in book.brooklyn_version else book.brooklyn_version}}/core/src/test/java/org/apache/brooklyn/core/mgmt/entitlement/AcmeEntitlementManagerTest.java), and include in your project by adding the core tests JAR to your `dropins` folder. There are some entitlements schemes which exist out of the box, so for a simpler setup, http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/5f7dd64e/guide/blueprints/winrm/index.md ---------------------------------------------------------------------- diff --git a/guide/blueprints/winrm/index.md b/guide/blueprints/winrm/index.md index cc612d3..fccbe91 100644 --- a/guide/blueprints/winrm/index.md +++ b/guide/blueprints/winrm/index.md @@ -121,7 +121,7 @@ the correct Administrator privileges: you may otherwise get an access denied err [How and Why to re-authenticate within a powershell script](#how-and-why-to-re-authenticate-within-a-powershell-script) for more details. This is only a very simple example. A more complex example can be found in the [Microsoft SQL Server blueprint in the -Brooklyn source code]({{ book.brooklyn.url.git }}/software/database/src/main/resources/org/apache/brooklyn/entity/database/mssql). +Brooklyn source code]({{book.url.brooklyn_library_git}}/{{"master" if 'SNAPSHOT' in book.brooklyn_version else book.brooklyn_version}}/software/database/src/main/resources/org/apache/brooklyn/entity/database/mssql). Tips and Tricks http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/5f7dd64e/guide/locations/provisioned-machine-requirements.md ---------------------------------------------------------------------- diff --git a/guide/locations/provisioned-machine-requirements.md b/guide/locations/provisioned-machine-requirements.md index 1967f65..f529a04 100644 --- a/guide/locations/provisioned-machine-requirements.md +++ b/guide/locations/provisioned-machine-requirements.md @@ -12,7 +12,7 @@ could cause subsequent errors if they do not hold. These relate to the machine's configuration, rather than additional networking or security that a given Cloud might offer. -Also see the [Troubleshooting]({{ site.path.guide }}/ops/troubleshooting/) docs. +Also see the [Troubleshooting]({{book.path.docs}}/ops/troubleshooting/) docs. ## Remote Access @@ -59,7 +59,7 @@ Try executing: sudo whoami ``` -See [Passwordless Sudo]({{ site.path.guide }}/locations/index.html#passwordless-sudo). +See [Passwordless Sudo]({{book.path.docs}}/locations/index.html#passwordless-sudo). ## Advertised Addresses @@ -152,7 +152,7 @@ The result should be more than 1M. If not, consider setting `installDevUrandom: true` for jclouds-based locations. -See instructions to [Increase Entropy]({{ site.path.guide }}/ops/troubleshooting/increase-entropy.html). +See instructions to [Increase Entropy]({{book.path.docs}}/ops/troubleshooting/increase-entropy.html). ## File System http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/5f7dd64e/guide/misc/download.md ---------------------------------------------------------------------- diff --git a/guide/misc/download.md b/guide/misc/download.md index 3d1c82d..df5e4c4 100644 --- a/guide/misc/download.md +++ b/guide/misc/download.md @@ -1,10 +1,17 @@ --- title: Downloads --- -# {{ page.title }} +# {{ page.title }} - {{book.url.brooklyn_download_artifact}} +{% set isSnapshot = 'SNAPSHOT' in book.brooklyn_version %} +{% set downloadPrefix %} +https://www.apache.org/dyn/closer.lua?action=download&filename=brooklyn/apache-brooklyn-{{book.brooklyn_version_stable}}/apache-brooklyn-{{book.brooklyn_version_stable}} +{% endset %} +{% set downloadHashPrefix %} +https://dist.apache.org/repos/dist/release/brooklyn/apache-brooklyn-{{book.brooklyn_version_stable}}/apache-brooklyn-{{book.brooklyn_version_stable}} +{% endset %} -{% if book.brooklyn.is_snapshot %} +{% if isSnapshot %} **The downloads on this page have not been voted on and should be used at your own risk. The latest stable release can be accessed on the [main download page]({{ book.url.brooklyn_website }}/download/).** {% endif %} @@ -13,87 +20,87 @@ The latest stable release can be accessed on the [main download page]({{ book.ur ## Download Version {{ book.brooklyn_version }} <table class="table"> - <tr> + <tr>{{downloadHashPrefix}} <th style='text-align:left'>Download</th> <th style='text-align:left'>File/Format</th> - <th>checksums <small><a href="{{ book.url.brooklyn_website }}/download/verify.html" title='Instructions on verifying the integrity of your downloads.{% if book.brooklyn.is_snapshot %} May not be available for SNAPSHOT artifacts.{% endif %}'>(?)</a></small></th> + <th>checksums <small><a href="{{book.url.brooklyn_website}}/download/verify.html" title='Instructions on verifying the integrity of your downloads.{% if isSnapshot %} May not be available for SNAPSHOT artifacts.{% endif %}'>(?)</a></small></th> </tr> <tr> <td style='text-align:left;vertical-align:top' rowspan='2'>Binary distribution<br />Server & client</td> - <td style='text-align:left'><a href='{{ book.brooklyn.download_prefix }}-bin.tar.gz' title='Download TGZ archive'>apache-brooklyn-{{ book.brooklyn_version }}-bin.tar.gz</a></td> + <td style='text-align:left'><a href='{{downloadPrefix}}-bin.tar.gz' title='Download TGZ archive'>apache-brooklyn-{{ book.brooklyn_version }}-bin.tar.gz</a></td> <td ><small> - {% if book.brooklyn.is_release %}<a href='{{ book.brooklyn.hash_download_prefix }}-bin.tar.gz.asc'>PGP</a>, {% endif %} - <a href='{{ book.hash_brooklyn.download_prefix }}-bin.tar.gz.sha1'>SHA1</a></small></td> + {% if not isSnapshot %}<a href='{{downloadHashPrefix}}-bin.tar.gz.asc'>PGP</a>, {% endif %} + <a href='{{downloadHashPrefix}}-bin.tar.gz.sha1'>SHA1</a></small></td> </tr> <tr> - <td style='text-align:left'><a href='{{ book.brooklyn.download_prefix }}-bin.zip' title='Download ZIP archive'>apache-brooklyn-{{ book.brooklyn_version }}-bin.zip</a></td> + <td style='text-align:left'><a href='{{downloadPrefix}}-bin.zip' title='Download ZIP archive'>apache-brooklyn-{{ book.brooklyn_version }}-bin.zip</a></td> <td><small> - {% if book.brooklyn.is_release %}<a href='{{ book.brooklyn.hash_download_prefix }}-bin.zip.asc'>PGP</a>, {% endif %} - <a href='{{ book.brooklyn.hash_download_prefix }}-bin.zip.sha1'>SHA1</a></small></td> + {% if not isSnapshot %}<a href='{{downloadHashPrefix}}-bin.zip.asc'>PGP</a>, {% endif %} + <a href='{{downloadHashPrefix}}-bin.zip.sha1'>SHA1</a></small></td> </tr> <tr> <td style='text-align:left;vertical-align:top'>RPM package<br />CentOS7, RHEL7, etc.</td> - <td style='text-align:left'><a href='{{ book.brooklyn.download_prefix }}-1.noarch.rpm' title='Download RPM package'>apache-brooklyn-{{ book.brooklyn_version }}-1.noarch.rpm</a></td> + <td style='text-align:left'><a href='{{downloadPrefix}}-1.noarch.rpm' title='Download RPM package'>apache-brooklyn-{{ book.brooklyn_version }}-1.noarch.rpm</a></td> <td><small> - {% if book.brooklyn.is_release %}<a href='{{ book.brooklyn.hash_download_prefix }}-1.noarch.rpm.asc'>PGP</a>, {% endif %} - <a href='{{ book.brooklyn.hash_download_prefix }}-1.noarch.rpm.sha1'>SHA1</a></small></td> + {% if not isSnapshot %}<a href='{{downloadHashPrefix}}-1.noarch.rpm.asc'>PGP</a>, {% endif %} + <a href='{{downloadHashPrefix}}-1.noarch.rpm.sha1'>SHA1</a></small></td> </tr> <tr> <td style='text-align:left;vertical-align:top'>DEB package<br />Ubuntu, Debian, etc.</td> - <td style='text-align:left'><a href='{{ book.brooklyn.download_prefix }}.deb' title='Download DEB package'>apache-brooklyn-{{ book.brooklyn_version }}.deb</a></td> + <td style='text-align:left'><a href='{{downloadPrefix}}.deb' title='Download DEB package'>apache-brooklyn-{{ book.brooklyn_version }}.deb</a></td> <td><small> - {% if book.brooklyn.is_release %}<a href='{{ book.brooklyn.hash_download_prefix }}.deb.asc'>PGP</a>, {% endif %} - <a href='{{ book.brooklyn.hash_download_prefix }}.deb.sha1'>SHA1</a></small></td> + {% if not isSnapshot %}<a href='{{downloadHashPrefix}}.deb.asc'>PGP</a>, {% endif %} + <a href='{{downloadHashPrefix}}.deb.sha1'>SHA1</a></small></td> </tr> <tr> <td style='text-align:left;vertical-align:top' rowspan='6'>Client CLI only</td> - <td style='text-align:left'><a href='{{ book.brooklyn.download_prefix }}-client-cli-linux.tar.gz' title='Download client CLI linux TGZ archive'>apache-brooklyn-{{ book.brooklyn_version }}-client-cli-linux.tar.gz</a></td> + <td style='text-align:left'><a href='{{downloadPrefix}}-client-cli-linux.tar.gz' title='Download client CLI linux TGZ archive'>apache-brooklyn-{{ book.brooklyn_version }}-client-cli-linux.tar.gz</a></td> <td ><small> - {% if book.brooklyn.is_release %}<a href='{{ book.brooklyn.hash_download_prefix }}-client-cli-linux.tar.gz.asc'>PGP</a>, {% endif %} - <a href='{{ book.hash_brooklyn.download_prefix }}-client-cli-linux.tar.gz.sha1'>SHA1</a></small></td> + {% if not isSnapshot %}<a href='{{downloadHashPrefix}}-client-cli-linux.tar.gz.asc'>PGP</a>, {% endif %} + <a href='{{downloadHashPrefix}}-client-cli-linux.tar.gz.sha1'>SHA1</a></small></td> </tr> <tr> - <td style='text-align:left'><a href='{{ book.brooklyn.download_prefix }}-client-cli-linux.zip' title='Download client CLI linux ZIP archive'>apache-brooklyn-{{ book.brooklyn_version }}-client-cli-linux.zip</a></td> + <td style='text-align:left'><a href='{{downloadPrefix}}-client-cli-linux.zip' title='Download client CLI linux ZIP archive'>apache-brooklyn-{{ book.brooklyn_version }}-client-cli-linux.zip</a></td> <td><small> - {% if book.brooklyn.is_release %}<a href='{{ book.brooklyn.hash_download_prefix }}-client-cli-linux.zip.asc'>PGP</a>, {% endif %} - <a href='{{ book.brooklyn.hash_download_prefix }}-client-cli-linux.zip.sha1'>SHA1</a></small></td> + {% if not isSnapshot %}<a href='{{downloadHashPrefix}}-client-cli-linux.zip.asc'>PGP</a>, {% endif %} + <a href='{{downloadHashPrefix}}-client-cli-linux.zip.sha1'>SHA1</a></small></td> </tr> <tr> - <td style='text-align:left'><a href='{{ book.brooklyn.download_prefix }}-client-cli-macosx.tar.gz' title='Download client CLI macosx TGZ archive'>apache-brooklyn-{{ book.brooklyn_version }}-client-cli-macosx.tar.gz</a></td> + <td style='text-align:left'><a href='{{downloadPrefix}}-client-cli-macosx.tar.gz' title='Download client CLI macosx TGZ archive'>apache-brooklyn-{{ book.brooklyn_version }}-client-cli-macosx.tar.gz</a></td> <td ><small> - {% if book.brooklyn.is_release %}<a href='{{ book.brooklyn.hash_download_prefix }}-client-cli-macosx.tar.gz.asc'>PGP</a>, {% endif %} - <a href='{{ book.hash_brooklyn.download_prefix }}-client-cli-macosx.tar.gz.sha1'>SHA1</a></small></td> + {% if not isSnapshot %}<a href='{{downloadHashPrefix}}-client-cli-macosx.tar.gz.asc'>PGP</a>, {% endif %} + <a href='{{downloadHashPrefix}}-client-cli-macosx.tar.gz.sha1'>SHA1</a></small></td> </tr> <tr> - <td style='text-align:left'><a href='{{ book.brooklyn.download_prefix }}-client-cli-macosx.zip' title='Download client CLI macosx ZIP archive'>apache-brooklyn-{{ book.brooklyn_version }}-client-cli-macosx.zip</a></td> + <td style='text-align:left'><a href='{{downloadPrefix}}-client-cli-macosx.zip' title='Download client CLI macosx ZIP archive'>apache-brooklyn-{{ book.brooklyn_version }}-client-cli-macosx.zip</a></td> <td><small> - {% if book.brooklyn.is_release %}<a href='{{ book.brooklyn.hash_download_prefix }}-client-cli-macosx.zip.asc'>PGP</a>, {% endif %} - <a href='{{ book.brooklyn.hash_download_prefix }}-client-cli-macosx.zip.sha1'>SHA1</a></small></td> + {% if not isSnapshot %}<a href='{{downloadHashPrefix}}-client-cli-macosx.zip.asc'>PGP</a>, {% endif %} + <a href='{{downloadHashPrefix}}-client-cli-macosx.zip.sha1'>SHA1</a></small></td> </tr> <tr> - <td style='text-align:left'><a href='{{ book.brooklyn.download_prefix }}-client-cli-windows.tar.gz' title='Download client CLI windows TGZ archive'>apache-brooklyn-{{ book.brooklyn_version }}-client-cli-windows.tar.gz</a></td> + <td style='text-align:left'><a href='{{downloadPrefix}}-client-cli-windows.tar.gz' title='Download client CLI windows TGZ archive'>apache-brooklyn-{{ book.brooklyn_version }}-client-cli-windows.tar.gz</a></td> <td ><small> - {% if book.brooklyn.is_release %}<a href='{{ book.brooklyn.hash_download_prefix }}-client-cli-windows.tar.gz.asc'>PGP</a>, {% endif %} - <a href='{{ book.hash_brooklyn.download_prefix }}-client-cli-windows.tar.gz.sha1'>SHA1</a></small></td> + {% if not isSnapshot %}<a href='{{downloadHashPrefix}}-client-cli-windows.tar.gz.asc'>PGP</a>, {% endif %} + <a href='{{downloadHashPrefix}}-client-cli-windows.tar.gz.sha1'>SHA1</a></small></td> </tr> <tr> - <td style='text-align:left'><a href='{{ book.brooklyn.download_prefix }}-client-cli-windows.zip' title='Download client CLI windows ZIP archive'>apache-brooklyn-{{ book.brooklyn_version }}-client-cli-windows.zip</a></td> + <td style='text-align:left'><a href='{{downloadPrefix}}-client-cli-windows.zip' title='Download client CLI windows ZIP archive'>apache-brooklyn-{{ book.brooklyn_version }}-client-cli-windows.zip</a></td> <td><small> - {% if book.brooklyn.is_release %}<a href='{{ book.brooklyn.hash_download_prefix }}-client-cli-windows.zip.asc'>PGP</a>, {% endif %} - <a href='{{ book.brooklyn.hash_download_prefix }}-client-cli-windows.zip.sha1'>SHA1</a></small></td> + {% if not isSnapshot %}<a href='{{downloadHashPrefix}}-client-cli-windows.zip.asc'>PGP</a>, {% endif %} + <a href='{{downloadHashPrefix}}-client-cli-windows.zip.sha1'>SHA1</a></small></td> </tr> <tr> <td style='text-align:left;vertical-align:top' rowspan='2'>Source code</td> - <td style='text-align:left'><a href='{{ book.brooklyn.download_prefix }}-src.tar.gz' title='Download source TGZ archive'>apache-brooklyn-{{ book.brooklyn_version }}-src.tar.gz</a></td> + <td style='text-align:left'><a href='{{downloadPrefix}}-src.tar.gz' title='Download source TGZ archive'>apache-brooklyn-{{ book.brooklyn_version }}-src.tar.gz</a></td> <td ><small> - {% if book.brooklyn.is_release %}<a href='{{ book.brooklyn.hash_download_prefix }}-src.tar.gz.asc'>PGP</a>, {% endif %} - <a href='{{ book.hash_brooklyn.download_prefix }}-src.tar.gz.sha1'>SHA1</a></small></td> + {% if not isSnapshot %}<a href='{{downloadHashPrefix}}-src.tar.gz.asc'>PGP</a>, {% endif %} + <a href='{{downloadHashPrefix}}-src.tar.gz.sha1'>SHA1</a></small></td> </tr> <tr> - <td style='text-align:left'><a href='{{ book.brooklyn.download_prefix }}-src.zip' title='Download source ZIP archive'>apache-brooklyn-{{ book.brooklyn_version }}-src.zip</a></td> + <td style='text-align:left'><a href='{{downloadPrefix}}-src.zip' title='Download source ZIP archive'>apache-brooklyn-{{ book.brooklyn_version }}-src.zip</a></td> <td><small> - {% if book.brooklyn.is_release %}<a href='{{ book.brooklyn.hash_download_prefix }}-src.zip.asc'>PGP</a>, {% endif %} - <a href='{{ book.brooklyn.hash_download_prefix }}-src.zip.sha1'>SHA1</a></small></td> + {% if not isSnapshot %}<a href='{{downloadHashPrefix}}-src.zip.asc'>PGP</a>, {% endif %} + <a href='{{downloadHashPrefix}}-src.zip.sha1'>SHA1</a></small></td> </tr> </table> @@ -137,7 +144,7 @@ If you wish to use the Apache snapshot repo, you can add this to you `pom.xml`: </repositories> ``` -{% if SNAPSHOT %} +{% if isSnapshot %} **Please note**: to add a snapshot version of Brooklyn as a dependency to your project, you must either have Brooklyn built locally or one of these snapshot repositories in your POM. {% endif %} @@ -148,7 +155,7 @@ you must either have Brooklyn built locally or one of these snapshot repositorie ## Source Code Source code is hosted at [github.com/apache/brooklyn](http://github.com/apache/brooklyn), -with this version in branch [{{ book.brooklyn.git_branch }}]({{ book.brooklyn.url.git }}). +with this version in branch [{{"master" if isSnapshot else book.brooklyn_version}}]({{book.url.brooklyn_git}}/{{"master" if isSnapshot else book.brooklyn_version}}). These locations have a `README.md` in the root which explains how to get the code including submodules. http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/5f7dd64e/guide/ops/logging.md ---------------------------------------------------------------------- diff --git a/guide/ops/logging.md b/guide/ops/logging.md index b8072c2..da6ece3 100644 --- a/guide/ops/logging.md +++ b/guide/ops/logging.md @@ -37,11 +37,11 @@ or in a new file included from this. The default `logback.xml` file references a collection of other log configuration files included in the Brooklyn jars. It is necessary to understand the source structure -in the [logback-includes]({{ book.brooklyn.url.git }}/logging/logback-includes) project. +in the [logback-includes]({{book.url.brooklyn_sever_git}}/{{"master" if 'SNAPSHOT' in book.brooklyn_version else book.brooklyn_version}}/logging/logback-includes) project. For example, to change the debug log inclusions, create a folder `brooklyn` under `conf` and create a file `logback-debug.xml` based on the -[brooklyn/logback-debug.xml]({{ book.brooklyn.url.git }}/logging/logback-includes/src/main/resources/brooklyn/logback-debug.xml) +[brooklyn/logback-debug.xml]({{book.url.brooklyn_sever_git}}/{{"master" if 'SNAPSHOT' in book.brooklyn_version else book.brooklyn_version}}/logging/logback-includes/src/main/resources/brooklyn/logback-debug.xml) from that project. @@ -75,6 +75,6 @@ which can then [feed its logs to Logstash](http://www.logstash.net/docs/1.4.2/in The following resources may be useful when configuring logging: -* The [logback-includes]({{ book.brooklyn.url.git }}/usage/logback-includes) project +* The [logback-includes]({{book.url.brooklyn_sever_git}}/{{"master" if 'SNAPSHOT' in book.brooklyn_version else book.brooklyn_version}}/logging/logback-includes) project * [Brooklyn Developer Guide]({{book.path.docs}}/dev/tips/logging.md) logging tips * The [Logback Project](http://logback.qos.ch/) home page http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/5f7dd64e/guide/ops/troubleshooting/going-deep-in-java-and-logs.md ---------------------------------------------------------------------- diff --git a/guide/ops/troubleshooting/going-deep-in-java-and-logs.md b/guide/ops/troubleshooting/going-deep-in-java-and-logs.md index f2581e4..54c302b 100644 --- a/guide/ops/troubleshooting/going-deep-in-java-and-logs.md +++ b/guide/ops/troubleshooting/going-deep-in-java-and-logs.md @@ -227,7 +227,7 @@ the entity fails to start. We can simulate this type of failure by launching Tomcat with an invalid configuration file. As seen in the previous examples, Brooklyn copies two xml configuration files to the server: `server.xml` and `web.xml` -The first few non-comment lines of `server.xml` are as follows (you can see the full file [here]({{ book.brooklyn.url.git }}/software/webapp/src/main/resources/org/apache/brooklyn/entity/webapp/tomcat/server.xml)): +The first few non-comment lines of `server.xml` are as follows (you can see the full file [here]({{book.url.brooklyn_library_git}}/{{"master" if 'SNAPSHOT' in book.brooklyn_version else book.brooklyn_version}}/software/webapp/src/main/resources/org/apache/brooklyn/entity/webapp/tomcat/server.xml)): ```xml http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/5f7dd64e/guide/start/running.md ---------------------------------------------------------------------- diff --git a/guide/start/running.md b/guide/start/running.md index f58b4bc..54f5b32 100644 --- a/guide/start/running.md +++ b/guide/start/running.md @@ -74,7 +74,7 @@ For Ubuntu and Debian users, the recommended way to install Apache Brooklyn is t The deb file is the de facto standard for packaging software on these Linux distributions and provides a mechanism for installing, upgrading and removing packages such as Apache Brooklyn. The deb package contains all the necessary files associated with the Apache Brooklyn application. {% if 'SNAPSHOT' in book.brooklyn_version %} -Download the Apache Brooklyn [deb distribution](https://repository.apache.org/service/local/artifact/maven/redirect?r=snapshots&g=org.apache.brooklyn&a=deb-packaging&v={{book.brooklyn_version}}&e=deb). +Download the Apache Brooklyn [deb distribution](https://repository.apache.org/service/local/artifact/maven/redirect?r=snapshots&g=org.apache.brooklyn&a=deb-packaging&v={{book.brooklyn_version}}&e=deb&c=all). {% else %} Download the Apache Brooklyn [deb distribution](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn_{{book.brooklyn_version}}_noarch.deb). {% endif %}
