Merge branch '6.4RC'6.4

5 files changed, 5 insertions, 5 deletions

diff --git a/vendor/twbs/bootstrap/site/layouts/partials/docs-versions.html b/vendor/twbs/bootstrap/site/layouts/partials/docs-versions.html
index 4415e550d..a38a81823 100644
--- a/vendor/twbs/bootstrap/site/layouts/partials/docs-versions.html
+++ b/vendor/twbs/bootstrap/site/layouts/partials/docs-versions.html
@@ -3,7 +3,7 @@
     <span class="d-none d-lg-inline">Bootstrap</span> v{{ .Site.Params.docs_version }}
   </button>
   <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="bd-versions">
-    <li><a class="dropdown-item current" aria-current="true" href="/docs/{{ .Site.Params.docs_version }}/">Latest (5.0.x)</a></li>
+    <li><a class="dropdown-item current" aria-current="true" href="/docs/{{ .Site.Params.docs_version }}/">Latest ({{ .Site.Params.docs_version }}.x)</a></li>
     <li><hr class="dropdown-divider"></li>
     <li><a class="dropdown-item" href="https://getbootstrap.com/docs/4.6/">v4.6.x</a></li>
     <li><a class="dropdown-item" href="https://getbootstrap.com/docs/3.4/">v3.4.1</a></li>
diff --git a/vendor/twbs/bootstrap/site/layouts/partials/footer.html b/vendor/twbs/bootstrap/site/layouts/partials/footer.html
index 5e0f88229..e3d0f13e4 100644
--- a/vendor/twbs/bootstrap/site/layouts/partials/footer.html
+++ b/vendor/twbs/bootstrap/site/layouts/partials/footer.html
@@ -18,7 +18,7 @@
           <li class="mb-2"><a href="/">Home</a></li>
           <li class="mb-2"><a href="/docs/{{ .Site.Params.docs_version }}/">Docs</a></li>
           <li class="mb-2"><a href="/docs/{{ .Site.Params.docs_version }}/examples/">Examples</a></li>
-          <li class="mb-2"><a href="{{ .Site.Params.opencollective }}">Themes</a></li>
+          <li class="mb-2"><a href="{{ .Site.Params.themes }}">Themes</a></li>
           <li class="mb-2"><a href="{{ .Site.Params.blog }}">Blog</a></li>
         </ul>
       </div>
diff --git a/vendor/twbs/bootstrap/site/layouts/partials/home/masthead.html b/vendor/twbs/bootstrap/site/layouts/partials/home/masthead.html
index a8a465fed..e5661d9b3 100644
--- a/vendor/twbs/bootstrap/site/layouts/partials/home/masthead.html
+++ b/vendor/twbs/bootstrap/site/layouts/partials/home/masthead.html
@@ -23,6 +23,6 @@
         </p>
       </div>
     </div>
-    {{ partial "ads.html" . }}
+    {{ partial "ads" . }}
   </div>
 </div>
diff --git a/vendor/twbs/bootstrap/site/layouts/partials/scripts.html b/vendor/twbs/bootstrap/site/layouts/partials/scripts.html
index d7c694641..d25add3ff 100644
--- a/vendor/twbs/bootstrap/site/layouts/partials/scripts.html
+++ b/vendor/twbs/bootstrap/site/layouts/partials/scripts.html
@@ -10,7 +10,7 @@
 
 {{- $vendor := resources.Match "js/vendor/*.js" -}}
 {{- $js := resources.Match "js/*.js" -}}
-{{- $targetDocsJSPath := printf "/docs/%s/assets/js/docs.js" .Site.Params.docs_version -}}
+{{- $targetDocsJSPath := path.Join "/docs" .Site.Params.docs_version "assets/js/docs.js" -}}
 {{- $docsJs := append $js $vendor | resources.Concat $targetDocsJSPath -}}
 
 {{- if eq hugo.Environment "production" -}}
diff --git a/vendor/twbs/bootstrap/site/layouts/partials/stylesheet.html b/vendor/twbs/bootstrap/site/layouts/partials/stylesheet.html
index 83b30f452..cc4473383 100644
--- a/vendor/twbs/bootstrap/site/layouts/partials/stylesheet.html
+++ b/vendor/twbs/bootstrap/site/layouts/partials/stylesheet.html
@@ -10,7 +10,7 @@
 {{- end }}
 
 {{- if (ne .Page.Layout "examples") }}
-{{- $targetDocsCssPath := printf "/docs/%s/assets/css/docs.css" .Site.Params.docs_version -}}
+{{- $targetDocsCssPath := path.Join "/docs" .Site.Params.docs_version "assets/css/docs.css" -}}
 {{- $sassOptions := dict "targetPath" $targetDocsCssPath "outputStyle" "expanded" "precision" 6 -}}
 {{- $postcssOptions := dict "use" "autoprefixer" "noMap" true -}}