Merge branch 'master' into cut-nbviewer-nav-link

Author: palewire

_data/nav.yml

@@ -7,7 +7,6 @@ head:
     - title: Events
       url: /events
     - Documentation
-    - JupyterHub
     - Widgets
     - title: Blog
       url: https://blog.jupyter.org

index.html

@@ -42,7 +42,7 @@
         <div class="row">
             <div class="col-md-12">
                 <div class="col-md-8 col-md-offset-2">
-                <h4 class="jumbotron-text">Project Jupyter develops open-source software, open standards
+                <h4 class="jumbotron-text">Project Jupyter develops open-source software, open standards,
                     and services for interactive computing across dozens of programming languages.</h4>
                 </div>
              </div>
@@ -58,8 +58,8 @@ <h4 class="jumbotron-text">Project Jupyter develops open-source software, open s
                         <img class="img-responsive" src="assets/labpreview.png" id="portal" alt="examples of jupyterlab workspaces in single document and multiple document workspaces"/>
                     </div>
                     <div class="col-md-6 nb-highlight-text">
-                        <h3>JupyterLab: The Next-Generation Notebook Interface</h3>
-                        <h4 class="nb-desc">JupyterLab is a web-based interactive development environment for notebooks, code and data. Its flexible interface allows users to configure and arrange workflows in data science, scientific computing, computational journalism and machine learning. A modular design allows for extensions that expand and enrich functionality.</h4>
+                        <h3>JupyterLab: A Next-Generation Notebook Interface</h3>
+                        <h4 class="nb-desc">JupyterLab is a web-based interactive development environment for notebooks, code, and data. Its flexible interface allows users to configure and arrange workflows in data science, scientific computing, computational journalism, and machine learning. A modular design allows for extensions that expand and enrich functionality.</h4>
                         <div class="button-container">
                             <a class="orange-button" href="try">Try it in your browser</a>
                             <a class="orange-button install-button" href="install.html">Install JupyterLab</a>
@@ -81,7 +81,7 @@ <h4 class="nb-desc">JupyterLab is a web-based interactive development environmen
                     <div class="col-md-6 nb-highlight-text">
                         <h3>Jupyter Notebook: The Classic Notebook Interface</h3>
                         <h4 class="nb-desc">The Jupyter Notebook is a web application for creating and sharing
-                            documents that contain code, visualizations and text. It can be used for data science, statistical modeling, machine learning and much more.</h4>
+                            documents that contain code, visualizations, and text. It can be used for data science, statistical modeling, machine learning, and much more.</h4>
                         <div class="button-container">
                             <a class="orange-button" href="try">Try it in your browser</a>
                             <a class="orange-button install-button" href="install.html">Install the Notebook</a>
@@ -153,7 +153,7 @@ <h4>Code meets data</h4>
                 </div>
             </div>
             <div class="col-md-12" style="text-align: center; margin-top: 24px;">
-                <a class="orange-button" href="https://jupyterhub.readthedocs.io/en/stable/">Learn more about JupyterHub</a>
+                <a class="orange-button" href="/hub">Learn more about JupyterHub</a>
             </div>
             </div>
         </div>