[ARVADOS] created: 1.3.0-1044-gd50b8c00e

[Git user]

        at  d50b8c00ec6aeb9175be4e4d8b58b684601eeda1 (commit)


commit d50b8c00ec6aeb9175be4e4d8b58b684601eeda1
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Tue Jun 11 13:42:40 2019 -0400

    15138: Include logic to support building multiple versions of our documentation.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/doc/_config.yml b/doc/_config.yml
index cfae67192..6fccaf62c 100644
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -11,6 +11,8 @@
 # $ rake generate baseurl=/example arvados_api_host=example.com
 
 baseurl:
+current_version:
+other_versions:
 arvados_api_host: localhost
 arvados_cluster_uuid: local
 arvados_workbench_host: http://localhost
diff --git a/doc/_includes/_navbar_top.liquid b/doc/_includes/_navbar_top.liquid
index 477a0dd81..bc2e11f66 100644
--- a/doc/_includes/_navbar_top.liquid
+++ b/doc/_includes/_navbar_top.liquid
@@ -17,6 +17,15 @@ SPDX-License-Identifier: CC-BY-SA-3.0
     </div>
     <div class="collapse navbar-collapse" id="bs-navbar-collapse">
       <ul class="nav navbar-nav">
+        <li><a href="#" class="dropdown-toggle" role="button" id="versionMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ site.current_version }}{% if site.other_versions != [] %} ▾{% endif %}</a>
+          {% if site.other_versions != [] %}
+            <div class="dropdown-menu" aria-labelledby="versionMenuLink">
+            {% for version in site.other_versions %}
+               <a href="/{{ version }}/" class="dropdown-item">{{ version }}</a><br/>
+            {% endfor %}
+            </div>
+          {% endif %}
+        </li>
         <!--<li {% if page.navsection == 'start' %} class="active" {% endif %}><a href="{{ site.baseurl }}/start/index.html">Getting Started</a></li>-->
         <li {% if page.navsection == 'userguide' %} class="active" {% endif %}><a href="{{ site.baseurl }}/user/index.html">User Guide</a></li>
         <li {% if page.navsection == 'sdk' %} class="active" {% endif %}><a href="{{ site.baseurl }}/sdk/index.html">SDKs</a></li>

commit fb60110d98bcb5ed02c55f152c6a5a86be01b24a
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Mon Jun 10 10:41:22 2019 -0400

    15138: Show the TM notice a little bit higher.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/doc/_includes/_navbar_top.liquid b/doc/_includes/_navbar_top.liquid
index 7d96ea011..477a0dd81 100644
--- a/doc/_includes/_navbar_top.liquid
+++ b/doc/_includes/_navbar_top.liquid
@@ -13,7 +13,7 @@ SPDX-License-Identifier: CC-BY-SA-3.0
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="{{ site.baseurl }}/">Arvados™ Docs</a>
+      <a class="navbar-brand" href="{{ site.baseurl }}/">Arvados<sup>™</sup> Docs</a>
     </div>
     <div class="collapse navbar-collapse" id="bs-navbar-collapse">
       <ul class="nav navbar-nav">
diff --git a/doc/user/index.html.textile.liquid b/doc/user/index.html.textile.liquid
index 202e297a2..909394ef4 100644
--- a/doc/user/index.html.textile.liquid
+++ b/doc/user/index.html.textile.liquid
@@ -1,7 +1,7 @@
 ---
 layout: default
 navsection: userguide
-title: Welcome to Arvados™!
+title: Welcome to Arvados<sup>™</sup>!
 ...
 {% comment %}
 Copyright (C) The Arvados Authors. All rights reserved.

-----------------------------------------------------------------------


hooks/post-receive
--