www/server/staging/layout footer-text.html body...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 18/12/30 06:26:37

Modified files:
        server/staging/layout: footer-text.html body-include-2.html 

Log message:
        Shorten entries in navbars.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/layout/footer-text.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/layout/body-include-2.html?cvsroot=www&r1=1.4&r2=1.5

Patches:
Index: footer-text.html
===================================================================
RCS file: /webcvs/www/www/server/staging/layout/footer-text.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- footer-text.html    28 Dec 2018 13:24:22 -0000      1.4
+++ footer-text.html    30 Dec 2018 11:26:36 -0000      1.5
@@ -5,11 +5,11 @@
 <hr class="no-display" />
 <div id="fsf-links">
  <ul>
-  <li><a href="/proprietary/proprietary.html">PROPR.&nbsp;MALWARE</a></li>
+  <li><a href="/proprietary/proprietary.html">MALWARE</a></li>
   <li><a href="/graphics/graphics.html">GNU&nbsp;ART</a></li>
   <li><a href="/people/people.html">GNU'S&nbsp;WHO?</a></li>
-  <li><a href="/server/sitemap.html">SITE&nbsp;MAP</a> <span>|</span></li>
-  <li><a href="//directory.fsf.org">FREE&nbsp;SOFTWARE&nbsp;DIRECTORY</a></li>
+  <li><a href="/server/sitemap.html">SITEMAP</a> &nbsp; &nbsp;</li>
+  <li><a href="//directory.fsf.org">FS&nbsp;DIR.</a></li>
   <li><a href="https://h-node.org/";>HARDWARE</a></li>
  </ul>
 </div><!-- /fsf-links -->

Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/layout/body-include-2.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- body-include-2.html 28 Dec 2018 12:33:03 -0000      1.4
+++ body-include-2.html 30 Dec 2018 11:26:36 -0000      1.5
@@ -38,12 +38,12 @@
 <!--#if expr="$REQUEST_URI = /^\/gnu\//" -->
   <li id="tabAboutGNU" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
-    <a href="/gnu/gnu.html">ABOUT&nbsp;GNU</a>
+    <a href="/gnu/gnu.html">ABOUT</a>
     <span class="gnun-split"></span>
     <!--#echo encoding="none" var="MARK_END" -->
   </li>
 <!--#else -->
-   <li id="tabAboutGNU"><a href="/gnu/gnu.html">ABOUT&nbsp;GNU</a></li>
+   <li id="tabAboutGNU"><a href="/gnu/gnu.html">ABOUT</a></li>
 <!--#endif -->
 <!--#if expr="$REQUEST_URI = /^\/philosophy\//" -->
   <li id="tabPhilosophy" class="active">
@@ -88,12 +88,12 @@
 <!--#if expr="$REQUEST_URI = /^\/(doc|manual)\//" -->
   <li id="tabDoc" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
-    <a href="/doc/doc.html">DOCUMENTATION</a>
+    <a href="/doc/doc.html">DOC</a>
     <span class="gnun-split"></span>
     <!--#echo encoding="none" var="MARK_END" -->
   </li>
 <!--#else -->
-  <li id="tabDoc"><a href="/doc/doc.html">DOCUMENTATION</a></li>
+  <li id="tabDoc"><a href="/doc/doc.html">DOC</a></li>
 <!--#endif -->
 <!--#if expr="$REQUEST_URI = /^\/help\//" -->
   <li id="tabHelp" class="active">