[geode-site] branch asf-site updated: Update 404 message (remove "incubation"), fix bad links

[db...@apache.org]

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

dbarnes pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/geode-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new c709d16  Update 404 message (remove "incubation"), fix bad links
c709d16 is described below

commit c709d164bd89831a046be739f18705b7ec5c12cc
Author: Dave Barnes <db...@pivotal.io>
AuthorDate: Mon Jan 14 16:54:37 2019 -0800

    Update 404 message (remove "incubation"), fix bad links
---
 .htaccess |  2 ++
 404.html  | 25 +------------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/.htaccess b/.htaccess
index c2f2675..832b2bb 100755
--- a/.htaccess
+++ b/.htaccess
@@ -16,3 +16,5 @@
 RewriteEngine On
 RewriteCond %{HTTPS} !=on
 RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R,L]
+RedirectMatch 301 /serverman/(.*) https://geode.apache.org/docs/guide/18/$1
+
diff --git a/404.html b/404.html
index d121bbc..1aa0b53 100644
--- a/404.html
+++ b/404.html
@@ -35,39 +35,16 @@
       <div class='main'>
         <header>
           <a id='logo' href='/'></a>
-          <div id='navigation'>
-            <ul>
-              <li id='gettingstartedlink'><a href='/getting-started'>Getting Started</a></li>
-              <li id='communitylink'><a href='/community'>Community</a></li>
-              <li id='contributelink'><a href='/contribute'>Contribute</a></li>
-              <li id='docslink'><a href='/docs'>Docs</a></li>
-              <li id='aboutlink'><a href='/about'>About</a></li>
-              <li id='downloadlink'><a href='/download'>Download</a></li>
-            </ul>
-          </div>
         </header>
         <div id='content'>
             <h1>File Not Found</h1>
         </div>
+            <a href="https://geode.apache.org/">Return to the Apache Geode website</a>
       </div>
       <footer id="footer">
         <div class="container">
-            <ul>
-              <li><a href='http://stackoverflow.com/questions/tagged/geode+or+gemfire'>Stack Overflow</a></li>
-              <li>•</li>
-              <li><a href='https://issues.apache.org/jira/browse/GEODE'>JIRA</a></li>
-              <li>•</li>
-              <li><a href='http://mail-archives.apache.org/mod_mbox/incubator-geode-dev/'>Dev Mailing List</a></li>
-              <li>•</li>
-              <li><a href='https://cwiki.apache.org/confluence/display/GEODE/Index'>Wiki</a></li>
-            </ul>
             <div class="row">
-                <div class="col-md-4 col-sm-5">
-                    <div class="logo"><a href="#wrapper"><img src="/images/egg-logo1.png"></a></div>
-                </div>
                 <div class="col-md-4 col-sm-4">
-                    <p style="text-align: center">
-                       Apache Geode is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate th [...]
                      <p style="text-align: center">
                         Copyright &copy; <script>var d = new Date();document.write(d.getFullYear());</script> <a href="http://www.apache.org/">The Apache Software Foundation</a>.<br> Apache, Apache Geode (incubating), the Apache feather, Geode logo are trademarks of The Apache Software Foundation. 
                     </p>