Merge branch 'master' into remove-underscore-static

config.yml

@@ -37,10 +37,10 @@ params:
   docs_version:         "4.3"
   repo:                 "https://github.com/twbs/bootstrap"
   twitter:              "getbootstrap"
-  slack:                "https://bootstrap-slack.herokuapp.com"
+  slack:                "https://bootstrap-slack.herokuapp.com/"
   opencollective:       "https://opencollective.com/bootstrap"
-  blog:                 "https://blog.getbootstrap.com"
-  expo:                 "https://expo.getbootstrap.com"
+  blog:                 "https://blog.getbootstrap.com/"
+  expo:                 "https://expo.getbootstrap.com/"
   themes:               "https://themes.getbootstrap.com"
 
   download:

site/content/docs/4.3/components/popovers.md

@@ -299,7 +299,7 @@ Options for individual popovers can alternatively be specified through the use o
 
 #### show
 
-Reveals an element's popover. **Returns to the caller before the popover has actually been shown** (i.e. before the `shown.bs.popover` event occurs). This is considered a "manual" triggering of the popover. Popovers whose both title and content are zero-length are never displayed.
+Reveals an element's popover. **Returns to the caller before the popover has actually been shown** (i.e. before the `shown.bs.popover` event occurs). This is considered a "manual" triggering of the popover. Popovers whose title and content are both zero-length are never displayed.
 
 {{< highlight js >}}myPopover.show(){{< /highlight >}}
 

site/content/docs/4.3/getting-started/introduction.md

@@ -119,8 +119,8 @@ For improved cross-browser rendering, we use [Reboot]({{< docsref "/content/rebo
 Stay up to date on the development of Bootstrap and reach out to the community with these helpful resources.
 
 - Follow [@getbootstrap on Twitter](https://twitter.com/{{< param twitter >}}).
-- Read and subscribe to [The Official Bootstrap Blog]({{< param blog >}}/).
-- Join [the official Slack room]({{< param slack >}}/).
+- Read and subscribe to [The Official Bootstrap Blog]({{< param blog >}}).
+- Join [the official Slack room]({{< param slack >}}).
 - Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel.
 - Implementation help may be found at Stack Overflow (tagged [`bootstrap-4`](https://stackoverflow.com/questions/tagged/bootstrap-4)).
 - Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/search?q=keywords:bootstrap) or similar delivery mechanisms for maximum discoverability.

site/layouts/partials/docs-navbar.html

@@ -16,13 +16,13 @@
           <a class="nav-link{{ if eq .Page.Title "Examples" }} active{{ end }}" href="/docs/{{ .Site.Params.docs_version }}/examples/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Examples');">Examples</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="{{ .Site.Params.themes }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Themes');" target="_blank" rel="noopener">Themes</a>
+          <a class="nav-link" href="{{ .Site.Params.themes }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Themes');" target="_blank" rel="noopener">Themes</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="{{ .Site.Params.expo }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');" target="_blank" rel="noopener">Expo</a>
+          <a class="nav-link" href="{{ .Site.Params.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');" target="_blank" rel="noopener">Expo</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="{{ .Site.Params.blog }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');" target="_blank" rel="noopener">Blog</a>
+          <a class="nav-link" href="{{ .Site.Params.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');" target="_blank" rel="noopener">Blog</a>
         </li>
       </ul>
     </div>
@@ -39,7 +39,7 @@
         </a>
       </li>
       <li class="nav-item">
-        <a class="nav-link p-2" href="{{ .Site.Params.slack }}/" target="_blank" rel="noopener" aria-label="Slack">
+        <a class="nav-link p-2" href="{{ .Site.Params.slack }}" target="_blank" rel="noopener" aria-label="Slack">
           {{ partial "icons/slack.svg" (dict "class" "navbar-nav-svg" "width" "36" "height" "36") }}
         </a>
       </li>

site/layouts/partials/docs-sidebar.html

@@ -3,7 +3,7 @@
   {{- $page_slug := index $url (sub (len $url) 2) -}}
 
   <ul class="list-unstyled">
-  {{- range $group := .Site.Data.nav -}}
+  {{- range $group := .Site.Data.sidebar -}}
     {{- $link := $group.title -}}
     {{- $link_slug := $link | urlize -}}
 

site/layouts/partials/home/masthead-followup.html

@@ -42,7 +42,7 @@ <h2 class="display-4">Official Themes</h2>
   <p class="lead lead-lg mw-md-75 mx-auto">
     Take Bootstrap 4 to the next level with official premium themes—toolkits built on Bootstrap with new components and plugins, docs, and build tools.
   </p>
-  <a class="btn btn-lg btn-outline-primary mb-4" href="{{ .Site.Params.themes }}/">Browse themes</a>
+  <a class="btn btn-lg btn-outline-primary mb-4" href="{{ .Site.Params.themes }}">Browse themes</a>
   <div class="mx-5 border-bottom">
     <img class="img-fluid mt-3 mx-auto" srcset="/docs/{{ .Site.Params.docs_version }}/assets/img/bootstrap-themes.png,
                                                 /docs/{{ .Site.Params.docs_version }}/assets/img/bootstrap-themes@2x.png 2x"