Merge branch 'master' into accessibility-meta

Author: palewire

_data/documentation.yml

@@ -28,6 +28,7 @@ Widgets:
 
 Notebook Documents:
   nbconvert: https://nbconvert.readthedocs.io/en/latest/
+  nbclient: https://nbclient.readthedocs.io/en/latest/
   nbformat: https://nbformat.readthedocs.io/en/latest/
   nbviewer: https://github.com/jupyter/nbviewer/
 
@@ -45,4 +46,5 @@ Deployment:
 Foundations:
   Jupyter Client: https://jupyter-client.readthedocs.io/en/latest/
   Jupyter Core: https://jupyter-core.readthedocs.io/en/latest/
+  Jupyter Server: https://jupyter-server.readthedocs.io/
   Jupyter Alabaster Theme: https://jupyter-alabaster-theme.readthedocs.io/en/latest/

_includes/footer.html

@@ -6,7 +6,7 @@
                     <li><a href="{{site.baseurl}}/index.html">Home</a></li>
                     {%- for nav in site.data.nav.head %}
                       {%- if nav.url %}
-                               <li><a href="{{site.baseurl}}{{nav.url}}" target="_blank">{{nav.title}}</a></li>
+                               <li><a href="{{site.baseurl}}{{nav.url}}" target="_blank" rel="noopener noreferrer">{{nav.title}}</a></li>
                       {%- else %}
                         {%- for target_page in site.pages %}
                            {%- if nav contains target_page.title %}

_includes/head.html

@@ -3,14 +3,14 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="">
-    <meta name="author" content="">
+    <meta itemprop="description" name="description" content="{% if page.tagline %}{{ page.tagline }}{% else %}{{ site.description }}{% endif %}" />
 
     <title>{{ site.title }} {% if page.title %}| {{ page.title }}{% endif %}</title>
     <meta property="og:title" content="Project Jupyter" />
     <meta property="og:description" content="{{ site.description }}">
     <meta property="og:url" content="https://www.jupyter.org" />
     <meta property="og:image" content="https://jupyter.org/assets/homepage.png" />
+    <link rel="canonical" href="{{ page.url | prepend: site.url }}">
     <!-- Bootstrap Core CSS -->
     <link rel="stylesheet" href="{{ "/css/bootstrap.min.css" | prepend: site.baseurl }}">
     <link rel="stylesheet" href="{{ "/css/logo-nav.css" | prepend: site.baseurl }}?{{site.time | date: '%s%N'}}">

_includes/header.html

@@ -27,7 +27,7 @@
                       {%- if nav.url %}
                                <li>
                                  {%- if nav.newpage %}
-                                 <a href="{{site.baseurl}}{{nav.url}}" class="tab" target="_blank">{{nav.title}}</a>
+                                 <a href="{{site.baseurl}}{{nav.url}}" class="tab" target="_blank" rel="noopener noreferrer">{{nav.title}}</a>
                                  {%- else %}
                                  <a href="{{site.baseurl}}{{nav.url}}" class="tab">{{nav.title}}</a>
                                  {%- endif %}
@@ -37,7 +37,7 @@
                            {%- if nav contains targetpage.title -%}
                               {%- if page.title == targetpage.title %}
                                <li>
-                                   <a href  class="tab navbar-active">{{targetpage.title}}</a>
+                                   <a href="{{site.baseurl}}{{targetpage.url}}" class="tab navbar-active">{{targetpage.title}}</a>
                                </li>
                                {%- else %}
                                <li>

_includes/partners.html

@@ -2,7 +2,7 @@
     <div class="row section-header">
         <img src="{{site.baseurl}}/assets/institutional_partners2.svg" class="section-icon img-responsive" alt="institutional partners">
         <h3 class="col-sm-12 section-header">Institutional Partners</h3>
-        <p class="col-sm-12 support-paragraph">
+        <p class="support-paragraph">
             Institutional Partners are organizations that support the project by employing Jupyter Steering Council members.
             Current Institutional Partners include:
         </p>

_includes/sponsors.html

@@ -3,7 +3,7 @@
     <div class="row">
         <img src="{{site.baseurl}}/assets/sponsors2.svg" class="section-icon img-responsive" alt="sponsors">
         <h3 class="col-sm-12 section-header">Sponsors</h3>
-        <p class="col-sm-12 support-paragraph">Project Jupyter receives direct funding from the following sources:</p>
+        <p class="support-paragraph">Project Jupyter receives direct funding from the following sources</p>
     </div>
 
     <div class="row">

about.md

@@ -1,7 +1,7 @@
 ---
 layout: page_md
 title: "About Us"
-tagline: Some information about the Jupyter Project and Community
+tagline: Project Jupyter’s origins and governance
 permalink: /about
 distinguished_2020:
   - name: Jeremy Tuloup

community.md

@@ -1,7 +1,7 @@
 ---
 layout: page_md
-title: Stay Connected
-tagline: Project Jupyter offers a number of communication channels available to individuals interested in using and contributing to the project.
+title: Community
+tagline: How to get involved with Project Jupyter
 permalink: /community
 ---
 

css/logo-nav.css

@@ -260,8 +260,9 @@ body {
 .support-paragraph {
     font-size: 15px;
     line-height: 1.5;
-    margin-bottom: 16px;
     text-align: center;
+    max-width: 630px;
+    margin: 0 auto 16px auto;
 }
 
 /* Orange action button */

documentation.md

@@ -1,7 +1,7 @@
 ---
 layout: page_md
 title: Documentation
-tagline: A comprehensive list of links to each of the repositories for the Jupyter project.
+tagline: A comprehensive list of Jupyter projects, subprojects and repositories
 permalink: /documentation
 ---
 

events.md

@@ -1,7 +1,7 @@
 ---
 layout: page_md
-title: Stay Connected
-tagline: Project Jupyter sponsors a number of events for individuals interested in using and contributing to the project.
+title: Events
+tagline: Sponsored gatherings of Project Jupyter users and contributors
 permalink: /events
 ---
 

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 exists to develop 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 exists to develop open-source softwar
                         <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: Jupyter’s Next-Generation Notebook Interface</h3>
-                        <h4 class="nb-desc">JupyterLab is a web-based interactive development environment for Jupyter notebooks, code, and data. JupyterLab is flexible: configure and arrange the user interface to support a wide range of workflows in data science, scientific computing, and machine learning. JupyterLab is extensible and modular: write plugins that add new components and integrate with existing ones.</h4>
+                        <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>
                         <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>
@@ -79,10 +79,9 @@ <h4 class="nb-desc">JupyterLab is a web-based interactive development environmen
                         <img class="img-responsive" src="assets/jupyterpreview.png" id="portal" alt="example notebook of Lorenz differential equations"/>
                     </div>
                     <div class="col-md-6 nb-highlight-text">
-                        <h3>The Jupyter Notebook</h3>
-                        <h4 class="nb-desc">The Jupyter Notebook is an open-source web application that allows you to create and share
-                            documents that contain live code, equations, visualizations and narrative text. Uses include: data cleaning
-                            and transformation, numerical simulation, statistical modeling, data visualization, machine learning, and much more.</h4>
+                        <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>
                         <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>
@@ -154,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://github.com/jupyter/jupyterhub">Learn more about JupyterHub</a>
+                <a class="orange-button" href="https://jupyterhub.readthedocs.io/en/stable/">Learn more about JupyterHub</a>
             </div>
             </div>
         </div>
@@ -201,7 +200,7 @@ <h3 class="section-header">Currently in use at</h3>
                     <li class="col"><a href="https://software-carpentry.org"><img src="assets/carpentry.svg" class="greydout" alt="Carpentry"></a></li>
                     <li class="col"><a href="https://www.janelia.org/"><img src="assets/janelia.svg" class="greydout" alt="Janelia"></a></li>
                     <li class="col"><a href="https://codeneuro.org/"><img src="assets/codeneuro.svg" class="greydout" alt="CodeNeuro"></a></li>
-                    <li class="col"><a href=""><img src="assets/nsite.svg" class="greydout" alt="NSite"></a></li>
+                    <li class="col"><a href="https://www.linkedin.com/company/nsite-llc/about/"><img src="assets/nsite.svg" class="greydout" alt="NSite"></a></li>
                     <li class="col"><a href="https://cocalc.com/"><img src="assets/cocalc.svg" class="greydout" alt="CoCalc"></a></li>
                     <li class="col"><a href="https://www.brynmawr.edu"><img src="assets/brynmawr.svg" class="greydout" alt="BrynMawr"></a></li>
                     <li class="col"><a href="https://www.calpoly.edu"><img src="assets/calpoly.svg" class="greydout" alt="CalPoly"></a></li>

install.md

@@ -1,7 +1,7 @@
 ---
 layout: page_md
-title: Installing the Jupyter Software
-tagline: Get up and running with the JupyterLab or the classic Jupyter Notebook on your computer within minutes!
+title: Installing Jupyter Software
+tagline: Get up and running with JupyterLab or the classic Jupyter Notebook.
 permalink: /install
 ---
 

widgets.html

@@ -30,7 +30,7 @@ <h2>Interactive Widgets</h2>
     <div class="container">
       <img class="section-icon img-responsive" src="assets/widget.svg" alt="icon to represent multiple notebooks">
         <h3 class="col-sm-12 section-header">Notebook Widgets</h3>
-      <p class="support-paragraph">Notebooks come alive when interactive widgets are used. Users can visualize and control changes in the data. Learning becomes an immersive, plus fun, experience. Researchers can easily see how changing inputs to a model impacts the results.</p>
+        <p class="support-paragraph">Notebooks come alive when interactive widgets are used. Users can visualize and control changes in the data. Learning becomes an immersive, plus fun, experience. Researchers can easily see how changing inputs to a model impacts the results.</p>
     </div>
   </div>
 </section>