You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/02/03 17:43:43 UTC

[1/3] brooklyn-docs git commit: Corrections to Getting Started & Vagrant URL

Repository: brooklyn-docs
Updated Branches:
  refs/heads/master 3dfa639ca -> ea07b78d6


Corrections to Getting Started & Vagrant URL


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

Branch: refs/heads/master
Commit: cd5628b37abc19b8ba23bc520102a424c8c2e9a6
Parents: 1ff8161
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Wed Feb 3 11:41:08 2016 +0000
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Wed Feb 3 11:41:08 2016 +0000

----------------------------------------------------------------------
 _includes/base-head.html | 8 +++++---
 guide/start/running.md   | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/cd5628b3/_includes/base-head.html
----------------------------------------------------------------------
diff --git a/_includes/base-head.html b/_includes/base-head.html
index 3f79d02..18c2c6f 100644
--- a/_includes/base-head.html
+++ b/_includes/base-head.html
@@ -7,17 +7,18 @@
 <link href="{% dependency_url bootstrap.css %}" rel="stylesheet">
 <link href="{{site.path.style}}/deps/octicons/octicons.css" rel="stylesheet">
 <link href="{{site.path.style}}/deps/bootstrap-theme.css" rel="stylesheet">
-<link href="{{site.path.style}}/deps/tooltip.css" rel="stylesheet">
 
 <link rel="stylesheet" href="{{ site.path.style }}/css/code.css" type="text/css" media="screen" />
 
 <link href="{{site.path.style}}/css/website.css" rel="stylesheet">
 
 <script src="{% dependency_url jquery.js %}"></script>
-<script src="{{ site.path.style }}/deps/glossarizer.js"></script>
 <script src="{% dependency_url bootstrap.js %}"></script>
-<script src="{{ site.path.style }}/deps/tooltip.js"></script>
 <script type="text/javascript" src="{{ site.path.style }}/deps/jquery.cookie.js"></script>
+{% if page.url contains "/start/" %}
+<link href="{{site.path.style}}/deps/tooltip.css" rel="stylesheet">
+<script type="text/javascript" src="{{ site.path.style }}/deps/glossarizer.js"></script>
+<script type="text/javascript" src="{{ site.path.style }}/deps/tooltip.js"></script>
 <script>
 $(function(){
   $('body').glossarizer({
@@ -28,3 +29,4 @@ $(function(){
   });
 });
 </script>
+{% endif %}

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/cd5628b3/guide/start/running.md
----------------------------------------------------------------------
diff --git a/guide/start/running.md b/guide/start/running.md
index 5da792c..636887b 100644
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@ -31,13 +31,13 @@ Firstly, download and install:
  * [Vagrant](http://www.vagrantup.com/downloads){:target="_blank"}
  * [Oracle VirtualBox](https://www.virtualbox.org/wiki/Downloads){:target="_blank"}
  
-Then download the default Apache Brooklyn vagrant configuration from [here](https://github.com/johnmccabe/vagrant-brooklyn-getting-started/archive/master.tar.gz){:target="_blank"}. This configuration contains everything you need to get started using Apache Brooklyn.
+Then download the default Apache Brooklyn vagrant configuration from [here](https://www.apache.org/dyn/closer.lua?action=download&filename=brooklyn/apache-brooklyn-{{site.brooklyn-version}}/apache-brooklyn-{{site.brooklyn-version}}-vagrant.tar.gz){:target="_blank"}. This configuration contains everything you need to get started using Apache Brooklyn.
 
-Extract the `tar.gz` archive and navigate into the expanded `vagrant-brooklyn-getting-started-master` folder
+Extract the `tar.gz` archive and navigate into the expanded `apache-brooklyn-{{site.brooklyn-version}}-vagrant` folder
 
 {% highlight bash %}
-$ tar xvf master.tar.gz
-$ cd vagrant-brooklyn-getting-started-master
+$ tar xvf apache-brooklyn-{{site.brooklyn-version}}-vagrant.tar.gz
+$ cd apache-brooklyn-{{site.brooklyn-version}}-vagrant
 {% endhighlight %}

[3/3] brooklyn-docs git commit: This closes #7

Posted by al...@apache.org.
This closes #7


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

Branch: refs/heads/master
Commit: ea07b78d6456469147a162b29005dce246d32e9a
Parents: 3dfa639 f9594c3
Author: Aled Sage <al...@gmail.com>
Authored: Wed Feb 3 16:43:33 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Feb 3 16:43:33 2016 +0000

----------------------------------------------------------------------
 _includes/base-head.html |  8 +++++---
 guide/start/running.md   | 10 +++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ea07b78d/guide/start/running.md
----------------------------------------------------------------------
diff --cc guide/start/running.md
index 5871c4d,2e5b650..ed78028
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@@ -28,16 -28,16 +28,16 @@@ the easiest way of getting started wit
  
  Firstly, download and install:
  
 - * [Vagrant](http://www.vagrantup.com/downloads){:target="_blank"}
 + * [Vagrant](https://www.vagrantup.com/downloads.html){:target="_blank"}
   * [Oracle VirtualBox](https://www.virtualbox.org/wiki/Downloads){:target="_blank"}
   
- Then download the default Apache Brooklyn vagrant configuration from [here](https://github.com/johnmccabe/vagrant-brooklyn-getting-started/archive/master.tar.gz){:target="_blank"}. This configuration contains everything you need to get started using Apache Brooklyn.
+ Then download the provided Apache Brooklyn vagrant configuration from [here](https://www.apache.org/dyn/closer.lua?action=download&filename=brooklyn/apache-brooklyn-{{site.brooklyn-version}}/apache-brooklyn-{{site.brooklyn-version}}-vagrant.tar.gz){:target="_blank"}. This archive contains everything you need to create an environment for use with this guide, providing an Apache Brooklyn instance and some blank VMs.
  
- Extract the `tar.gz` archive and navigate into the expanded `vagrant-brooklyn-getting-started-master` folder
+ Extract the `tar.gz` archive and navigate into the expanded `apache-brooklyn-{{site.brooklyn-version}}-vagrant` folder
  
  {% highlight bash %}
- $ tar xvf master.tar.gz
- $ cd vagrant-brooklyn-getting-started-master
+ $ tar xvf apache-brooklyn-{{site.brooklyn-version}}-vagrant.tar.gz
+ $ cd apache-brooklyn-{{site.brooklyn-version}}-vagrant
  {% endhighlight %}

[2/3] brooklyn-docs git commit: Changed wording

Posted by al...@apache.org.
Changed wording


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

Branch: refs/heads/master
Commit: f9594c3e7731ef190120effca66edcaa30c2e92d
Parents: cd5628b
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Wed Feb 3 12:02:23 2016 +0000
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Wed Feb 3 12:02:23 2016 +0000

----------------------------------------------------------------------
 guide/start/running.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/f9594c3e/guide/start/running.md
----------------------------------------------------------------------
diff --git a/guide/start/running.md b/guide/start/running.md
index 636887b..2e5b650 100644
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@ -23,7 +23,7 @@ Two methods of deployment are detailed in this tutorial, using virtualisation wi
 <div class="tab-content">
 <div id="impl-1" class="tab-pane fade in active">
 
-[Vagrant](https://www.vagrantup.com/){:target="_blank"} is a software package which automates the process of setting up virtual environments such as [Oracle VirtualBox](https://www.virtualbox.org){:target="_blank"}. We recommend it as
+[Vagrant](https://www.vagrantup.com/){:target="_blank"} is a software package which automates the process of setting up virtual machines (VM) such as [Oracle VirtualBox](https://www.virtualbox.org){:target="_blank"}. We recommend it as
 the easiest way of getting started with Apache Brooklyn.
 
 Firstly, download and install:
@@ -31,7 +31,7 @@ Firstly, download and install:
  * [Vagrant](http://www.vagrantup.com/downloads){:target="_blank"}
  * [Oracle VirtualBox](https://www.virtualbox.org/wiki/Downloads){:target="_blank"}
  
-Then download the default Apache Brooklyn vagrant configuration from [here](https://www.apache.org/dyn/closer.lua?action=download&filename=brooklyn/apache-brooklyn-{{site.brooklyn-version}}/apache-brooklyn-{{site.brooklyn-version}}-vagrant.tar.gz){:target="_blank"}. This configuration contains everything you need to get started using Apache Brooklyn.
+Then download the provided Apache Brooklyn vagrant configuration from [here](https://www.apache.org/dyn/closer.lua?action=download&filename=brooklyn/apache-brooklyn-{{site.brooklyn-version}}/apache-brooklyn-{{site.brooklyn-version}}-vagrant.tar.gz){:target="_blank"}. This archive contains everything you need to create an environment for use with this guide, providing an Apache Brooklyn instance and some blank VMs.
 
 Extract the `tar.gz` archive and navigate into the expanded `apache-brooklyn-{{site.brooklyn-version}}-vagrant` folder