You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by rk...@apache.org on 2023/11/27 22:33:50 UTC

(incubator-sdap-website) branch staging updated: Minor edits & restructuring

This is an automated email from the ASF dual-hosted git repository.

rkk pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-website.git


The following commit(s) were added to refs/heads/staging by this push:
     new c33f829  Minor edits & restructuring
c33f829 is described below

commit c33f8299fa6a85bce4bea14061322c4c22aa31ae
Author: rileykk <ri...@jpl.nasa.gov>
AuthorDate: Mon Nov 27 14:33:07 2023 -0800

    Minor edits & restructuring
---
 blog.html                                          |  11 +++-
 docs.html                                          |  30 +++++++--
 downloads.html                                     |  11 +++-
 favicon.png                                        | Bin 845 -> 15857 bytes
 index.html                                         |  11 +++-
 publications.html => projects.html                 |  21 +++---
 publications.html                                  |  11 +++-
 release/2023/01/20/v1.0.0-release.html             |  11 +++-
 resources.html                                     |  11 +++-
 source/_data/team/team.yml                         |  13 ++--
 source/_includes/header.html                       |  11 +++-
 source/docs.html                                   |  19 +++++-
 source/favicon.png                                 | Bin 845 -> 15857 bytes
 source/projects.html                               |  14 ++++
 source/team.html                                   |  47 ++++++-------
 team.html                                          |  73 ++++++++++-----------
 weekly/update/2018/04/23/ranking-algorithms.html   |  11 +++-
 .../2018/04/23/recommendation-algorithms.html      |  11 +++-
 .../04/23/vocabulary-similarity-algorithm.html     |  11 +++-
 19 files changed, 225 insertions(+), 102 deletions(-)

diff --git a/blog.html b/blog.html
index c98ca0f..384f767 100644
--- a/blog.html
+++ b/blog.html
@@ -27,11 +27,18 @@
           </div>
           <div class="navbar-right">
             <ul class="nav navbar-nav">
-              <li><a href="/docs">Docs</a></li>
+              <li class="dropdown toggle">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About SDAP <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="/docs">Docs</a></li>
+                  <li><a href="/publications">Publications</a></li>
+                  <li><a href="/projects">Projects that use SDAP</a></li>
+                </ul>
+              </li>
               <li><a href="/downloads">Downloads</a></li>
               <li><a href="/blog">Blog</a></li>
               <li><a href="/team">Team &amp; Community</a></li>
-              <li><a href="/resources">Resources</a></li>
+<!--              <li><a href="/resources">Resources</a></li>-->
               <li class="dropdown toggle">
               	<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache <span class="caret"></span></a>
                 <ul class="dropdown-menu">
diff --git a/docs.html b/docs.html
index 6f88873..44db04f 100644
--- a/docs.html
+++ b/docs.html
@@ -27,11 +27,18 @@
           </div>
           <div class="navbar-right">
             <ul class="nav navbar-nav">
-              <li><a href="/docs">Docs</a></li>
+              <li class="dropdown toggle">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About SDAP <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="/docs">Docs</a></li>
+                  <li><a href="/publications">Publications</a></li>
+                  <li><a href="/projects">Projects that use SDAP</a></li>
+                </ul>
+              </li>
               <li><a href="/downloads">Downloads</a></li>
               <li><a href="/blog">Blog</a></li>
               <li><a href="/team">Team &amp; Community</a></li>
-              <li><a href="/resources">Resources</a></li>
+<!--              <li><a href="/resources">Resources</a></li>-->
               <li class="dropdown toggle">
               	<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache <span class="caret"></span></a>
                 <ul class="dropdown-menu">
@@ -53,10 +60,23 @@
 
 <p>This page describes how to install, use, and contribute to SDAP.</p>
 
-<h2 id="development">Development</h2>
+<h2>Build and Deploy SDAP locally</h2>
+
+<p>
+    Guides to <a href="https://incubator-sdap-nexus.readthedocs.io/en/latest/build.html">build</a> and <a href="https://incubator-sdap-nexus.readthedocs.io/en/latest/quickstart.html">deploy</a> SDAP using Docker are available at Read the Docs.
+</p>
+
+<h2>Deployment to Production</h2>
+<p>
+    Included with the SDAP release (Nexus) are the requisite Helm Charts to deploy SDAP to a Kubernetes cluster (currently tested between k8s versions 1.22 and 1.25). This allows for a scalable,
+    production deployment of SDAP to either a privately maintained cluster or to a cloud service provider like Amazon Web Service's Elastic Kubernetes Service.
+</p>
+
+
+<h2 id="development">Contribution</h2>
 
-<p>You can find out <a href="https://cwiki.apache.org/confluence/display/SDAP/Home">Wiki here</a>. Feel free to add SDAP related content to it!</p>
-<p>Get involved and contribute to SDAP through our <a href="http://sdap.apache.org/team">Community Hubs</a>.
+<p>You can find our <a href="https://cwiki.apache.org/confluence/display/SDAP/Home">Wiki here</a>. Feel free to add SDAP related content to it!</p>
+<p>See how you can get involved and contribute to SDAP through our <a href="http://sdap.apache.org/team#community">Community Hubs</a>.
 
       <!-- footer -->
       <nav class="navbar navbar-default">
diff --git a/downloads.html b/downloads.html
index 2064ee0..dd8357e 100644
--- a/downloads.html
+++ b/downloads.html
@@ -27,11 +27,18 @@
           </div>
           <div class="navbar-right">
             <ul class="nav navbar-nav">
-              <li><a href="/docs">Docs</a></li>
+              <li class="dropdown toggle">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About SDAP <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="/docs">Docs</a></li>
+                  <li><a href="/publications">Publications</a></li>
+                  <li><a href="/projects">Projects that use SDAP</a></li>
+                </ul>
+              </li>
               <li><a href="/downloads">Downloads</a></li>
               <li><a href="/blog">Blog</a></li>
               <li><a href="/team">Team &amp; Community</a></li>
-              <li><a href="/resources">Resources</a></li>
+<!--              <li><a href="/resources">Resources</a></li>-->
               <li class="dropdown toggle">
               	<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache <span class="caret"></span></a>
                 <ul class="dropdown-menu">
diff --git a/favicon.png b/favicon.png
index a3c70be..bd86b57 100644
Binary files a/favicon.png and b/favicon.png differ
diff --git a/index.html b/index.html
index 901d009..0e3d341 100644
--- a/index.html
+++ b/index.html
@@ -27,11 +27,18 @@
           </div>
           <div class="navbar-right">
             <ul class="nav navbar-nav">
-              <li><a href="/docs">Docs</a></li>
+              <li class="dropdown toggle">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About SDAP <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="/docs">Docs</a></li>
+                  <li><a href="/publications">Publications</a></li>
+                  <li><a href="/projects">Projects that use SDAP</a></li>
+                </ul>
+              </li>
               <li><a href="/downloads">Downloads</a></li>
               <li><a href="/blog">Blog</a></li>
               <li><a href="/team">Team &amp; Community</a></li>
-              <li><a href="/resources">Resources</a></li>
+<!--              <li><a href="/resources">Resources</a></li>-->
               <li class="dropdown toggle">
               	<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache <span class="caret"></span></a>
                 <ul class="dropdown-menu">
diff --git a/publications.html b/projects.html
similarity index 81%
copy from publications.html
copy to projects.html
index 741131e..b0231ab 100644
--- a/publications.html
+++ b/projects.html
@@ -27,11 +27,18 @@
           </div>
           <div class="navbar-right">
             <ul class="nav navbar-nav">
-              <li><a href="/docs">Docs</a></li>
+              <li class="dropdown toggle">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About SDAP <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="/docs">Docs</a></li>
+                  <li><a href="/publications">Publications</a></li>
+                  <li><a href="/projects">Projects that use SDAP</a></li>
+                </ul>
+              </li>
               <li><a href="/downloads">Downloads</a></li>
               <li><a href="/blog">Blog</a></li>
               <li><a href="/team">Team &amp; Community</a></li>
-              <li><a href="/resources">Resources</a></li>
+<!--              <li><a href="/resources">Resources</a></li>-->
               <li class="dropdown toggle">
               	<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache <span class="caret"></span></a>
                 <ul class="dropdown-menu">
@@ -49,15 +56,13 @@
       </nav>
 
 
-<h1>Publications</h1>
+<h1>Projects</h1>
 
-<p>Here you can find all SDAP publications, they are ordered in reverse chronological order.</p>
+<p>This page lists some examples of projects powered by SDAP. SDAP supports a wide variety of scientific projects, from oceans, to the atmosphere, to land surface and vegetation, with support for more science disciplines planned for the future.</p>
 
-<ul>
-	<li>todo</li>
-</ul>
+<h2>Project List</h2>
 
-<p>Get involved and contribute to SDAP through our <a href="http://sdap.apache.org/team">Community Hubs</a>.
+TBA
 
       <!-- footer -->
       <nav class="navbar navbar-default">
diff --git a/publications.html b/publications.html
index 741131e..697f1ec 100644
--- a/publications.html
+++ b/publications.html
@@ -27,11 +27,18 @@
           </div>
           <div class="navbar-right">
             <ul class="nav navbar-nav">
-              <li><a href="/docs">Docs</a></li>
+              <li class="dropdown toggle">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About SDAP <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="/docs">Docs</a></li>
+                  <li><a href="/publications">Publications</a></li>
+                  <li><a href="/projects">Projects that use SDAP</a></li>
+                </ul>
+              </li>
               <li><a href="/downloads">Downloads</a></li>
               <li><a href="/blog">Blog</a></li>
               <li><a href="/team">Team &amp; Community</a></li>
-              <li><a href="/resources">Resources</a></li>
+<!--              <li><a href="/resources">Resources</a></li>-->
               <li class="dropdown toggle">
               	<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache <span class="caret"></span></a>
                 <ul class="dropdown-menu">
diff --git a/release/2023/01/20/v1.0.0-release.html b/release/2023/01/20/v1.0.0-release.html
index c878129..efa9c6f 100644
--- a/release/2023/01/20/v1.0.0-release.html
+++ b/release/2023/01/20/v1.0.0-release.html
@@ -27,11 +27,18 @@
           </div>
           <div class="navbar-right">
             <ul class="nav navbar-nav">
-              <li><a href="/docs">Docs</a></li>
+              <li class="dropdown toggle">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About SDAP <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="/docs">Docs</a></li>
+                  <li><a href="/publications">Publications</a></li>
+                  <li><a href="/projects">Projects that use SDAP</a></li>
+                </ul>
+              </li>
               <li><a href="/downloads">Downloads</a></li>
               <li><a href="/blog">Blog</a></li>
               <li><a href="/team">Team &amp; Community</a></li>
-              <li><a href="/resources">Resources</a></li>
+<!--              <li><a href="/resources">Resources</a></li>-->
               <li class="dropdown toggle">
               	<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache <span class="caret"></span></a>
                 <ul class="dropdown-menu">
diff --git a/resources.html b/resources.html
index 3ef6071..16fc5a3 100644
--- a/resources.html
+++ b/resources.html
@@ -27,11 +27,18 @@
           </div>
           <div class="navbar-right">
             <ul class="nav navbar-nav">
-              <li><a href="/docs">Docs</a></li>
+              <li class="dropdown toggle">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About SDAP <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="/docs">Docs</a></li>
+                  <li><a href="/publications">Publications</a></li>
+                  <li><a href="/projects">Projects that use SDAP</a></li>
+                </ul>
+              </li>
               <li><a href="/downloads">Downloads</a></li>
               <li><a href="/blog">Blog</a></li>
               <li><a href="/team">Team &amp; Community</a></li>
-              <li><a href="/resources">Resources</a></li>
+<!--              <li><a href="/resources">Resources</a></li>-->
               <li class="dropdown toggle">
               	<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache <span class="caret"></span></a>
                 <ul class="dropdown-menu">
diff --git a/source/_data/team/team.yml b/source/_data/team/team.yml
index 65abe5c..b467f23 100644
--- a/source/_data/team/team.yml
+++ b/source/_data/team/team.yml
@@ -1,4 +1,4 @@
-- org: Apache Software Foundation - Committers
+- org: Apache Software Foundation - Committers & PPMC
   members:
   - name: Eamon Ford
     github: eamonford
@@ -92,12 +92,7 @@
     email:
       address: joern@apache.org
       text: joern at apache dot org
-  - name: Trevor Grant
-    github: rawkintrevo
-    email:
-      address: rawkintrevo@apache.org
-      text: rawkintrevo at apache dot org
-- org: Jet Propulsion Laboratory
+- org: NASA's Jet Propulsion Laboratory, California Institute of Technology
   members:
     - name: Jason Kang
       github: jasonmlkang
@@ -124,6 +119,10 @@
       email:
         address: vardis.m.tsontos@jpl.nasa.gov
         text: vardis dot m dot tsontos at jpl dot nasa dot gov
+#- org: Florida State University, Center for Ocean-Atmospheric Prediction Studies
+#  members:
+#    - name: Amanda Lovett
+#      github: alovett-COAPS
 
 
 
diff --git a/source/_includes/header.html b/source/_includes/header.html
index 43644c4..5c0390e 100644
--- a/source/_includes/header.html
+++ b/source/_includes/header.html
@@ -27,11 +27,18 @@
           </div>
           <div class="navbar-right">
             <ul class="nav navbar-nav">
-              <li><a href="{{ site.baseurl }}/docs">Docs</a></li>
+              <li class="dropdown toggle">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About SDAP <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="{{ site.baseurl }}/docs">Docs</a></li>
+                  <li><a href="{{ site.baseurl }}/publications">Publications</a></li>
+                  <li><a href="{{ site.baseurl }}/projects">Projects that use SDAP</a></li>
+                </ul>
+              </li>
               <li><a href="{{ site.baseurl }}/downloads">Downloads</a></li>
               <li><a href="{{ site.baseurl }}/blog">Blog</a></li>
               <li><a href="{{ site.baseurl }}/team">Team &amp; Community</a></li>
-              <li><a href="{{ site.baseurl }}/resources">Resources</a></li>
+<!--              <li><a href="{{ site.baseurl }}/resources">Resources</a></li>-->
               <li class="dropdown toggle">
               	<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache <span class="caret"></span></a>
                 <ul class="dropdown-menu">
diff --git a/source/docs.html b/source/docs.html
index 5daef4e..6bdbaad 100644
--- a/source/docs.html
+++ b/source/docs.html
@@ -7,9 +7,22 @@
 
 <p>This page describes how to install, use, and contribute to SDAP.</p>
 
-<h2 id="development">Development</h2>
+<h2>Build and Deploy SDAP locally</h2>
 
-<p>You can find out <a href="https://cwiki.apache.org/confluence/display/SDAP/Home">Wiki here</a>. Feel free to add SDAP related content to it!</p>
-<p>Get involved and contribute to SDAP through our <a href="http://sdap.apache.org/team">Community Hubs</a>.
+<p>
+    Guides to <a href="https://incubator-sdap-nexus.readthedocs.io/en/latest/build.html">build</a> and <a href="https://incubator-sdap-nexus.readthedocs.io/en/latest/quickstart.html">deploy</a> SDAP using Docker are available at Read the Docs.
+</p>
+
+<h2>Deployment to Production</h2>
+<p>
+    Included with the SDAP release (Nexus) are the requisite Helm Charts to deploy SDAP to a Kubernetes cluster (currently tested between k8s versions 1.22 and 1.25). This allows for a scalable,
+    production deployment of SDAP to either a privately maintained cluster or to a cloud service provider like Amazon Web Service's Elastic Kubernetes Service.
+</p>
+
+
+<h2 id="development">Contribution</h2>
+
+<p>You can find our <a href="https://cwiki.apache.org/confluence/display/SDAP/Home">Wiki here</a>. Feel free to add SDAP related content to it!</p>
+<p>See how you can get involved and contribute to SDAP through our <a href="http://sdap.apache.org/team#community">Community Hubs</a>.
 
 {% include footer.html %}
diff --git a/source/favicon.png b/source/favicon.png
index a3c70be..bd86b57 100644
Binary files a/source/favicon.png and b/source/favicon.png differ
diff --git a/source/projects.html b/source/projects.html
new file mode 100644
index 0000000..9101301
--- /dev/null
+++ b/source/projects.html
@@ -0,0 +1,14 @@
+---
+---
+
+{% include header.html %}
+
+<h1>Projects</h1>
+
+<p>This page lists some examples of projects powered by SDAP. SDAP supports a wide variety of scientific projects, from oceans, to the atmosphere, to land surface and vegetation, with support for more science disciplines planned for the future.</p>
+
+<h2>Project List</h2>
+
+TBA
+
+{% include footer.html %}
diff --git a/source/team.html b/source/team.html
index e3c8c24..8fca728 100644
--- a/source/team.html
+++ b/source/team.html
@@ -9,7 +9,7 @@
 
 <p>The SDAP team happily welcomes contributors and supporters of our work. Contributions, bug reports, and suggestions are welcome for the core products, website, documentation, and everything else! See below for more information on joining our community, submitting effective contributions and bug reports.</p>
 
-<h2>Members</h2>
+<h2>Team</h2>
 
 {% for org in site.data.team.team %}
   <h3>{{ org.org }}</h3>
@@ -34,32 +34,32 @@
 {% endfor %}
 
 <div class="ui vertical segment">
-  <h2 class="ui header">Mailing Lists</h2>
-  <h3 class="ui header">
-    <i class="user icon"></i>
-    <div class="content">Users</div>
-  </h3>
+  <h2 class="ui header" id="community">Community Hubs</h2>
+  <h3 class="ui header">Mailing Lists</h3>
   <p>
-    For users of Apache SDAP who want to keep up to date with new releases and community highlights.  To subscribe, email <a href="mailto:user-subscribe@sdap.apache.org">user-subscribe@sdap.apache.org</a>.
+    The SDAP mailing lists are the official form of communication for the SDAP community, where we hold discussions and votes on new features and releases as well as make project announcements.
   </p>
-  <h3 class="ui header">
+<!--  <h4 class="ui header">-->
+<!--    <i class="user icon"></i>-->
+<!--    <div class="content">Users</div>-->
+<!--  </h4>-->
+<!--  <p>-->
+<!--    For users of Apache SDAP who want to keep up to date with new releases and community highlights.  To subscribe, email <a href="mailto:user-subscribe@sdap.apache.org">user-subscribe@sdap.apache.org</a>.-->
+<!--  </p>-->
+  <h4 class="ui header">
     <i class="code icon"></i>
     <div class="content">Dev</div>
-  </h3>
+  </h4>
   <p>
     For contributors to Apache SDAP or those interested in ongoing design and development efforts.  To subscribe, email <a href="mailto:dev-subscribe@sdap.apache.org">dev-subscribe@sdap.apache.org</a>.
   </p>
-  <h3 class="ui header">
+  <h4 class="ui header">
     <i class="upload icon"></i>
     <div class="content">Commits</div>
-  </h3>
+  </h4>
   <p>
     For emails-on-commit across all Apache SDAP products.  To subscribe, email <a href="mailto:commits-subscribe@sdap.apache.org">commits-subscribe@sdap.apache.org</a>.
   </p>
-</div>
-
-<div class="ui vertical segment">
-  <h2 class="ui header">Community Hubs</h2>
   <h3 class="ui header">
     <i class="github icon"></i>
     <div class="content">GitHub</div>
@@ -67,13 +67,6 @@
   <p>
     <a href="https://github.com/apache?q=incubator-sdap">Find our code on Github</a> to browse and contribute.
   </p>
-  <h3 class="ui header">
-    <i class="twitter icon"></i>
-    <div class="content">Twitter</div>
-  </h3>
-  <p>
-    <a href="https://twitter.com/apachesdap">Follow us on Twitter</a> to keep up to date on Apache SDAP and related developments.
-  </p>
   <h3 class="ui header">
     <i class="bug icon"></i>
     <div class="content">Issues and Bugs</div>
@@ -88,6 +81,16 @@
   <p>
     See our <a href="https://cwiki.apache.org/confluence/display/SDAP">wiki</a> for detailed information on project organization, roadmaps, etc.
   </p>
+    <h3 class="ui header">
+    <div class="content">Social Media</div>
+  </h3>
+  <h4 class="ui header">
+    <i class="twitter icon"></i>
+    <div class="content">Twitter</div>
+  </h4>
+  <p>
+    <a href="https://twitter.com/apachesdap">Follow us on Twitter</a> to keep up to date on Apache SDAP and related developments.
+  </p>
 </div>
 
 {% include footer.html %}
diff --git a/team.html b/team.html
index 85c37a2..4ecf0ec 100644
--- a/team.html
+++ b/team.html
@@ -27,11 +27,18 @@
           </div>
           <div class="navbar-right">
             <ul class="nav navbar-nav">
-              <li><a href="/docs">Docs</a></li>
+              <li class="dropdown toggle">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About SDAP <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="/docs">Docs</a></li>
+                  <li><a href="/publications">Publications</a></li>
+                  <li><a href="/projects">Projects that use SDAP</a></li>
+                </ul>
+              </li>
               <li><a href="/downloads">Downloads</a></li>
               <li><a href="/blog">Blog</a></li>
               <li><a href="/team">Team &amp; Community</a></li>
-              <li><a href="/resources">Resources</a></li>
+<!--              <li><a href="/resources">Resources</a></li>-->
               <li class="dropdown toggle">
               	<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache <span class="caret"></span></a>
                 <ul class="dropdown-menu">
@@ -55,10 +62,10 @@
 
 <p>The SDAP team happily welcomes contributors and supporters of our work. Contributions, bug reports, and suggestions are welcome for the core products, website, documentation, and everything else! See below for more information on joining our community, submitting effective contributions and bug reports.</p>
 
-<h2>Members</h2>
+<h2>Team</h2>
 
 
-  <h3>Apache Software Foundation - Committers</h3>
+  <h3>Apache Software Foundation - Committers & PPMC</h3>
 
   <div class="team row">
 
@@ -270,22 +277,11 @@
     </dl>
   </div>
     
-    <div class="team-member col-md-6">
-    <img src="https://avatars.githubusercontent.com/rawkintrevo" class="team-avatar img-thumbnail" />
-    <h4>Trevor Grant</h4>
-    <dl>
-      <dt>GitHub:</dt>
-      <dd><a class="external" href="https://github.com/rawkintrevo">rawkintrevo</a></dd>
-      <dt>Email:</dt>
-      <dd><a href="mailto:rawkintrevo@apache.org">rawkintrevo at apache dot org</a></dd>
-    </dl>
-  </div>
-    
 
   </div>
 
 
-  <h3>Jet Propulsion Laboratory</h3>
+  <h3>NASA's Jet Propulsion Laboratory, California Institute of Technology</h3>
 
   <div class="team row">
 
@@ -351,32 +347,32 @@
 
 
 <div class="ui vertical segment">
-  <h2 class="ui header">Mailing Lists</h2>
-  <h3 class="ui header">
-    <i class="user icon"></i>
-    <div class="content">Users</div>
-  </h3>
+  <h2 class="ui header" id="community">Community Hubs</h2>
+  <h3 class="ui header">Mailing Lists</h3>
   <p>
-    For users of Apache SDAP who want to keep up to date with new releases and community highlights.  To subscribe, email <a href="mailto:user-subscribe@sdap.apache.org">user-subscribe@sdap.apache.org</a>.
+    The SDAP mailing lists are the official form of communication for the SDAP community, where we hold discussions and votes on new features and releases as well as make project announcements.
   </p>
-  <h3 class="ui header">
+<!--  <h4 class="ui header">-->
+<!--    <i class="user icon"></i>-->
+<!--    <div class="content">Users</div>-->
+<!--  </h4>-->
+<!--  <p>-->
+<!--    For users of Apache SDAP who want to keep up to date with new releases and community highlights.  To subscribe, email <a href="mailto:user-subscribe@sdap.apache.org">user-subscribe@sdap.apache.org</a>.-->
+<!--  </p>-->
+  <h4 class="ui header">
     <i class="code icon"></i>
     <div class="content">Dev</div>
-  </h3>
+  </h4>
   <p>
     For contributors to Apache SDAP or those interested in ongoing design and development efforts.  To subscribe, email <a href="mailto:dev-subscribe@sdap.apache.org">dev-subscribe@sdap.apache.org</a>.
   </p>
-  <h3 class="ui header">
+  <h4 class="ui header">
     <i class="upload icon"></i>
     <div class="content">Commits</div>
-  </h3>
+  </h4>
   <p>
     For emails-on-commit across all Apache SDAP products.  To subscribe, email <a href="mailto:commits-subscribe@sdap.apache.org">commits-subscribe@sdap.apache.org</a>.
   </p>
-</div>
-
-<div class="ui vertical segment">
-  <h2 class="ui header">Community Hubs</h2>
   <h3 class="ui header">
     <i class="github icon"></i>
     <div class="content">GitHub</div>
@@ -384,13 +380,6 @@
   <p>
     <a href="https://github.com/apache?q=incubator-sdap">Find our code on Github</a> to browse and contribute.
   </p>
-  <h3 class="ui header">
-    <i class="twitter icon"></i>
-    <div class="content">Twitter</div>
-  </h3>
-  <p>
-    <a href="https://twitter.com/apachesdap">Follow us on Twitter</a> to keep up to date on Apache SDAP and related developments.
-  </p>
   <h3 class="ui header">
     <i class="bug icon"></i>
     <div class="content">Issues and Bugs</div>
@@ -405,6 +394,16 @@
   <p>
     See our <a href="https://cwiki.apache.org/confluence/display/SDAP">wiki</a> for detailed information on project organization, roadmaps, etc.
   </p>
+    <h3 class="ui header">
+    <div class="content">Social Media</div>
+  </h3>
+  <h4 class="ui header">
+    <i class="twitter icon"></i>
+    <div class="content">Twitter</div>
+  </h4>
+  <p>
+    <a href="https://twitter.com/apachesdap">Follow us on Twitter</a> to keep up to date on Apache SDAP and related developments.
+  </p>
 </div>
 
       <!-- footer -->
diff --git a/weekly/update/2018/04/23/ranking-algorithms.html b/weekly/update/2018/04/23/ranking-algorithms.html
index b658858..5c48423 100644
--- a/weekly/update/2018/04/23/ranking-algorithms.html
+++ b/weekly/update/2018/04/23/ranking-algorithms.html
@@ -27,11 +27,18 @@
           </div>
           <div class="navbar-right">
             <ul class="nav navbar-nav">
-              <li><a href="/docs">Docs</a></li>
+              <li class="dropdown toggle">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About SDAP <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="/docs">Docs</a></li>
+                  <li><a href="/publications">Publications</a></li>
+                  <li><a href="/projects">Projects that use SDAP</a></li>
+                </ul>
+              </li>
               <li><a href="/downloads">Downloads</a></li>
               <li><a href="/blog">Blog</a></li>
               <li><a href="/team">Team &amp; Community</a></li>
-              <li><a href="/resources">Resources</a></li>
+<!--              <li><a href="/resources">Resources</a></li>-->
               <li class="dropdown toggle">
               	<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache <span class="caret"></span></a>
                 <ul class="dropdown-menu">
diff --git a/weekly/update/2018/04/23/recommendation-algorithms.html b/weekly/update/2018/04/23/recommendation-algorithms.html
index cffbf8a..4941182 100644
--- a/weekly/update/2018/04/23/recommendation-algorithms.html
+++ b/weekly/update/2018/04/23/recommendation-algorithms.html
@@ -27,11 +27,18 @@
           </div>
           <div class="navbar-right">
             <ul class="nav navbar-nav">
-              <li><a href="/docs">Docs</a></li>
+              <li class="dropdown toggle">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About SDAP <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="/docs">Docs</a></li>
+                  <li><a href="/publications">Publications</a></li>
+                  <li><a href="/projects">Projects that use SDAP</a></li>
+                </ul>
+              </li>
               <li><a href="/downloads">Downloads</a></li>
               <li><a href="/blog">Blog</a></li>
               <li><a href="/team">Team &amp; Community</a></li>
-              <li><a href="/resources">Resources</a></li>
+<!--              <li><a href="/resources">Resources</a></li>-->
               <li class="dropdown toggle">
               	<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache <span class="caret"></span></a>
                 <ul class="dropdown-menu">
diff --git a/weekly/update/2018/04/23/vocabulary-similarity-algorithm.html b/weekly/update/2018/04/23/vocabulary-similarity-algorithm.html
index 92e1f14..433f19d 100644
--- a/weekly/update/2018/04/23/vocabulary-similarity-algorithm.html
+++ b/weekly/update/2018/04/23/vocabulary-similarity-algorithm.html
@@ -27,11 +27,18 @@
           </div>
           <div class="navbar-right">
             <ul class="nav navbar-nav">
-              <li><a href="/docs">Docs</a></li>
+              <li class="dropdown toggle">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About SDAP <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="/docs">Docs</a></li>
+                  <li><a href="/publications">Publications</a></li>
+                  <li><a href="/projects">Projects that use SDAP</a></li>
+                </ul>
+              </li>
               <li><a href="/downloads">Downloads</a></li>
               <li><a href="/blog">Blog</a></li>
               <li><a href="/team">Team &amp; Community</a></li>
-              <li><a href="/resources">Resources</a></li>
+<!--              <li><a href="/resources">Resources</a></li>-->
               <li class="dropdown toggle">
               	<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Apache <span class="caret"></span></a>
                 <ul class="dropdown-menu">