This is an automated email from the ASF dual-hosted git repository. duncangrant pushed a commit to branch ruby-3 in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git
commit c06ae51bb43f7bedc467ce0149f23e7e2d80af85 Author: Duncan Grant <[email protected]> AuthorDate: Thu May 20 17:08:10 2021 +0100 Move to latest ruby wip --- README.md | 1 + _plugins/page_structure.rb | 2 +- _plugins/site_structure.rb | 2 +- guide/blueprints/policies/available_policies.md | 2 +- guide/locations/index.md | 30 ++++++++++++------------- guide/ops/upgrades/index.md | 6 ++--- index.md | 5 ++--- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 36ccf0d..4142266 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,7 @@ Some issues we've encountered are: * if openssl library headers are not found, set the dir explicitly, eg for `eventmachine` try `gem install eventmachine -- --with-openssl-dir=/usr/local/opt/[email protected]` * if `libv8` complains: `gem install libv8 -- --with-system-v8` or eg `gem install libv8 -v '3.16.14.19' -- --with-system-v8` * for rubyracer to find v8: `gem install therubyracer -- --with-v8-dir=/usr/local/opt/[email protected]` + * needs v8 installed by brew as: brew install v8-315 If you are building the PDF documentation, this requires [wkhtmltopdf](http://wkhtmltopdf.org/). diff --git a/_plugins/page_structure.rb b/_plugins/page_structure.rb index cb81c93..a86acb4 100644 --- a/_plugins/page_structure.rb +++ b/_plugins/page_structure.rb @@ -213,7 +213,7 @@ module PageStructureUtils # render the included content with the current page renderer info = { :filters => [Jekyll::Filters], :registers => { :site => site, :page => page } } - page.render_liquid($content, site.site_payload, info) + page.render_liquid($content, site.site_payload, info, nil) end end end diff --git a/_plugins/site_structure.rb b/_plugins/site_structure.rb index b4bf9b6..8b6e9ab 100644 --- a/_plugins/site_structure.rb +++ b/_plugins/site_structure.rb @@ -115,7 +115,7 @@ module SiteStructure # Pathname API ignores first arg below if second is absolute # puts "converting #{path} wrt #{referrent ? referrent.path : ""}" - file = Pathname.new(File.dirname(referrent ? referrent.path : "")) + path + file = Pathname.new(File.dirname(referrent ? referrent.path : "" + path)) if file.to_s.end_with? "/" if File.exist? File.join(file, 'index.md') diff --git a/guide/blueprints/policies/available_policies.md b/guide/blueprints/policies/available_policies.md index 23982aa..1e82f4a 100644 --- a/guide/blueprints/policies/available_policies.md +++ b/guide/blueprints/policies/available_policies.md @@ -90,7 +90,7 @@ The ConnectionFailureDetector is an HA policy for monitoring an HTTP connection, ### Primary Election / Failover Policies -{% include '_elect-primary-policies.md' %} +{% include_relative _elect-primary-policies.md %} ### Optimization Policies diff --git a/guide/locations/index.md b/guide/locations/index.md index 066ab03..397650f 100644 --- a/guide/locations/index.md +++ b/guide/locations/index.md @@ -176,18 +176,18 @@ Try executing: echo date > /tmp/brooklyn-test.sh && chmod +x /tmp/brooklyn-test.sh && /tmp/brooklyn-test.sh && rm /tmp/brooklyn-test.sh -{% include '_clouds.md' %} -{% include '_AWS.md' %} -{% include '_azure-ARM.md' %} -{% include '_azure-classic.md' %} -{% include '_cloudstack.md' %} -{% include '_GCE.md' %} -{% include '_ibm-softlayer.md' %} -{% include '_openstack.md' %} -{% include '_inheritance-and-named-locations.md' %} -{% include '_byon.md' %} -{% include '_ssh-keys.md' %} -{% include '_localhost.md' %} -{% include '_location-customizers.md' %} -{% include '_location-customizer-security-groups.md' %} -{% include '_special-locations.md' %} +{% include_relative _clouds.md %} +{% include_relative _AWS.md %} +{% include_relative _azure-ARM.md %} +{% include_relative _azure-classic.md %} +{% include_relative _cloudstack.md %} +{% include_relative _GCE.md %} +{% include_relative _ibm-softlayer.md %} +{% include_relative _openstack.md %} +{% include_relative _inheritance-and-named-locations.md %} +{% include_relative _byon.md %} +{% include_relative _ssh-keys.md %} +{% include_relative _localhost.md %} +{% include_relative _location-customizers.md %} +{% include_relative _location-customizer-security-groups.md %} +{% include_relative _special-locations.md %} diff --git a/guide/ops/upgrades/index.md b/guide/ops/upgrades/index.md index 590364f..34376d0 100644 --- a/guide/ops/upgrades/index.md +++ b/guide/ops/upgrades/index.md @@ -15,9 +15,9 @@ Use of the `lib/dropins` and `lib/patch` folders will no longer work (because Ka Instead, code must be built and installed as [OSGi bundles](https://en.wikipedia.org/wiki/OSGi#Bundles). -{% include '_server.md' %} +{% include_relative _server.md %} -{% include '_blueprints.md' %} +{% include_relative _blueprints.md %} -{% include '_systems-under-mgmt.md' %} +{% include_relative _systems-under-mgmt.md %} diff --git a/index.md b/index.md index f5f5862..15882dc 100644 --- a/index.md +++ b/index.md @@ -7,8 +7,8 @@ title: Brooklyn Website and Docs (dev build) Consider looking at: -* <a href="{{ site.path.website }}/">the brooklyn website</a> -* <a href="{{ site.path.guide }}/">the brooklyn user guide (version 1.0.0-SNAPSHOT) <!-- BROOKLYN_VERSION --></a> +* <a href="/{{ site.path.website }}/">the brooklyn website</a> +* <a href="/{{ site.path.guide }}/">the brooklyn user guide (version 1.0.0-SNAPSHOT) <!-- BROOKLYN_VERSION --></a> Also see the file <code>README.md</code> in this directory. @@ -16,4 +16,3 @@ For reference, this build uses the following variables: * url root: `{{ site.url_root }}` * path map: `{{ site.path }}` -
