brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [01/10] brooklyn-docs git commit: Renamed files & scripts
Date Thu, 25 Feb 2016 15:39:39 GMT
Repository: brooklyn-docs
Updated Branches:
  refs/heads/master 7d24e76b3 -> c87b43fbb


Renamed files & scripts


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

Branch: refs/heads/master
Commit: 70c731f48844907615f2e82b7cfcfe359da86ca3
Parents: 5985336
Author: Duncan Godwin <duncan.godwin@cloudsoftcorp.com>
Authored: Mon Feb 8 12:10:32 2016 +0000
Committer: Duncan Godwin <duncan.godwin@cloudsoftcorp.com>
Committed: Thu Feb 25 14:50:25 2016 +0000

----------------------------------------------------------------------
 README.md              |  2 ++
 _build/build.sh        |  4 ++--
 _config.yml            |  7 ++++++-
 singlePageManual.html  | 26 --------------------------
 singlePageStarted.html | 25 -------------------------
 zoneMergeManual.html   | 28 ++++++++++++++++++++++++++++
 zoneMergeStarted.html  | 27 +++++++++++++++++++++++++++
 7 files changed, 65 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/70c731f4/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 9f2465b..5b6cf54 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,8 @@ Some issues we've encountered are:
    (more details [here](http://www.nokogiri.org/tutorials/installing_nokogiri.html))
  * on Ubuntu, `sudo apt-get install libxslt-dev libxml2-dev`
 
+If you are building the PDF documentation, this requires [wkhtmltopdf](http://wkhtmltopdf.org/).

+You can download it from [here](http://wkhtmltopdf.org/downloads.html) or use the usual apt-get
/ yum / brew.
 
 Seeing the Website and Docs
 ---------------------------

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/70c731f4/_build/build.sh
----------------------------------------------------------------------
diff --git a/_build/build.sh b/_build/build.sh
index ee3d331..7b734d5 100755
--- a/_build/build.sh
+++ b/_build/build.sh
@@ -191,10 +191,10 @@ function build_pdf() {
   PDF_STARTED_LOG="_pdf/pdf_gen_started.log"
   
   if [ "$SKIP_PDF_MANUAL" != "true" ]; then
-    _build/buildPDF.sh "_site/singlePageManual.html" "_pdf/UserManual.pdf" 2>&1 |
tee $PDF_MANUAL_LOG
+    _build/buildPDF.sh "_site/zoneMergeManual.html" "_pdf/UserManual.pdf" 2>&1 | tee
$PDF_MANUAL_LOG
   fi
   if [ "$SKIP_PDF_STARTED" != "true" ]; then
-    _build/buildPDF.sh "_site/singlePageStarted.html" "_pdf/GettingStarted.pdf" 2>&1
| tee $PDF_STARTED_LOG
+    _build/buildPDF.sh "_site/zoneMergeStarted.html" "_pdf/GettingStarted.pdf" 2>&1
| tee $PDF_STARTED_LOG
   fi
 }
 

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/70c731f4/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index 7b634b2..bb44fb5 100644
--- a/_config.yml
+++ b/_config.yml
@@ -29,7 +29,7 @@ path:
   guide: /guide
   website: /website
   v: /v
-
+  
 # Use local copies of dependencies in dev build (switched to remote using URLs for prod build)
 dependency_mode: local
 dependency_urls:
@@ -46,7 +46,12 @@ sass:
     sass_dir: style/css
 
 brooklyn-stable-version: 0.8.0-incubating
+brooklyn-base-url: https://brooklyn.apache.org
 
+pdf-rewrite-prefixes: 
+    '/guide' : '/v/0.9.0-SNAPSHOT'
+    '/website' : ''
+    
 brooklyn-version: 0.9.0-SNAPSHOT # BROOKLYN_VERSION
 brooklyn-snapshot-git-branch: master   # if line above is SNAPSHOT this should point to corresponding
git branch (e.g. master, 0.4)
 

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/70c731f4/singlePageManual.html
----------------------------------------------------------------------
diff --git a/singlePageManual.html b/singlePageManual.html
deleted file mode 100644
index bfdfa69..0000000
--- a/singlePageManual.html
+++ /dev/null
@@ -1,26 +0,0 @@
----
-title: Apache Brooklyn Manual
-layout: singlePage
-page_mask: usermanual-pdf-exclude
----
-	<div id="content_container" class="container">
-	<header>
-		<h1>Apache Brooklyn: User Manual</h1>
-	</header>
-		<h1>Contents</h1>
-	
-	    <nav><ul>
-		  {% assign visited = "" | split: "|" %}
-	      {% for node in site.data.menu  %}
-			  {% push site_items node %}
-			  {% include singlepage-item.html %}
-	      {% endfor %}
-	    </ul></nav>
-
-		{% assign visitedb = "" | split: "|" %}
-		{% for node in site.data.menu  %}
-			  {% push site_items node %}
-			  {% include singlepage-content.html %}
-	      {% endfor %}
-	  
-  </div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/70c731f4/singlePageStarted.html
----------------------------------------------------------------------
diff --git a/singlePageStarted.html b/singlePageStarted.html
deleted file mode 100644
index 9e527eb..0000000
--- a/singlePageStarted.html
+++ /dev/null
@@ -1,25 +0,0 @@
----
-title: Apache Brooklyn Manual
-layout: singlePage
-page_mask: started-pdf-exclude
----
-	<div id="content_container" class="container">
-	<header>
-		<h1>Apache Brooklyn: Getting Started Guide</h1>
-	</header>
-		<h1>Contents</h1>
-	
-	    <nav><ul>
-		  {% assign visited = "" | split: "|" %}
-	      {% for node in site.data.menu  %}
-			  {% push site_items node %}
-			  {% include singlepage-item.html %}
-	      {% endfor %}
-	    </ul></nav>
-
-		{% assign visitedb = "" | split: "|" %}
-		{% for node in site.data.menu  %}
-			  {% push site_items node %}
-			  {% include singlepage-content.html %}
-	      {% endfor %}
-  </div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/70c731f4/zoneMergeManual.html
----------------------------------------------------------------------
diff --git a/zoneMergeManual.html b/zoneMergeManual.html
new file mode 100644
index 0000000..e088395
--- /dev/null
+++ b/zoneMergeManual.html
@@ -0,0 +1,28 @@
+---
+title: Apache Brooklyn Manual
+layout: singlePage
+page_mask: usermanual-pdf-exclude
+---
+{% comment %}<!-- This page builds the single page manual for the PDF, note that this
name must be retained for conversion order -->{% endcomment %}
+
+	<div id="content_container" class="container">
+	<header>
+		<h1>Apache Brooklyn: User Manual</h1>
+	</header>
+		<h1>Contents</h1>
+	
+	    <nav><ul>
+		  {% assign visited = "" | split: "|" %}
+	      {% for node in site.data.menu  %}
+			  {% push site_items node %}
+			  {% include singlepage-item.html %}
+	      {% endfor %}
+	    </ul></nav>
+
+		{% assign visitedb = "" | split: "|" %}
+		{% for node in site.data.menu  %}
+			  {% push site_items node %}
+			  {% include singlepage-content.html %}
+	      {% endfor %}
+	  
+  </div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/70c731f4/zoneMergeStarted.html
----------------------------------------------------------------------
diff --git a/zoneMergeStarted.html b/zoneMergeStarted.html
new file mode 100644
index 0000000..11323b7
--- /dev/null
+++ b/zoneMergeStarted.html
@@ -0,0 +1,27 @@
+---
+title: Apache Brooklyn Manual
+layout: singlePage
+page_mask: started-pdf-exclude
+---
+{% comment %}<!-- This page builds the single page getting started for the PDF, note that
this name must be retained for conversion order -->{% endcomment %}
+
+	<div id="content_container" class="container">
+	<header>
+		<h1>Apache Brooklyn: Getting Started Guide</h1>
+	</header>
+		<h1>Contents</h1>
+	
+	    <nav><ul>
+		  {% assign visited = "" | split: "|" %}
+	      {% for node in site.data.menu  %}
+			  {% push site_items node %}
+			  {% include singlepage-item.html %}
+	      {% endfor %}
+	    </ul></nav>
+
+		{% assign visitedb = "" | split: "|" %}
+		{% for node in site.data.menu  %}
+			  {% push site_items node %}
+			  {% include singlepage-content.html %}
+	      {% endfor %}
+  </div>
\ No newline at end of file


Mime
View raw message