www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/server/staging/nav-bar/test9 layout7.css bo...


From: Therese Godefroy
Subject: www/server/staging/nav-bar/test9 layout7.css bo...
Date: Mon, 07 Sep 2015 22:11:19 +0000

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 15/09/07 22:11:18

Modified files:
        server/staging/nav-bar/test9: layout7.css body-include-1.html 
                                      body-include-2.html education.html 
                                      education.ar.html 
                                      license-list.html 
                                      essays-and-articles.html 
                                      edu-software-tuxpaint.html 
                                      edu-software-gimp.html 
                                      edu-software-gcompris.html 
                                      home5.html 
                                      edu-cases-india-irimpanam.html 
                                      page-tags.html 
                                      philosophy-menu.html 
                                      philosophy.html 
                                      body-include-2.fr.html 
                                      edu-cases-india-ambedkar.html 
Added files:
        server/staging/nav-bar/test9: style.rtl.css 
                                      body-include-1.ar.html 
                                      body-include-2.ar.html 
                                      banner.ar.html 

Log message:
        Fix page-tags and philosophy-menu; test the underlining method 
suggested by Ineiev; restyle a few pages with floating stuff.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.81&r2=1.82
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-1.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/education.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/education.ar.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/license-list.html?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/essays-and-articles.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-gimp.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-gcompris.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home5.html?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-cases-india-irimpanam.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/page-tags.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/philosophy-menu.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/philosophy.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.fr.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-cases-india-ambedkar.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/style.rtl.css?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-1.ar.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.ar.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/banner.ar.html?cvsroot=www&rev=1.1

Patches:
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- layout7.css 3 Sep 2015 19:41:28 -0000       1.81
+++ layout7.css 7 Sep 2015 22:11:15 -0000       1.82
@@ -159,7 +159,7 @@
 }
 .inner { overflow: hidden; }
 
-.inner h2, .inner  ul { padding-left: 1.5%; }
+.inner h2, .inner  ul { padding-left: 3%; }
 #content ul { padding-left: 0; }
 
 a[href] { color: #005090; }
@@ -187,7 +187,7 @@
 
 
 .center, .c { text-align: center; }
-.nocenter{ text-align: left; }
+#content .nocenter{ text-align: left; }
 
 .underline { text-decoration: underline; }
 .nounderline { text-decoration: none; }
@@ -201,6 +201,26 @@
 
 .netscape4, .no-display { display: none !important; }
 
+.rounded-corners {
+   border-radius: .4em;
+   -moz-border-radius: .4em;
+   -khtml-border-radius: .4em;
+   -webkit-border-radius: .4em;
+   -opera-border-radius: .4em;
+}
+.button-shadow {
+   box-shadow: 0 .15em #171d33;
+   -moz-box-shadow: 0 .15em #171d33;
+   -webkit-box-shadow: 0 .15em #171d33;
+   -icab-box-shadow: 0 .15em #171d33;
+   -o-box-shadow: 0 .15em #171d33;
+   border-radius: 1em;
+   -moz-border-radius: 1em;
+   -khtml-border-radius: 1em;
+   -webkit-border-radius: 1em;
+   -opera-border-radius: 1em;
+}
+
 
 /*** TOP OF THE PAGE ***/
 
@@ -209,7 +229,7 @@
    font-size: .9em;
    font-family: "FreeSans", sans-serif;
    font-weight: bold;
-   padding: .6em 1.7em 0 1.7em;
+   padding: .6em 1.8em .4em 1.8em;
    margin: 0;
 }
 #toplinks a, #toplinks a:visited {
@@ -225,7 +245,7 @@
    display: block;
    text-align: right;
    font-weight: bold;
-   padding: .3em 2%;
+   padding: .3em 3%;
    background-color: #d1d4d7;
 }
 #searcher input {
@@ -238,25 +258,14 @@
    margin: 0;
    color: #555;
    background: white;
-   border: .1em solid #c9cccf;
-   border-radius: .3em;
-   -moz-border-radius: .3em;
-   -khtml-border-radius: .3em;
-   -webkit-border-radius: .3em;
-   -opera-border-radius: .3em;
+   border: .1em solid #999;
 }
 #searcher input[type="submit"] {
    padding: .2em .4em;
    margin: 0;
    color: #333;
    background: #e7e9eb;
-   border: .1em solid #c9cccf;
-   border-radius: .3em;
-   -moz-border-radius: .3em;
-   -khtml-border-radius: .3em;
-   -webkit-border-radius: .3em;
-   -opera-border-radius: .3em;
-
+   border: .1em solid #999;
 }
 #searcher input[type="text"]:focus {
    color: #333;
@@ -280,7 +289,7 @@
 }
 #translations p {
    padding: .2em 0;
-   margin: 0 2%;
+   margin: 0 3%;
    background-color: #f0f2f4;
 }
 #translations span {
@@ -309,7 +318,7 @@
 
 #header {
    font-family: "FreeSans", sans-serif;
-   margin: 0 2%;
+   margin: 0 3%;
    background-color: white;
 }
 #header:after {
@@ -331,6 +340,7 @@
    font-weight: bold;
    text-decoration: none;
 }
+#fsf-frame a:hover { color: #777; }
 #fsf-frame p { padding: 0; margin: 0; }
 #fsf-frame hr { display: none; }
 
@@ -341,16 +351,6 @@
    padding: .3em 1em;
    color: #971611;
    background: #e7e9eb;
-   border-radius: 1em;
-   -moz-border-radius: 1em;
-   -khtml-border-radius: 1em;
-   -webkit-border-radius: 1em;
-   -opera-border-radius: 1em;
-   box-shadow:  0 .15em #171d33;
-   -moz-box-shadow:  0 .15em #171d33;
-   -webkit-box-shadow:  0 .15em #171d33;
-   -icab-box-shadow:  0 .15em #171d33;
-   -o-box-shadow:  0 .15em #171d33;
 }
 
 #fssbox {
@@ -371,11 +371,6 @@
    color: #555;
    background: white;
    border: .1em solid #999;
-   border-radius: .3em;
-   -moz-border-radius: .3em;
-   -khtml-border-radius: .3em;
-   -webkit-border-radius: .3em;
-   -opera-border-radius: .3em;
 }
 #fssbox input[type="submit"] {
    padding: .2em .4em;
@@ -383,16 +378,6 @@
    color: #333;
    background: #e7e9eb;
    border: .1em solid #e7e9eb;
-   border-radius: 1em;
-   -moz-border-radius: 1em;
-   -khtml-border-radius: 1em;
-   -webkit-border-radius: 1em;
-   -opera-border-radius: 1em;
-   box-shadow: 0 .15em #171d33;
-   -moz-box-shadow: 0 .15em #171d33;
-   -webkit-box-shadow: 0 .15em #171d33;
-   -icab-box-shadow: 0 .15em #171d33;
-   -o-box-shadow: 0 .15em #171d33;
 }
 #fssbox input[type="text"]:focus {
    color: #333;
@@ -404,11 +389,14 @@
 #fssbox input[type="text"]:focus + input[type="submit"] {
    border: .1em solid #334683;
 }
-#fsf-frame a:hover { color: #777; }
 
-/* For "normal" pages */
address@hidden (max-width: 40em) {
-   #gnu-banner { clear: both }
+/* Try to optimize #fsf-frame for narrow screens. */
address@hidden (max-width: 55em) {
+   #header { margin: 0 3%; }
+   #header #gnu-banner { clear: both; padding-top: 1em; }
+   #fsf-frame { float: none; margin: 0; }
+   #fsf-frame #fssbox { float: right; padding-top: .8em; margin: 0; }
+   #fsf-frame #join-fsf { float: left; padding: 1.2em 0 .5em 0; margin-left: 
2em; }
 }
 
 #gnu-banner {
@@ -435,7 +423,7 @@
    font-size: .9em;
    font-weight: bold;
    font-style: italic;
-   padding: .5em 0;
+   padding: .5em 0 .8em 0;
    margin: 0;
    color: #555;
 }
@@ -458,6 +446,7 @@
    cursor:pointer;
 }
 
+
 /*** PROMOTIONAL BANNER ***/
 
 .promo-banner {
@@ -513,12 +502,12 @@
 
 #all-tags, .page-tags {
    font-family: "FreeSans", sans-serif;
-   margin: .6em 2%;
+   margin: .6em 3%;
    color: #555;
 }
 #all-tags {
    text-align: center;
-   line-height: 1.6em;
+   line-height: 2em;
    margin: 2em 1.6em; }
 #content .page-tags { margin: .4em 0; }
 
@@ -535,17 +524,12 @@
 
 /*** CONTENT ***/
 
-#content:after {
-   clear: both; content: ""; display: block;
-   height: 0px; visibility: hidden; width: 0px;
-}
 #content {
    text-align: left;
-   padding: 0 2% 1em 2%; margin-top: 0;
+   padding: 0 3%;
 }
 #content h1, #content h2 {
    font-weight:bold;
-   text-align: center;
    padding: 0;
    margin: 1em 0 1.3em 0;
    color: #334683; text-shadow: #999 1px 1px 0;
@@ -570,7 +554,7 @@
 }
 #content li, #fsf-campaigns li, #content dd, #content p, #content pre,
    #content dt, #content code, #content address { line-height: 1.3em; }
-
+   #content li { margin-bottom: .2em; }
 #content h3 a[href]:visited, #content h4 a[href]:visited { color: #334683; }
 #content h3 a[href]:hover, #content h4 a[href]:hover { color: #777; }
 
@@ -581,7 +565,7 @@
    text-align: right;
    font-weight: bold;
    line-height: 1.5em;
-   padding: .6em 1em .4em 1em; }
+   padding: .4em 0; }
 #content p.back a, .back a:visited { color: #333; }
 #content p.back a:hover { color: #777; }
 
@@ -593,6 +577,7 @@
    font-family: "FreeSans", sans-serif;
    padding: .3em;
    background-color: #d1d4d7;
+   margin-top: 2em;
 }
 #fsf-links ul {
    text-align: center;
@@ -620,7 +605,7 @@
 
 #mission-statement {
    font-size: 0.9em;
-   margin: 2em 2% 1em 2%;
+   margin: 2em 3% 1em 3%;
 }
 #mission-statement blockquote {
    font-weight: bold;
@@ -638,7 +623,7 @@
    float: right;
    font-size: 1.1em;
    font-weight: bold;
-   margin: .7em 1em 1.5em 1em;
+   margin: 2em 0 1.5em 0;
 }
 div#backtotop {
 /* For older versions of layout. */
@@ -648,7 +633,7 @@
 #backtotop a, #backtotop a:visited { color: #333; }
 #backtotop a:hover { color: #777; }
 
-#sisters { font-size: .9em; margin: 0 2% 1.5em 2%; }
+#sisters { font-size: .9em; margin: 0 3% 1.5em 3%; }
 
 
 /*** FOOTER ***/
@@ -656,7 +641,7 @@
 #footer {
    clear: both;
    font-size: .9em;
-   padding: 1.11em 2%;
+   padding: 1.11em 3%;
    color: #333;
    background-color: #f0f2f4;
    border-top: 1px solid #c9cccf;
@@ -682,42 +667,28 @@
    float: left;
 }
 #home .second-column {
-   width: 38%;
+   width: 37%;
    float: right;
 }
address@hidden (max-width: 40em) {
-   #home .first-column, #home .second-column {
-      float: none;
-      width: 100%;
-   }
-}
 #home .first-column, #home .second-column {
-   margin-bottom: 2em; margin-top: 0;
+   margin: 0;
 }
 
 #home h2 {
-   text-align: left;
    text-shadow: none;
    padding: 0;
-   margin-top: .7em; margin-bottom: .6em;
+   margin-top: 1.1em; margin-bottom: .6em;
+}
+#home .first-column img {
+   width: 100%; max-width: 35em;
+   margin: .5em auto 1em auto;
 }
-#home .first-column img { width: 80%; margin: .5em 0 1em 0; }
 #home .second-column h4 img { height: .75em; width: .75em; }
 
 #home .button {
    text-align: center;
    font-weight: bold;
-   margin-top: .7em; margin-bottom: .8em;
-   box-shadow: 0 .15em #171d33;
-   -moz-box-shadow: 0 .15em #171d33;
-   -webkit-box-shadow: 0 .15em #171d33;
-   -icab-box-shadow: 0 .15em #171d33;
-   -o-box-shadow: 0 .15em #171d33;
-   border-radius: 1em;
-   -moz-border-radius: 1em;
-   -khtml-border-radius: 1em;
-   -webkit-border-radius: 1em;
-   -opera-border-radius: 1em;
+   margin-top: 2.5em; margin-bottom: 2.5em;
 }
 .button a, .button a:visited {
    color: #971611;
@@ -726,10 +697,12 @@
 .button a:hover {
    color: #777;
 }
-.large {
-   width: auto: max-width: 100%;
+.large a {
+   display: inline-block;
+   font-family: "FreeSans", sans-serif;
    font-size: 2em;
-   padding: .1em;
+   padding: .1em .4em;
+   line-height: 1.3em;
    background-color: #e7e9eb;
    border: .4em solid #c9cccf;
 }
@@ -753,6 +726,7 @@
 #Action {
    text-align: left;
    padding: 0 1em;
+   margin-bottom: 2.5em;
    border-left: .4em solid #b9bcbf; border-right: .4em solid #b9bcbf;
 }
 
@@ -767,6 +741,10 @@
 }
 #Action li { margin-bottom: .7em; }
 
address@hidden (max-width: 55em) {
+   #home .first-column, #home .second-column {
+      float: none; width: 100%; }
+}
 
 /*** HIGHLIGHTED STUFF ***/
 
@@ -787,6 +765,9 @@
    border: 2px solid #b9bcbf;
 }
 
+
+/*** NOTES AND ANNOUNCEMENTS ***/
+
 /* For the announcements */
 #content div.announcement {
    font-size: 1.1em; font-weight: bold;
@@ -821,9 +802,9 @@
    float: right;
    text-align: center;
    font-style: normal;
-   max-width: 20em;
+   width: 20em;
    padding: 0;
-   margin: .3em 0 1em 1em;
+   margin: .3em 0 1em 1.5em;
    border: .3em solid #3465a4;
 }
 #content .note p {
@@ -833,29 +814,63 @@
    margin: 1em 0;
 }
 #content .note strong { font-size: 1.2em; }
-#content .summary li { padding-bottom: .3em; }
address@hidden (max-width: 40em) {
-   #content .note { float: none; margin: auto; }
address@hidden (max-width: 46em) {
+   #content .note { float: none; margin: .3em auto 1em auto; }
 }
 
 /* For the note about Free Software Free Society */
 #content blockquote#fsfs p { padding: .3em 0; }
 
-/* For small tables of contents. */
-#content .summary {
+
+/*** TABLES OF CONTENTS ***/
+
+/* Common definitions */
+#content div.summary, #content div.toc {
+   padding: 1.5em;
+   background: #f0f2f4;
+   border: 1px solid #c9cccf;
+}
+#content .summary ul, #content .summary ul li,
+#content .toc ul, #content .toc ul li {
+   margin-top: 0; margin-bottom: 0;
+}
+#content div.summary ul li a, #content div.toc ul li a {
+   line-height: 1.5em;
+   text-decoration: none;
+}
+#content .summary ul li strong a,
+#content .toc ul li strong a { line-height: 2em; }
+
+#content div.summary h3, #content div.toc h3,
+#content div.summary h4 {
+   text-align: center; padding-top: 0; margin-top: 0;
+   margin-bottom: .7em;
+}
+
+/* Small tables of contents */
+#content div.summary {
    clear: right;
    float: right;
    max-width: 24em;
-   padding: 1em;
-   margin: .3em 0 1em 1em;
-   background: #f0f2f4;
-   border: 1px solid #c9cccf;
+   margin: .3em 0 1.5em 1.5em;
 }
-#content .summary li { padding-bottom: .3em; }
address@hidden (max-width: 44em) {
address@hidden (max-width: 50em) {
    #content div.summary { float: none; margin: auto; }
 }
 
+/* Big tables of contents */
+#content div.toc {
+   max-width: 45em;
+   margin: 3em auto 1em; auto;
+}
+
+/* Lists of links (just to try) */
+#content .list-links a {
+   text-decoration: none;
+   border-bottom: solid 1px;
+}
+
+
 /*** TRANSLATED PAGES ***/
 
 /* For the note saying the page is a translation. */
@@ -866,7 +881,7 @@
    margin: 1em;
 }
 #content .trans-disclaimer a,
-#content .trans-disclaimer a:visited { color: #334683; }
+#content .trans-disclaimer a:visited { color: #333; }
 #content .trans-disclaimer a:hover { color: #777; }
 
 /* For outdated translations  */
@@ -905,7 +920,7 @@
    font-size: .9em; font-weight: bold;
    line-height: 1.8em;
    padding: 0;
-   margin: 0 -2.2%;
+   margin: 0 -3.3%;
 }
 #edu-navigation li {
    display: inline; white-space: nowrap;
@@ -941,6 +956,7 @@
 
 /* styles for subsections of /education "Case Studies" */
 div.edu-cases {
+   text-align: justify;
    border-top: 5px ridge #3465a4;
    border-bottom: 5px ridge #3465a4;
    padding: 1.5em 0;
@@ -960,14 +976,13 @@
 #content .photo {
    float: right;
    width: 30em; max-width: 100%;
-   margin: .3em 0 1em 0;
-}
-#content .photo img, #content .photo p {
-   width: 94%;
-   padding: 0 6%;
+   margin: .3em 0 1em 1.5em;
 }
-#content .photo img.recessed { width: 90%; }
+#content .photo img { width: 100% }
 
address@hidden (max-width: 55em) {
+   #content .photo { float: none; margin: auto }
+}
 
 /* End items specific to education */
 
@@ -1067,16 +1082,7 @@
 span.anchor-reference-id a { color: #333; }
 span.anchor-reference-id a[href]:hover { color: #777; }
 
-/* For license-list.html */
-#content div.toc {
-   max-width: 45em;
-   padding: 0 1em 1em 1em;
-   margin: 3em auto 1em auto;
-   background: #f0f2f4;
-   border: 1px solid #c9cccf;
-}
-#content div.toc h3 { text-align: center; }
-
+/* For license-list.html. */
 #content div.big-section {
    float: left;
 }
@@ -1167,11 +1173,11 @@
 /* Still used in some outdated translations? */
 #translations h3, #translations h4 {
    font-size: 1em; font-weight: bold;
-   padding: 1em 2% 0 2%;
+   padding: 1em 3% 0 3%;
    margin: 0;
 }
 #translations ul {
-   margin: 1em 2%;
+   margin: 1em 3%;
    background: #f0f2f4;
 }
 #translations li {

Index: body-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-1.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- body-include-1.html 1 Sep 2015 14:15:16 -0000       1.15
+++ body-include-1.html 7 Sep 2015 22:11:15 -0000       1.16
@@ -19,8 +19,8 @@
  <form method="get" action="//www.gnu.org/cgi-bin/estseek.cgi">
   <div>
   <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
-         value="Why GNU/Linux?" onfocus="this.value=''" />
-  <input type="submit" value="Search" />
+         value="Why GNU/Linux?" onfocus="this.value=''" 
class="rounded-corners" />
+  <input type="submit" value="Search" class="rounded-corners" />
   </div>
  </form>
 </div><!-- /searcher -->

Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- body-include-2.html 3 Sep 2015 19:03:11 -0000       1.26
+++ body-include-2.html 7 Sep 2015 22:11:15 -0000       1.27
@@ -2,7 +2,7 @@
 
 <div id="header">
 <div id="fsf-frame">
-<p id="join-fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN&nbsp;THE&nbsp;FSF</a></p>
+<p id="join-fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052"; 
class="button-shadow">JOIN&nbsp;THE&nbsp;FSF</a></p>
 <div id="fssbox">
 <p><a href="http://www.fsf.org/fss";>Free Software Supporter</a></p>
 <form action="https://my.fsf.org/civicrm/profile/create?reset=1&amp;gid=31"; 
method="post">
@@ -14,8 +14,8 @@
  </div>
  <p>
   <input type="text" id="frmEmail" name="email-Primary" size="18" 
maxlength="80"
-         value="email address" onfocus="this.value=''"/>
-  <input type="submit" name="_qf_Edit_next" value="Sign up" />
+         value="email address" onfocus="this.value=''" class="rounded-corners" 
/>
+  <input type="submit" name="_qf_Edit_next" value="Sign up" 
class="button-shadow" />
  </p>
 </form>
 </div><!-- /fssbox -->
@@ -27,15 +27,13 @@
 </div><!-- /gnu-banner -->
 
 <p id="fsf-support">Sponsored by the <a href="#mission-statement">Free 
Software Foundation</a></p>
-
 </div><!-- /header -->
 
-<div id="navigation">
 
+<div id="navigation">
   <ul>
 <!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
 <!--#set var="MARK_END" value=" <span class='no-display'>=</span> " -->
-
 <!--#if expr="$REQUEST_URI = /gnu\//" -->
   <li id="tabAboutGNU" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
@@ -46,7 +44,6 @@
 <!--#else -->
    <li id="tabAboutGNU"><a href="/gnu/about-gnu.html">About&nbsp;GNU</a></li>
 <!--#endif -->
-
 <!--#if expr="$REQUEST_URI = /\/philosophy/ || $REQUEST_URI = 
/rms-nyu-2001-transcript/ || $REQUEST_URI = /essays-and-articles/" -->
   <li id="tabPhilosophy" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
@@ -57,8 +54,7 @@
 <!--#else -->
    <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
 <!--#endif -->
-
-<!--#if expr="$REQUEST_URI = /\/licenses\// || $REQUEST_URI = /\/copyleft/" -->
+<!--#if expr="$REQUEST_URI = /\/license/ || $REQUEST_URI = /^\/copyleft\//" -->
   <li id="tabLicenses" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
     <a href="/licenses/licenses.html">Licenses</a>
@@ -68,8 +64,7 @@
 <!--#else -->
    <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
 <!--#endif -->
-
-<!--#if expr="$REQUEST_URI = /\/edu/ || $REQUEST_URI = /\/encyclopedia/" -->
+<!--#if expr="$REQUEST_URI = /\/edu/" -->
   <li id="tabEducation" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
     <a href="education.html">Education</a>
@@ -79,8 +74,7 @@
 <!--#else -->
    <li id="tabEducation"><a href="education.html">Education</a></li>
 <!--#endif -->
-
-<!--#if expr="$REQUEST_URI = /\/software/ || $REQUEST_URI = /\/distros/ || 
$REQUEST_URI = /\/gethelp/" -->
+<!--#if expr="$REQUEST_URI = /\/software/ || $REQUEST_URI = /\/gethelp/" -->
   <li id="tabSoftware" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
     <a href="software.html">Software</a>
@@ -90,8 +84,7 @@
 <!--#else -->
    <li id="tabSoftware"><a href="software.html">Software</a></li>
 <!--#endif -->
-
-<!--#if expr="$REQUEST_URI = /\/doc/ || $REQUEST_URI = /\/manual/ || 
$REQUEST_URI = /books/" -->
+<!--#if expr="$REQUEST_URI = /^\/doc\// || $REQUEST_URI = /^\/manual\// || 
$REQUEST_URI = /books/" -->
   <li id="tabDoc" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
     <a href="/doc/doc.html">Documentation</a>
@@ -101,8 +94,7 @@
 <!--#else -->
    <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
 <!--#endif -->
-
-<!--#if expr="$REQUEST_URI = /\/help/" -->
+<!--#if expr="$REQUEST_URI = /^\/help\//" -->
   <li id="tabHelp" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
     <a href="/help/help.html">Help&nbsp;GNU</a>
@@ -113,7 +105,6 @@
    <li id="tabHelp"><a href="/help/help.html">Help&nbsp;GNU</a></li>
 <!--#endif -->
   </ul>
-
 </div><!--  /navigation -->
 
 <!--#include virtual="/server/staging/nav-bar/test9/page-tags.html" -->

Index: education.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/education.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- education.html      3 Sep 2015 19:03:11 -0000       1.22
+++ education.html      7 Sep 2015 22:11:16 -0000       1.23
@@ -10,13 +10,18 @@
 <!--
 #content #video-container {
    float: left; width: 40em;
-   padding-bottom: 2em; margin: 1em 0;
+   margin: 1em 0 2em 0;
 }
-#content #video-container p { text-align: justify; margin: 0; }
-#rms-movie { width: 100%; margin-bottom: 1em; }
+#content #video-container p {
+   text-align: justify;
+   padding: 1em; margin: 0;
+   background-color: #f0f2f4;
+   border: 1px solid #c9cccf;
+}
+#rms-movie { width: 100%; margin-bottom: .3em; }
 #content #indepth {
    text-align: left;
-   margin-top: 1em; margin-bottom: 2em; 
+   margin: 1em 0 2em 1em; 
 }
 #content #indepth ul {
    padding: 0 1em;
@@ -30,13 +35,13 @@
 #content #video-container { float: right; } -->
 <!--#endif -->
 <!--
address@hidden (max-width: 66em) {
-   #content #video-container { float: none; width: 100%;
-      max-width: 40em; margin: auto; }
-   #content #indepth { float: none; margin: auto }
-}
address@hidden (max-width: 40em) {
-   #content blockquote#free-games { float: none; margin: auto }
address@hidden (max-width: 68em) {
+   #content #video-container {
+      float: none; max-width: 100%;  width: 40em;
+      margin: 1em auto 2em auto; }
+   #content #indepth {
+      float: none; width: 39.5em; max-width: 98%;
+      margin: auto; }
 }
 -->
 </style>
@@ -46,12 +51,12 @@
 
 <!-- begin edu navigation bar -->
 <ul id="edu-navigation">
-  <li><a href="/education/edu-contents.html">Education Contents</a></li>
+  <li><a href="/education/edu-contents.html">Contents</a></li>
   <li><a href="/education/edu-cases.html">Case Studies</a></li>
-  <li><a href="/education/edu-resources.html">Educational Resources</a></li>
-  <li><a href="/education/edu-projects.html">Education Projects</a></li>
+  <li><a href="/education/edu-resources.html">Resources</a></li>
+  <li><a href="/education/edu-projects.html">Projects</a></li>
   <li><a href="/education/edu-faq.html">FAQ</a></li>
-  <li><a href="/education/edu-team.html">The Education Team</a></li>
+  <li><a href="/education/edu-team.html">Our Team</a></li>
 </ul>
 <!-- end edu navigation bar -->
 
@@ -211,7 +216,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/03 19:03:11 $
+$Date: 2015/09/07 22:11:16 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education.ar.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/education.ar.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- education.ar.html   8 Nov 2014 18:08:21 -0000       1.1
+++ education.ar.html   7 Sep 2015 22:11:16 -0000       1.2
@@ -1,3 +1,9 @@
+<!--#set var="PO_FILE"
+ value='<a href="/education/po/education.ar.po">
+ http://www.gnu.org/education/po/education.ar.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/education/education.html"
+ --><!--#set var="DIFF_FILE" value="/education/po/education.ar-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2013-04-13" -->
 <!--#set var="ENGLISH_PAGE" value="/education/education.en.html" -->
 
 <!--#include virtual="/server/html5-header.ar.html" -->
@@ -10,32 +16,45 @@
 <!--#include virtual="/education/po/education.translist" -->
 <style type="text/css" media="screen">
 <!--
-#rms-movie { min-width: 60%; max-width: 100%; }
-
+#content #video-container {
+   float: left; width: 40em;
+   margin: 1em 0 2em 0;
+}
+#content #video-container p {
+   text-align: justify;
+   padding: 1em; margin: 0;
+   background-color: #f0f2f4;
+   border: 1px solid #c9cccf;
+}
+#rms-movie { width: 100%; margin-bottom: .3em; }
 #content #indepth {
    text-align: left;
-   margin-top: 0;
+   margin: 1em 0 2em 1em; 
 }
 #content #indepth ul {
    padding: 0 1em;
    margin-top: 0;
 }
 #content #indepth li { padding-bottom: 1em; }
-#content #indepth h3 { padding: 1em; margin: 0; }
--->
-<!--#if expr="$LANGUAGE_SUFFIX = /\.(ar|fa|he)/" -->
+#content #indepth h3 { padding: 1em; margin: 0; }-->
+<!--#if expr="$LANGUAGE_SUFFIX = /\\.(ar|fa|he)/" -->
 <!--
 #content #indepth { text-align: right; }
--->
+#content #video-container { float: right; } -->
 <!--#endif -->
-
-
-
-
+<!--
address@hidden (max-width: 68em) {
+   #content #video-container {
+      float: none; max-width: 100%;  width: 40em;
+      margin: 1em auto 2em auto; }
+   #content #indepth {
+      float: none; width: 39.5em; max-width: 98%;
+      margin: auto; }
+}
 -->
 </style>
 
-<!--#include virtual="/server/banner.ar.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/banner.ar.html" -->
 <div id="education-content">
 
 <!-- begin edu navigation bar -->
@@ -65,13 +84,13 @@
 <h2>البرمجيات الحرة والتعليم</h2>
 </div>
 
-<h3>ما علاقة البرجيات الحرة بالتعليم؟</h3>
-
-<blockquote class="note"><p>
+<blockquote class="note" id="free-games"><p>
 نبحث عن ألعاب تعليمية حرة، أو ألعاب يمكن 
إستخدامها لأغراض تعليمية. راسلنا
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
 </p></blockquote>
 
+<h3>ما علاقة البرجيات الحرة بالتعليم؟</h3>
+
 <p>حرية إستخدام البرمجيات تلعب دور هام في 
العملية التعليمية. على المؤسسات
 التعليمية في مختلف المستويات أن تستخدم 
ونَدْرس البرمجيات الحرة لأنها الوحيدة
 من نوعها التى تسمح لتلك المؤسسات تحقيق 
رسالتها الجوهرية: نشر المعرفة البشرية
@@ -99,23 +118,7 @@
 href="http://www.fsf.org/about/leadership/#rms";> ريتشارد ستالمان 
Richard
 Stallman</a> بإختصار وفي صميم الموضوع مبادئ 
البرمجيات الحرة وكيفترتبط
 بالتعليم.</p>
-
-<blockquote class="note" id="indepth">
-<h3>في العمق</h3>
-
-<ul>
-<li>إعرف عن <a href="/education/edu-why.html">الدوافع</a> لم
اذا يجب على المؤسسات
-التعليمية أن يستخدم وتُعْلِم البرمجيات 
الحرة حصرياً.</li>
-
-<li>مقالة بواسطة ريتشارد ستالمن Richard Stallman:  <a
-href="/education/edu-schools.html"> لماذايجب على المدارس 
إستخدام البركجيات
-الحرة حصرياً</a></li>
-
-<li>مقالة بواسطة د/ ف. ساسي كومار Dr. V. Sasi Kumar عن 
 <a
-href="/education/edu-system-india.html"> النظام التعليمي في 
الهند. </a></li>
-</ul>
-</blockquote>
-
+<div id="video-container">
 <!-- GNUN: localize URL /education/rms-education-es.ogv -->
 <video  id="rms-movie" controls="controls">
   <source
@@ -129,9 +132,8 @@
      English with a link to the video with subtitles in your language, 
      if it exists. -->
 <a href="http://audio-video.gnu.org/video/rms-education-es-high-sub.en.ogv";>
-نزل و شاهد هذا المقطع</a>  بدقة وضوع أعلى  في 
صيغة Ogg Theora (ogv) الحرة.</p>
-
-<p>
+نزل و شاهد هذا المقطع</a>  بدقة وضوع أعلى  في 
صيغة <span dir="ltr">Ogg
+Theora (ogv)</span> الحرة.<span class="gnun-split"></span>
 
 <!-- TRANSLATORS: please add the link to your language here in the first 
      place, followed by a comma. -->
@@ -142,9 +144,7 @@
 <a 
href="/education/misc/rms-education-es-transcription.txt">بالأسبانية</a>,
 وأيضاً <a 
href="/education/misc/edu-misc.html#transcription-rms-education">
 لغات أخرى</a>. 
-</p>
-
-<p>
+<span class="gnun-split"></span>
 
 <!-- TRANSLATORS: please add the link to your language here in the first 
      place, followed by a comma. -->
@@ -154,9 +154,26 @@
 href="/education/misc/rms-education-es-sub.es.srt">بالأسبانية</a>, 
وأيضاً <a
 href="/education/misc/edu-misc.html#subtitles-rms-education"> لغات 
أخرى</a>. 
 </p>
+</div> <!-- /video-container -->
 
-<div class="translators-notes">
 
+<blockquote class="note" id="indepth">
+<h3>في العمق</h3>
+
+<ul>
+<li>إعرف عن <a href="/education/edu-why.html">الدوافع</a> لم
اذا يجب على المؤسسات
+التعليمية أن يستخدم وتُعْلِم البرمجيات 
الحرة حصرياً.</li>
+
+<li>مقالة بواسطة ريتشارد ستالمن Richard Stallman:  <a
+href="/education/edu-schools.html"> لماذايجب على المدارس 
إستخدام البركجيات
+الحرة حصرياً</a></li>
+
+<li>مقالة بواسطة د/ ف. ساسي كومار Dr. V. Sasi Kumar عن 
 <a
+href="/education/edu-system-india.html"> النظام التعليمي في 
الهند. </a></li>
+</ul>
+</blockquote>
+
+<div class="translators-notes">
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
  </div>
 </div>
@@ -210,7 +227,7 @@
 <p class="unprintable"><!-- timestamp start -->
 حُدثت:
 
-$Date: 2014/11/08 18:08:21 $
+$Date: 2015/09/07 22:11:16 $
 
 <!-- timestamp end -->
 </p>

Index: license-list.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/license-list.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- license-list.html   17 Apr 2014 21:24:36 -0000      1.33
+++ license-list.html   7 Sep 2015 22:11:16 -0000       1.34
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.76 -->
+<!-- Parent-Version: 1.77 -->
 <title>Various Licenses and Comments about Them
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/licenses/po/license-list.translist" -->
@@ -10,7 +10,7 @@
    make them untranslatable.  */
 /* Definitions for color-coded border */
 #content dl.green, #content dl.orange,
- #content dl.red, #content dl.blue {
+ #content dl.red, #content dl.blue, #content dl.purple {
    padding-left: 1em;
    margin-left: 0;
    margin-top: 2em;
@@ -20,6 +20,7 @@
 #content dl.orange { border-left: .4em dashed orange; }
 #content dl.red { border-left: .4em dotted red; }
 #content dl.blue { border-left: .4em double  blue; }
+#content dl.purple { border-left: .4em groove purple; }
 
 /* Disable legend for CSS1-only browsers:
    they don't support :before and :after */
@@ -30,13 +31,16 @@
 }
 #content div#legend {
    float: right;
-   width: auto; max-width: 100%;
+   width: 18.4em;
    font-style: normal;
    padding: 0 1em 1em 1em;
-   margin: 2.5em 1.5em 1.5em 1.5em;
+   margin: 2.5em 0 1.5em 1.5em;
    background: #f0f2f4;
    border: 1px solid #c9cccf;
 }
address@hidden (max-width: 50em) {
+   #content div#legend { float: none; width: 40em; max-width: 80%; margin: 2em 
auto 0 auto; }
+}
 
 #content div#legend dl { margin: 1em 0 0 0; }
 #content div#legend dt { padding: 1em 0; margin: 0; }
@@ -44,18 +48,23 @@
 
 #legend blockquote { font-size: 1.3em; font-style: normal; text-align: center; 
font-weight: bold; }
 #legend dl.green dt:after, #legend dl.orange dt:after,
-#legend dl.red dt:after, #legend dl.blue dt:after { font-weight: normal; }
+#legend dl.red dt:after, #legend dl.blue dt:after, #legend dl.purple dt:after 
{ font-weight: normal; }
 -->
 </style>
 <!-- These statements are split between different <style> elements,
      and their contents aren't commented out on purpose:
      they should be translated, preferably as separate strings.  -->
 <style type="text/css" media="print,screen">
-#legend blockquote:before { content: "Code for the left border"; }
+#legend blockquote:before { content: "Meaning of the left border"; }
 </style>
 <style type="text/css" media="print,screen">
 #legend dl.green dt:after {
-   content: "Free licenses, compatible with the GNU GPL or FDL";
+   content: "Free licenses, compatible with the GNU GPL";
+}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.purple dt:after {
+   content: "Free licenses, compatible with the FDL";
 }
 </style>
 <style type="text/css" media="print,screen">
@@ -70,62 +79,17 @@
 #legend dl.blue dt:after { content: "Licenses for works stating a viewpoint"; }
 </style>
 
-<!-- start of server/banner.html -->
-<!-- start of head-include-2.html -->
-
-<link rel="stylesheet" href="/combo.css" media="screen" />
-<link rel="stylesheet" href="layout7.css" media="screen" />
-
-<link rel="stylesheet" href="/mini.css" media="handheld" />
-
-<link rel="stylesheet" href="/print.css" media="print" />
-
-<!-- end of head-include-2.html -->
-</head>
-<body>
-<div  class="inner">
-
-<!-- start of server/body-include-1.html -->
-<!--#set var="HTML_BODY" value="yes" -->
-
-<div id="toplinks">
- <a href="#content">Skip to main text</a>
-</div> <!-- /toplinks -->
-
-<div id="searcher">
- <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
-  <div>
-  <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
-         value="Why GNU/Linux?" onfocus="this.value=''" />
-  <input type="submit" value="Search" />
-  </div><!-- unnamed label -->
- </form>
-</div><!-- /searcher -->
-
-<!--#if expr="$TRANSLATION_LIST" -->
-<!--#echo encoding="none" var="TRANSLATION_LIST" -->
-<!--#elif expr="$INITIAL_TRANSLATIONS_LIST = included" -->
-<!-- if initial translation list isn't included before banner.html,
-     then the file may use an old boilerplate that contains
-     div#translations in its body, and we mustn't duplicate it here. -->
-<!--#include virtual="/server/gnun/initial-translations-list.html" -->
-<!--#endif -->
-<!-- end of server/body-include-1.html -->
-<!--#include virtual="/server/body-include-2.html" -->
-
-<div id="content">
-
-<!-- end of server/banner.html --><h2>Various Licenses and Comments about 
Them</h2>
-
+<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
+<h2 class="c">Various Licenses and Comments about&nbsp;Them</h2>
 
 <div class="toc">
 
 <h3 id="TableOfContents">Table of Contents</h3>
 
 <ul>
-<li><a href="#Introduction">Introduction</a></li>
+<li><strong><a href="#Introduction">Introduction</a></strong></li>
 
-<li><a href="#SoftwareLicenses">Software Licenses</a>
+<li><strong><a href="#SoftwareLicenses">Software Licenses</a></strong>
   <ul>
   <li><a href="#GPLCompatibleLicenses">
       GPL-Compatible Free Software Licenses</a></li>
@@ -135,7 +99,7 @@
   </ul>
 </li>
 
-<li><a href="#DocumentationLicenses">Licenses For Documentation</a>
+<li><strong><a href="#DocumentationLicenses">Licenses For 
Documentation</a></strong>
   <ul>
   <li><a href="#FreeDocumentationLicenses">Free Documentation Licenses</a></li>
   <li><a href="#NonFreeDocumentationLicenses">
@@ -143,13 +107,14 @@
   </ul>
 </li>
 
-<li><a href="#OtherLicenses">Licenses for Other Works</a>
+<li><strong><a href="#OtherLicenses">Licenses for Other Works</a></strong>
   <ul>
   <li><a href="#OtherLicenses">Licenses for Works of Practical Use
       besides Software and Documentation</a></li>
   <li><a href="#Fonts">Licenses for Fonts</a></li>
   <li><a href="#OpinionLicenses">Licenses for Works stating a Viewpoint
       (e.g., Opinion or Testimony)</a></li>
+  <li><a href="#Designs">Licenses for Designs for Physical Objects</a></li>
   </ul>
 </li>
 </ul>
@@ -161,6 +126,7 @@
     Introduction</h3>
 </div>
 <div style="clear: left;"></div>
+<!--#include virtual="/licenses/fsf-licensing.html" -->
 
 <p>We classify a license according to certain key criteria:</p>
 
@@ -223,6 +189,7 @@
 <div id="legend">
 <blockquote></blockquote>
 <dl class="green"><dt></dt><dd></dd></dl>
+<dl class="purple"><dt></dt><dd></dd></dl>
 <dl class="orange"><dt></dt><dd></dd></dl>
 <dl class="red"><dt></dt><dd></dd></dl>
 <dl class="blue"><dt></dt><dd></dd></dl>
@@ -435,7 +402,7 @@
 such as small programs, because confusion could easily occur and lead
 to use of the flawed <a href="#OriginalBSD"><em>original</em> BSD
 license</a>.  To avoid this risk, you can suggest the X11 license
-instead.  The X11 license and the modified revised BSD license are
+instead.  The X11 license and the modified BSD license are
 more or less equivalent.</p>
 
 <p>However, the Apache 2.0 license is better for substantial programs,
@@ -507,26 +474,6 @@
 compatible with the GNU GPL.  It is very similar to the X11 license.</p></dd>
 
 
-<dt><a id="ecfonts"
-       href="http://directory.fsf.org/wiki/License:LaTeX_ecfonts";>License
-       of the ec fonts for LaTeX</a>
-    <span class="anchor-reference-id">(<a 
href="#ecfonts">#ecfonts</a>)</span></dt>
-<dd>
-<p>This license covers the European Computer Modern Fonts and Text
-Companion Fonts, commonly used with LaTeX.  Depending on how it is
-used, it may be free or not.  If the package says that some fonts in
-the package may not be modified, then the package is nonfree.
-Otherwise the package is free.  The original fonts have no
-restrictions on modification, so they are free.</p>
-
-<p>Much like <a href="#LPPL-1.2">the LaTeX Project Public
-License 1.2</a>, this license requires modified versions of the work
-to use a name that's different from the name of any prior version.
-This is acceptable for work meant to be used with LaTeX, since TeX
-allows you to create filename mappings for your programs, but it's
-very annoying and could be overly burdensome in other contexts.</p>
-</dd>
-
 
 <dt><a id="eCos20"></a>  <!-- without decimal, leave for compatibility -->
     <a id="eCos2.0" href="http://directory.fsf.org/wiki/License:ECos2.0";>
@@ -612,6 +559,13 @@
 some attribution requirements which make it incompatible with
 GPLv2.</p></dd>
 
+<dt><a id="HPND" 
href="http://directory.fsf.org/wiki/License:Historical_Permission_Notice_and_Disclaimer";>
+       Historical Permission Notice and Disclaimer </a>
+    <span class="anchor-reference-id">
+       (<a href="#HPND">#HPND</a>)</span></dt>
+<dd>
+<p>This is a lax, permissive, and weak free software license that is 
compatible with the GPL. It is similar to the license of <a 
href="#Python1.6a2">Python 1.6a2 and earlier versions</a>.</p></dd>
+
 
 <dt><a id="iMatix" href="http://directory.fsf.org/wiki?title=License:SFL";>
        License of the iMatix Standard Function Library</a>
@@ -963,7 +917,7 @@
     WTFPL, Version 2</a>
     <span class="anchor-reference-id">(<a href="#WTFPL">#WTFPL</a>)</span></dt>
 <dd>
-<p>This is lax permissive non-copyleft free software license,
+<p>This is a lax permissive non-copyleft free software license,
 compatible with the GNU GPL.</p>
 
 <p>We do not recommend this license.  If you want a lax permissive
@@ -1160,11 +1114,12 @@
     Common Development and Distribution License (CDDL), version 1.0</a>
     <span class="anchor-reference-id"> (<a href="#CDDL">#CDDL</a>)</span></dt>
 <dd>
-<p>This is a free software license.  It has a copyleft with a scope that's
-similar to the one in the Mozilla Public License, which makes it
-incompatible with the <a href="/licenses/gpl.html">GNU GPL</a>.  This means
-a module covered by the GPL and a module covered by the CDDL cannot legally
-be linked together.  We urge you not to use the CDDL for this reason.</p>
+<p>This is a free software license.  It has a weak per-file copyleft
+(like version 1 of the Mozilla Public License) which makes it
+incompatible with the <a href="/licenses/gpl.html">GNU GPL</a>.  This
+means a module covered by the GPL and a module covered by the CDDL
+cannot legally be linked together.  We urge you not to use the CDDL
+for this reason.</p>
 
 <p>Also unfortunate in the CDDL is its use of the term &ldquo;<a
 href="/philosophy/not-ipr.html">intellectual
@@ -1608,7 +1563,7 @@
 property</a>&rdquo;.</p></dd>
 
 
-<dt><a id="Zend" href="http://www.zend.com/license/2_00.txt";>
+<dt><a id="Zend" href="http://directory.fsf.org/wiki/License:ZELv2.0";>
     Zend License, Version 2.0</a>
     <span class="anchor-reference-id">(<a href="#Zend">#Zend</a>)</span></dt>
 <dd>
@@ -1656,8 +1611,8 @@
 
 <div class="big-subsection">
 <span id="NonFreeSoftwareLicense"></span>
-<h4><a id="NonFreeSoftwareLicenses">
-    Nonfree Software Licenses</a></h4>
+<h4 id="NonFreeSoftwareLicenses">
+    Nonfree Software Licenses</h4>
 <span class="anchor-reference-id">
     (<a href="#NonFreeSoftwareLicenses">#NonFreeSoftwareLicenses</a>)</span>
 </div>
@@ -1691,16 +1646,17 @@
     <span class="anchor-reference-id">
        (<a href="#NoLicense">#NoLicense</a>)</span></dt>
 <dd>
-<p>If source code does not carry a license to give users the
-four essential freedoms, it is not free software.</p>
-
-<p>Some developers think that code with no license
-is <a href="#PublicDomain">in the public domain</a>.  That is not true
-under today's copyright law; rather, all copyrightable works are
-copyrighted by default.  This includes programs.  Absent a license to
-grant users freedom, they don't have any.  In some countries, users
-that download code with no license may infringe copyright merely by
-compiling it or running it.</p>
+<p>If source code does not carry a license to give users the four
+essential freedoms, then unless it has been explicitly and validly
+placed in the public domain, it is not free software.</p>
+
+<p>Some developers think that code with no license is
+automatically <a href="#PublicDomain">in the public domain</a>.  That
+is not true under today's copyright law; rather, all copyrightable
+works are copyrighted by default.  This includes programs.  Absent a
+license to grant users freedom, they don't have any.  In some
+countries, users that download code with no license may infringe
+copyright merely by compiling it or running it.</p>
 
 <p>In order for a program to be free, its copyright holders must
 explicitly grant users the <a href="/philosophy/free-sw.html"> four
@@ -1708,12 +1664,6 @@
 a <em>free software license</em>.  This is what free software
 licenses are for.</p>
 
-<p>Code written by employees of the US government is a special
-exception, since US copyright law explicitly puts that in the public
-domain; but this does not apply to works that the US pays a company to
-write.  It also does not apply to other countries, many of which do
-allow the state to have a copyright on government writings.</p>
-
 <p>Some countries allow authors to put code in the public domain, but
 that requires explicit action.  If you wish to do that, the method we
 recommend is to use <a href="#CC0">CC0</a>, which also works in other
@@ -1722,6 +1672,12 @@
 is <a href="/licenses/license-recommendations.html"> better to
 copyleft your code</a> to assure that freedom reaches all users of the
 code.</p>
+
+<p>Code written by employees of the US government is a special
+exception, since US copyright law explicitly puts that in the public
+domain; but this does not apply to works that the US pays a company to
+write.  It also does not apply to other countries, many of which do
+allow the state to have a copyright on government writings.</p>
 </dd>
 
 <dt><a id="Aladdin">Aladdin Free Public License</a>
@@ -1879,10 +1835,7 @@
 <dd>
 <p>ksh93 used to be shipped with an original license that was not a free
 software license.  One reason for this is that it required that all changes
-be sent to the developer.</p>
-
-<p>ksh93 is now released under the <a href="#CommonPublicLicense10">Common
-Public License</a>.</p></dd>
+be sent to the developer.</p></dd>
 
 
 <dt><a id="Lha" href=
@@ -1921,6 +1874,29 @@
 truly free software license.</p></dd>
 
 
+<dt><a id="OculusRift" 
href="http://directory.fsf.org/wiki/License:Oculus_VR_Rift_SDK_License";>
+    Oculus Rift SDK License</a>
+    <span class="anchor-reference-id">
+       (<a href="#OculusRiftSDK">#OculusRiftSDK</a>)</span></dt>
+<dd>
+<p>This is not a free software license; it has several fatal flaws.
+</p>
+
+<ul>
+<li>One can't redistribute anything less than the whole program libOVR.</li>
+<li>One's distribution rights can be terminated on vague conditions.</li>
+<li>Those who make modified versions are required to send them to
+Oculus on demand.</li>
+<li>Use is allowed only with their product.</li>
+<li>New license versions totally supplant old versions, which means
+that permissions already given can be withdrawn.</li>
+</ul>
+
+There might be additional fatal flaws; after seeing this many,
+we stopped looking for more.
+</dd>
+
+
 <dt><a id="OPL"></a> <!-- old id, leave for compatibility -->
     <a id="OpenPublicL" 
href="http://directory.fsf.org/wiki/License:OpenPLv1.0";>
     Open Public License</a>
@@ -1933,6 +1909,19 @@
 not sure of that might also be problematic.</p></dd>
 
 
+<dt><a id="PPL" 
href="http://directory.fsf.org/wiki/License:PPL";>Peer-Production License</a>
+    <span class="anchor-reference-id">(<a href="#PPL">#PPL</a>)</span></dt>
+<dd>
+<p>The Peer-Production License is not a free software license because
+it restricts who can redistribute the program and for what purpose.
+It also does not give anyone permission to run the program.</p>
+
+<p>The PPL has several provisions designed specifically for artistic
+performances, and we have nothing against its use for art works;
+however, people reportedly advocate its use for software too.  The PPL
+should not be used for software, manuals, or other works that ought to
+be free.</p></dd>
+
 <dt><a id="PINE" href="http://directory.fsf.org/wiki/License:PINE";>License of 
PINE</a>
     <span class="anchor-reference-id">(<a href="#PINE">#PINE</a>)</span></dt>
 <dd>
@@ -1982,6 +1971,17 @@
 commercial distribution of a modified version.  Thankfully, starting from 
version 5.0.0, the Scilab software is free software, released under CeCILL 
version&nbsp;2.</p></dd>
 
 
+<dt><a id="Scratch" 
href="http://directory.fsf.org/wiki/License:Scratch";>Scratch 1.4 license</a>
+    <span class="anchor-reference-id">
+       (<a href="#Scratch">#Scratch</a>)</span></dt>
+<dd>
+<p>This is not a free software license because it does not allow
+commercial redistribution.  In addition, condition 4 substantively
+restricts the functionality of modified versions.</p>
+
+<p>Fortunately Scratch 2.0 is now distributed under the GNU GPL.</p></dd>
+
+
 <dt><a id="SML" href="http://directory.fsf.org/wiki/License:SimpleM";>
     Simple Machines License</a>
     <span class="anchor-reference-id">(<a href="#SML">#SML</a>)</span></dt>
@@ -2065,6 +2065,26 @@
 </p></dd>
 
 
+<dt><a id="Truecrypt-3.0"
+    href="http://directory.fsf.org/wiki/License:TrueCrypt";>
+    Truecrypt license 3.0</a>
+    <span class="anchor-reference-id">
+       (<a href="#Truecrypt-3.0">#Truecrypt-3.0</a>)</span></dt>
+<dd>
+<p>This license is nonfree for several reasons.  It says that if you
+don't understand the license you may not use the program.  It puts
+conditions on allowing others to run your copy.  It puts conditions on
+separate programs that &ldquo;depend on&rdquo; Truecrypt.  The
+trademark condition applies to &ldquo;associated materials&rdquo;.
+</p>
+<p>There are other points in the license which seem perhaps
+unacceptable, and in our uncertainty about them we delayed in posting
+our evaluation.  We have posted it now to explain why we do not mourn
+the demise of Truecrypt.  There
+are <a href="http://directory.fsf.org/wiki?search=disk+encryption";>free
+programs that do the same job</a>.</p></dd>
+
+
 <dt><a id="UtahPublicLicense"
        href="http://www.cs.utah.edu/~gk/teem/txt/LICENSE.txt";>
     University of Utah Public License</a>
@@ -2079,7 +2099,7 @@
 even asserting them is outrageous.</p>
 
 <p>The use of this license by the University of Utah exemplifies a <a
-href="http://www.colorado.edu/Sociology/gimenez/papers/keptu.html";>dangerous
+href="http://www.theatlantic.com/magazine/archive/2000/03/the-kept-university/306629/?single_page=true";>dangerous
 trend for universities to restrict knowledge</a> rather than
 contributing it to the public.</p>
 
@@ -2129,7 +2149,7 @@
 documentation</a> licenses.</strong></p>
 
 
-<dl class="green">
+<dl class="purple">
 
 <dt><a id="FDL" href="/licenses/fdl.html">
     GNU Free Documentation License</a>
@@ -2223,7 +2243,7 @@
 <dl class="red">
 
 <dt><a id="OCL"></a> <!-- brief id, leave for compatibility -->
-    <a id="OpenContentL" href="http://opencontent.org/opl.shtml";>
+    <a id="OpenContentL" 
href="https://web.archive.org/web/19981206111937/http://www.opencontent.org/opl.shtml";>
     Open Content License, Version 1.0</a>
     <span class="anchor-reference-id">
       (<a href="#OpenContentL">#OpenContentL</a>)</span></dt>
@@ -2238,6 +2258,21 @@
 spelling their names in full to make sure people understand what you
 say.</p></dd>
 
+<dt><a id="CC-BY-NC" href="?">Creative Commons Nocommercial, any version</a>
+    <span class="anchor-reference-id">
+      (<a href="#CC-BY-NC">#CC-BY-NC</a>)</span></dt>
+<dd>
+<p>This license does not qualify as free, because there are restrictions on
+charging money for copies.  We recommend you do not use this license.</p></dd>
+
+<dt><a id="CC-BY-ND" href="?">Creative Commons Noderivatives, any version</a>
+    <span class="anchor-reference-id">
+      (<a href="#CC-BY-ND">#CC-BY-ND</a>)</span></dt>
+<dd>
+<p>This license does not qualify as free, because there are
+restrictions on distributing modified versions.  We recommend you do
+not use this license.</p></dd>
+
 </dl> <!-- end class="red" -->
 
 <div class="big-section">
@@ -2266,6 +2301,8 @@
 &ldquo;source code&rdquo; is, using approximately the same definition
 that the GPL uses.</p></dd>
 
+</dl> <!-- end class="green" -->
+<dl class="purple">
 
 <dt><a id="FDLOther" href="/licenses/fdl.html">
     GNU Free Documentation License</a>
@@ -2278,19 +2315,18 @@
 recommend the GNU FDL for dictionaries, encyclopedias, and any other
 works that provide information for practical use.</p></dd>
 
-</dl> <!-- end class="green" -->
-<dl  class="orange">
-
+</dl> <!-- end class="purple" -->
+<dl  class="green">
 
-<dt><a id="ccby" href="http://creativecommons.org/licenses/by/2.0/legalcode";>
-    Creative Commons Attribution 2.0 license</a>
+<dt><a id="ccby" href="http://creativecommons.org/licenses/by/4.0/legalcode";>
+    Creative Commons Attribution 4.0 license</a>
     (a.k.a. CC&nbsp;BY)
     <span class="anchor-reference-id">(<a href="#ccby">#ccby</a>)</span></dt>
 <dd>
 <p>This is a non-copyleft free license that is good for art and
-entertainment works, and educational works.  Please don't use it for
-software or documentation, since it is incompatible with the GNU GPL
-and with the GNU FDL.</p>
+entertainment works, and educational works.  It is compatible with all
+versions of the GNU GPL; however, it is not recommended for use on
+software.</p>
 
 <p id="which-cc">
 <span class="anchor-reference-id">(<a href="#which-cc">#which-cc</a>)</span>
@@ -2299,23 +2335,23 @@
 Commons license&rdquo; is to leave the principal questions about the
 work's licensing unanswered.  When you see such a statement in a work,
 please ask the author to change the work to state clearly and
-visibly <em>which</em>of the Creative Commons license it uses.  And if
+visibly <em>which</em> of the Creative Commons license it uses.  And if
 someone proposes to &ldquo;use a Creative Commons license&rdquo; for a
 certain work, it is vital to ask &ldquo;Which Creative Commons
 license?&rdquo; before proceeding any further.</p></dd>
 
+</dl> <!-- end class="green" -->
+<dl  class="orange">
 
 <dt><a id="ccbysa"
-       href="http://creativecommons.org/licenses/by-sa/2.0/legalcode";>
-    Creative Commons Attribution-Sharealike 2.0 license</a>
+       href="http://creativecommons.org/licenses/by-sa/4.0/legalcode";>
+    Creative Commons Attribution-Sharealike 4.0 license</a>
    (a.k.a. CC&nbsp;BY-SA)
     <span class="anchor-reference-id">
        (<a href="#ccbysa">#ccbysa</a>)</span></dt>
 <dd>
 <p>This is a copyleft free license that is good for artistic and
-entertainment works, and educational works.  Please don't use it for
-software or documentation, since it is incompatible with the GNU GPL
-and with the GNU FDL.</p>
+entertainment works, and educational works.</p>
 
 <p>Please <a href="#which-cc">be specific about which Creative
 Commons license is being used</a>.</p></dd>
@@ -2331,7 +2367,7 @@
 fine to use for other kinds of data.</p></dd>
 
 
-<dt><a id="FreeArt" href="http://artlibre.org/licence/lal/en";>
+<dt><a id="FreeArt" href="//directory.fsf.org/wiki/License:Free-Art-L-v1.3">
     Free Art License</a>
     <span class="anchor-reference-id">
        (<a href="#FreeArt">#FreeArt</a>)</span></dt>
@@ -2394,6 +2430,40 @@
 GPL. Its normal use is for fonts, and in that use, the
 incompatibility does not cause a problem.</p></dd>
 
+<dt><a id="ecfonts"
+       href="http://directory.fsf.org/wiki/License:LaTeX_ecfonts";>License
+       of the ec fonts for LaTeX</a>
+    <span class="anchor-reference-id">(<a 
href="#ecfonts">#ecfonts</a>)</span></dt>
+<dd>
+<p>This license covers the European Computer Modern Fonts and Text
+Companion Fonts, commonly used with LaTeX.  Depending on how it is
+used, it may be free or not.  If the package says that some fonts in
+the package may not be modified, then the package is nonfree.
+Otherwise the package is free.  The original fonts have no
+restrictions on modification, so they are free.</p>
+
+<p>Much like <a href="#LPPL-1.2">the LaTeX Project Public
+License 1.2</a>, this license requires modified versions of the work
+to use a name that's different from the name of any prior version.
+This is acceptable for work meant to be used with LaTeX, since TeX
+allows you to create filename mappings for your programs, but it's
+very annoying and could be overly burdensome in other contexts.</p>
+</dd>
+
+
+<dt><a id="IPAFONT"
+    href="http://directory.fsf.org/wiki/License:IPA_Font_License";> IPA
+    Font License</a>
+    <span class="anchor-reference-id">
+       (<a href="#IPAFONT">#IPAFONT</a>)</span></dt>
+<dd>
+<p>This is a copyleft free software license, incompatible with the
+GPL. It has an unfortunate condition requiring that derivative works
+not use or include the name of the original work as a program name,
+font name or file name. This is acceptable for fonts as fonts can be
+aliased or renamed using free software tools, but it's very annoying
+and could be overly burdensome in other contexts.</p></dd>
+
 
 <dt><a id="SILOFL" href="http://scripts.sil.org/OFL_web";>
     SIL Open Font License 1.1</a>
@@ -2450,21 +2520,39 @@
     <span class="anchor-reference-id">
        (<a href="#ccbynd">#ccbynd</a>)</span></dt>
 
-<dd><p>This is the license used throughout the FSF web site.  This
-license provides much the same permissions as our verbatim copying
-license, but it's much more detailed.  We particularly recommend
-it for audio and/or video works of opinion.
-Please <a href="#which-cc">be specific about which Creative
-Commons license is being used</a>.</p></dd>
+<dd><p>This is the license used throughout the GNU and FSF web sites.
+This license provides much the same permissions as our verbatim
+copying license, but it's much more detailed.  We particularly
+recommend it for audio and/or video works of opinion.
+Please <a href="#which-cc">be specific about which Creative Commons
+license is being used</a>.</p></dd>
 
 </dl> <!-- end class="blue" -->
 
+<div class="big-subsection">
+<h4 id="Designs">Licenses for Designs for Physical Objects</h4>
+<span class="anchor-reference-id">
+    (<a href="#Designs">#Designs</a>)</span>
+</div>
+
+<p>Circuits are meant for practical use, so circuit designs should carry
+a free license.  We recommend releasing them under the GNU General
+Public License, version 3 or later.  Version 3 was designed for such
+use.</p>
+
+<p>3D-printer plans for objects meant for practical use should also be
+free.  We recommend the GNU GPL or one of the Creative Commons
+licenses that are free: CC-BY, CC-BY-SA, or CC0.</p>
+
+<p>3D-printer plans for decorative objects are artistic works; any of the
+Creative Commons licenses is ok for them.</p>
+
 <hr class="separator" />
 
 
 <p class="back"><strong><a href="/licenses/licenses.html">More about 
licenses</a></strong></p>
 </div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -2492,17 +2580,17 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p></p><p class="unprintable">Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/17 21:24:36 $
+$Date: 2015/09/07 22:11:16 $
 <!-- timestamp end -->
 </p>
 </div>

Index: essays-and-articles.html
===================================================================
RCS file: 
/webcvs/www/www/server/staging/nav-bar/test9/essays-and-articles.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- essays-and-articles.html    3 Sep 2015 20:15:14 -0000       1.3
+++ essays-and-articles.html    7 Sep 2015 22:11:16 -0000       1.4
@@ -16,7 +16,7 @@
 <!--#include virtual="/server/top-addendum.html" -->
 <!--#endif -->
 <!--#endif -->
-<h2>Essays and Articles</h2>
+<h2 class="c">Essays and Articles</h2>
 
 <div class="summary">
 <ul>
@@ -101,7 +101,7 @@
 
 <h3 id="aboutgnu">About the GNU Operating System</h3>
 
-<ul>
+<ul class="list-links">
   <li><a href="/gnu/initial-announcement.html">Initial announcement of
        the GNU Operating System</a></li>
   <li><a href="/gnu/manifesto.html">The GNU Manifesto</a></li>
@@ -115,7 +115,7 @@
 
 <h3 id="LicensingFreeSoftware">Licensing Free Software</h3>
 
-<ul>
+<ul class="list-links">
   <li><a href="/licenses/licenses.html">General information on licensing 
       and copyleft</a></li>
   <li><a href="/licenses/license-list.html">A list of specific free 
@@ -194,8 +194,8 @@
 <h3 id="Laws">Laws and Issues</h3>
 
 <h4 id="copyright">Copyright</h4>
-<ul>
 
+<ul>
   <li><a href="/philosophy/public-domain-manifesto.html">Why I Will Not Sign
       the Public Domain Manifesto</a></li>
 
@@ -254,12 +254,11 @@
   <li><a href="/philosophy/is-ever-good-use-nonfree-program.html">
   Is It Ever a Good Thing to Use a Nonfree Program?</a> By
   <a href="http://www.stallman.org";> Richard Stallman</a></li>
-
 </ul>
 
 <h4 id="drm">Digital Restrictions Management</h4>
 
-<ul>
+<ul class="list-links">
   <li><a href="/philosophy/correcting-france-mistake.html">
   Correcting My Mistake about French Law</a></li>
   <li><a href="/philosophy/the-root-of-this-problem.html">The problem is
@@ -297,7 +296,7 @@
 term <a href="/philosophy/words-to-avoid.html#IntellectualProperty">
 &ldquo;Intellectual Property&rdquo;</a></h4>
 
-<ul>
+<ul class="list-links">
   <li><a href="/philosophy/komongistan.html">The Curious History of 
   Komongistan (Busting the term &ldquo;intellectual property&rdquo;)</a></li>
   
@@ -321,7 +320,8 @@
 </ul>
 
 <h4 id="patents">Patents</h4>
-<ul>
+
+<ul class="list-links">
   <li><a href="/philosophy/limit-patent-effect.html">Giving the Software
   Field Protection from Patents</a></li>
 
@@ -383,7 +383,8 @@
 </ul>
 
 <h4 id="ns">Network Services</h4>
-<ul>
+
+<ul class="list-links">
   <li><a href="/philosophy/network-services-arent-free-or-nonfree.html">
   Network Services Aren't Free or Nonfree; They Raise Other Issues</a> an
   article by Richard Stallman.</li>
@@ -395,7 +396,7 @@
 
 <h4 id="cultural">Cultural and Social Issues</h4>
 
-<ul>
+<ul class="list-links">
   <li><a href="/philosophy/technological-neutrality.html">
     Technological Neutrality and Free Software</a>
     by Richard Stallman</li>
@@ -442,12 +443,11 @@
   Free Software and Sustainable Development</a> &mdash; A short
   article by Richard Stallman regarding the use of proprietary
   software in cultural development.</li>
-
 </ul>
 
-
 <h4 id="misc">Misc</h4>
-<ul>
+
+<ul class="list-links">
   <li><a href="/philosophy/proprietary.html">Clearly established 
   cases of proprietary software that does nasty things to the
   users</a>.</li>
@@ -487,7 +487,7 @@
 
 <h3 id="terminology">Terminology and Definitions</h3>
 
-<ul>
+<ul class="list-links">
   <li><a href="/philosophy/free-hardware-designs.html">
       Free Hardware and Free Hardware Designs</a></li>
   <li><a href="/philosophy/words-to-avoid.html">Confusing Words</a>
@@ -513,7 +513,7 @@
 
 <h3 id="upholding">Upholding Software Freedom</h3>
 
-<ul>
+<ul class="list-links">
   <li><a href="/philosophy/use-free-software.html">The Free Software 
       Community After 20 Years</a>, With great but incomplete success, 
       what now?</li>
@@ -528,14 +528,14 @@
 
 <h3 id="humor">Philosophical humor</h3>
 
-<ul>
+<ul class="list-links">
 <li><a href="/fun/humor.html#Philosophy">Philosophy Humor</a>.
     We don't have to be serious <i>all</i> the time.</li>
 </ul>
 
 <h3>Links to more philosophy articles</h3>
 
-<ul>
+<ul class="list-links">
 <li id="Speeches"><a href="/philosophy/speeches-and-interview.html">
 Speeches and interviews</a></li>
 <li id="ThirdPartyIdeas"><a href="/philosophy/third-party-ideas.html">
@@ -581,7 +581,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/03 20:15:14 $
+$Date: 2015/09/07 22:11:16 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-software-tuxpaint.html
===================================================================
RCS file: 
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- edu-software-tuxpaint.html  25 Apr 2014 17:08:22 -0000      1.10
+++ edu-software-tuxpaint.html  7 Sep 2015 22:11:17 -0000       1.11
@@ -9,19 +9,22 @@
 
 <style type="text/css" media="screen,print">
 <!--
-#content .stamp {
-   float: right;
-   width: 15em; max-width: 100%;
-   margin: 0 0 1em 0;
-}
+#content .stamp { float: right; width: 13em; margin: 0 1em; }
 #content .stamp img, #content .stamp p {
-   width: 90%;
-   padding: 0 9%;
+   width: 100%; padding: 0; margin: 0;
+}
+#content .stamp p { margin-bottom: 2em; }
address@hidden (max-width: 55em) {
+   #content #flowers { width: 15em; float: right; }
+}
address@hidden (max-width: 35em) {
+   #content #flowers { width: 100%; }
+   #content .stamp { float: none; margin: auto; }
 }
 -->
 </style>
 
-<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
 
 <div id="education-content">
 
@@ -51,7 +54,7 @@
 <!--#endif -->
 <!--#endif -->
 
-<h2>Tux Paint</h2>
+<h2 class="c">Tux Paint</h2>
 
 <h3>Description</h3>
 
@@ -102,7 +105,7 @@
 <div class="photo">
 
 <a href="/education/misc/tuxpaint-stamps.jpg">
-<img class="recessed" src="/education/misc/tuxpaint-stamps-sm.jpg" 
+<img src="/education/misc/tuxpaint-stamps-sm.jpg" 
 alt="Screenshot of the Tux Paint interface in Malayalam with native 
flowers."/></a>
 </div>
 
@@ -130,6 +133,7 @@
 size: if the market is not large enough to ensure profit, they are
 generally reluctant to invest on it.</p>
 
+<div id="flowers">
 <div class="stamp">
 
 <a href="/education/misc/appooppanthaady.jpg">
@@ -149,6 +153,7 @@
 <p class="c"><a href="/education/misc/anthoorium.ogg">Listen</a> to a student 
 pronounce the name of the Anthoorium flower in Malayalam.</p>
 </div> <!-- /stamp -->
+</div> <!-- /flowers -->
 
 <p>A good example of how software freedom can be applied in Tux Paint is
 the work done by 11 and 12 years old students from the
@@ -252,7 +257,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/25 17:08:22 $
+$Date: 2015/09/07 22:11:17 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-software-gimp.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/edu-software-gimp.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- edu-software-gimp.html      17 Apr 2014 22:06:13 -0000      1.5
+++ edu-software-gimp.html      7 Sep 2015 22:11:17 -0000       1.6
@@ -8,60 +8,21 @@
 <!--#include virtual="/education/po/education.translist" -->
 
 <style type="text/css">
+<!--
 #mani-movie {
-   display: block;
-   width: 100%; max-width: 40em;
-   margin: auto;
+   max-width: 40em;
+   margin: 2em auto;
 }
-</style>
-
-<!-- start of banner.html -->
-
-<!-- start of head-include-2.html -->
-<link rel="stylesheet" href="combo.css" media="screen" />
-<link rel="stylesheet" href="layout7.css" media="screen" />
-<link rel="stylesheet" href="/mini.css" media="handheld" />
-<link rel="stylesheet" href="/print.css" media="print" />
-<!-- end of head-include-2.html -->
-</head>
-<body>
-<div  class="inner">
-
-<!-- start of server/body-include-1.html -->
-<!--#set var="HTML_BODY" value="yes" -->
-
-<div id="toplinks">
- <a href="#content">Skip to main text</a>
-</div> <!-- /toplinks -->
-
-<div id="searcher">
- <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
-  <div>
-  <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
-         value="Why GNU/Linux?" onfocus="this.value=''" />
-  <input type="submit" value="Search" />
-  </div><!-- unnamed label -->
- </form>
-</div><!-- /searcher -->
-
-<!--#if expr="$TRANSLATION_LIST" -->
-<!--#echo encoding="none" var="TRANSLATION_LIST" -->
-<!--#elif expr="$INITIAL_TRANSLATIONS_LIST = included" -->
-<!-- if initial translation list isn't included before banner.html,
-     then the file may use an old boilerplate that contains
-     div#translations in its body, and we mustn't duplicate it here. -->
-<!--#include virtual="/server/gnun/initial-translations-list.html" -->
-<!--#endif -->
-<!-- end of server/body-include-1.html -->
-<!--#include virtual="/server/body-include-2.html" -->
+#mani-movie video { width: 100%; margin-bottom: .3em; }
+#content #mani-movie p {
+   padding: 1em; margin: 0;
+   background-color: #f0f2f4;
+   border: 1px solid #c9cccf;
+ }
 
-<div id="content">
-<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
-<!--#include virtual="/server/top-addendum.fr.html" -->
-<!--#endif -->
-<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
-
-<!-- end of banner.html -->
+-->
+</style>
+<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
 
 <div id="education-content">
 
@@ -91,7 +52,7 @@
 <!--#include virtual="/server/top-addendum.html" -->
 <!--#endif -->
 <!--#endif -->
-<h2>GIMP</h2>
+<h2 class="c">GIMP</h2>
 
 <h3>Description</h3>
 
@@ -157,26 +118,28 @@
 he exhibited and sold. The following three-minutes video portrays Mani's 
 endeavor to learn Free Software.</p>
 
-<p>
-<!-- TRANSLATORS: please translate the written description of the video
-     and replace the link to the English version with the link to your 
-     translation -->
 
-(Note to the hearing impaired: the only audio in this video is the 
-soundtrack, which is a piano version of the Free Software Song. A
-<a href="/education/misc/we_use_gnu-linux_description.en.txt"> written 
-description of the video</a> is available for the visually impaired).
-</p>
-
-<video  id="mani-movie" controls="controls">
+<div id="mani-movie">
+<video controls="controls">
   <source
     src="http://audio-video.gnu.org/video/we_use_gnu-linux_low.ogv"; 
     type='video/ogg; codecs="theora, vorbis"' />
 </video>
 
-<p class="center">Watch and download the video as 
+<p>Watch and download the video as 
 <a href="http://audio-video.gnu.org/video/we_use_gnu-linux_high.ogv";>
-Ogg Theora</a> at a higher resolution.</p>
+Ogg Theora</a> at a higher resolution.<br />
+
+<em>Note to the hearing impaired:</em> the only audio in this video is the 
+soundtrack, which is a piano version of the Free Software Song.<br />
+
+<!-- TRANSLATORS: please translate the written description of the video
+     and replace the link to the English version with the link to your 
+     translation -->
+<em>Note to the visually impaired:</em> A
+<a href="/education/misc/we_use_gnu-linux_description.en.txt"> written 
+description of the video</a> is available.</p>
+</div> <!-- /mani-movie -->
 
 <p>At the time of writing (March 2012) Mani is a student of Computer 
 Science in Bangalore. He says:</p>
@@ -342,7 +305,7 @@
 
 <p></p><p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/17 22:06:13 $
+$Date: 2015/09/07 22:11:17 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-software-gcompris.html
===================================================================
RCS file: 
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-gcompris.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- edu-software-gcompris.html  3 Sep 2015 19:03:11 -0000       1.11
+++ edu-software-gcompris.html  7 Sep 2015 22:11:17 -0000       1.12
@@ -45,7 +45,7 @@
 <div class="photo">
 
 <a href="/education/misc/gcompris.jpg">
-<img class="recessed" src="/education/misc/gcompris-sm.jpg" 
+<img src="/education/misc/gcompris-sm.jpg" 
 alt="Screenshot of the GCompris interface showing the various 
activities."/></a>
 </div>
 
@@ -165,7 +165,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/03 19:03:11 $
+$Date: 2015/09/07 22:11:17 $
 <!-- timestamp end -->
 </p>
 </div>

Index: home5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home5.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- home5.html  1 Sep 2015 14:15:17 -0000       1.43
+++ home5.html  7 Sep 2015 22:11:17 -0000       1.44
@@ -1,5 +1,4 @@
 <!--#include virtual="/server/header.html" -->
-<!--#include virtual="/server/staging/nav-bar/test9/tag-base.html" -->
 <!-- Parent-Version: 1.77 -->
 
 <title>The GNU Operating System and the Free Software Movement</title>
@@ -107,14 +106,13 @@
 developing the Hurd because it is an interesting technical
 project.</p>
 
-<p><a href="/gnu/gnu.html">More information</a>.</p>
+<p class="back"><a href="/gnu/gnu.html">More information</a></p>
 
 </div><!-- /first-column -->
 
 <div class="second-column">
 
-<p class="button c large"><a
-      href="/distros/free-distros.html">Try GNU/Linux!</a></p>
+<p class="button c large"><a href="/distros/free-distros.html" 
class="button-shadow">Try GNU/Linux!</a></p>
 
 <div class="emph-box">
 
@@ -130,8 +128,8 @@
 <!--#include virtual="/server/home-pkgselect.html" -->
 <!--#include virtual="/server/home-pkgblurbs.html" -->
 
-<p><small><a href="/manual/blurbs.html">Short descriptions for all GNU
-packages.</a></small></p>
+<p class="back"><a href="/manual/blurbs.html">Short descriptions for all GNU
+packages</a></p>
 
 </div><!-- class="emph-box" -->
 
@@ -173,15 +171,11 @@
 
 <li><a href="/server/takeaction.html#directory">Add to the Free Software
 Directory</a>.</li>
-
-<li><a href="/server/takeaction.html">More action items.</a></li>
-
 </ul>
 
-<!-- END TakeAction -->
+<p class="back"><a href="/server/takeaction.html">More action items</a></p>
+
 </div><!-- /Action -->
-</div><!-- /second-column -->
-</div><!-- /home -->
 
 <div class="highlight-para">
 
@@ -216,6 +210,8 @@
 See the package web pages for more information.</p>
 
 </div><!-- /highlight-para -->
+</div><!-- /second-column -->
+</div><!-- /home -->
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
@@ -258,7 +254,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/01 14:15:17 $
+$Date: 2015/09/07 22:11:17 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-cases-india-irimpanam.html
===================================================================
RCS file: 
/webcvs/www/www/server/staging/nav-bar/test9/edu-cases-india-irimpanam.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- edu-cases-india-irimpanam.html      5 May 2014 11:01:11 -0000       1.13
+++ edu-cases-india-irimpanam.html      7 Sep 2015 22:11:17 -0000       1.14
@@ -6,27 +6,8 @@
 - GNU Project - Free Software Foundation</title>
 
 <!--#include virtual="/education/po/edu-cases-india-irimpanam.translist" -->
-<!-- start of server/banner.html -->
-<!-- start of head-include-2.html -->
+<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
 
-<link rel="stylesheet" href="combo.css" media="screen" />
-<link rel="stylesheet" href="layout7.css" media="screen" />
-
-<link rel="stylesheet" href="/mini.css" media="handheld" />
-
-<link rel="stylesheet" href="/print.css" media="print" />
-
-<!-- end of head-include-2.html --></head>
-<body>
-<div  class="inner">
-
-<!--#include virtual="/server/body-include-1.html" -->
-
-<!--#include virtual="/server/body-include-2.html" -->
-
-<div id="content">
-
-<!-- end of server/banner.html -->
 <div id="education-content">
 
 <!-- begin edu navigation bar -->
@@ -281,7 +262,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/05/05 11:01:11 $
+$Date: 2015/09/07 22:11:17 $
 <!-- timestamp end -->
 </p>
 </div>

Index: page-tags.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/page-tags.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- page-tags.html      3 Sep 2015 19:09:38 -0000       1.4
+++ page-tags.html      7 Sep 2015 22:11:17 -0000       1.5
@@ -35,7 +35,7 @@
 <span class="gnun-split"></span>
 <!--#endif -->
 <!--#if expr="' $TAGS ' = / (gnulinux|all) /" -->
-&nbsp;<a 
href="/server/staging/nav-bar/test9/sitemap-light.html?gnulinux">GNU&nbsp;&&nbsp;Linux</a>&nbsp;
+&nbsp;<a 
href="/server/staging/nav-bar/test9/sitemap-light.html?gnulinux">GNU&nbsp;&amp;&nbsp;Linux</a>&nbsp;
 <span class="gnun-split"></span>
 <!--#endif -->
 <!--#if expr="' $TAGS ' = / (fsf|all) /" -->
@@ -67,7 +67,7 @@
 <span class="gnun-split"></span>
 <!--#endif -->
 <!--#if expr="' $TAGS ' = / (laws|all) /" -->
-&nbsp;<a 
href="/server/staging/nav-bar/test9/sitemap-light.html?laws">laws&nbsp;&&nbsp;issues</a>&nbsp;
+&nbsp;<a 
href="/server/staging/nav-bar/test9/sitemap-light.html?laws">laws&nbsp;&amp;&nbsp;issues</a>&nbsp;
 <span class="gnun-split"></span>
 <!--#endif -->
 <!--#if expr="' $TAGS ' = / (copyright|all) /" -->
@@ -122,7 +122,7 @@
 &nbsp;<a 
href="/server/staging/nav-bar/test9/sitemap-light.html?economy">economy</a>&nbsp;
 <span class="gnun-split"></span>
 <!--#endif -->
-</div> <!-- class="page-tags">
+</div> <!-- /page-tags -->
 <!--#endif -->
 
 

Index: philosophy-menu.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/philosophy-menu.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy-menu.html        3 Sep 2015 19:03:11 -0000       1.4
+++ philosophy-menu.html        7 Sep 2015 22:11:17 -0000       1.5
@@ -2,11 +2,11 @@
 
 <!-- begin edu navigation bar -->
 <ul id="edu-navigation">
-    <li><a href="essays-and-articles.html">Essays&nbsp;&&nbsp;articles</a></li>
-    <li><a 
href="/philosophy/speeches-and-interview.html">Speeches&nbsp;&&nbsp;interviews</a></li>
+    <li><a 
href="essays-and-articles.html">Essays&nbsp;&amp;&nbsp;articles</a></li>
+    <li><a 
href="/philosophy/speeches-and-interview.html">Speeches&nbsp;&amp;&nbsp;interviews</a></li>
     <li><a 
href="/philosophy/third-party-ideas.html">Third&nbsp;party&nbsp;ideas</a></li>
     <li><a 
href="/server/sitemap.html#directory-philosophy">All&nbsp;articles</a></li>
-    <li><a href="http://audio-video.gnu.org/";>Audio&nbsp;&&nbsp;video</a></li>
+    <li><a 
href="http://audio-video.gnu.org/";>Audio&nbsp;&amp;&nbsp;video</a></li>
 </ul>
 <!-- end edu navigation bar -->
 <!--#include virtual="/server/staging/nav-bar/test9/page-tags.html" -->

Index: philosophy.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/philosophy.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy.html     3 Sep 2015 19:03:11 -0000       1.10
+++ philosophy.html     7 Sep 2015 22:11:18 -0000       1.11
@@ -17,7 +17,7 @@
 <!--#endif -->
 <!--#endif -->
 
-<h2>Philosophy of the GNU Project</h2>
+<h2 class="c">Philosophy of the GNU Project</h2>
 
 <blockquote><p>
 See <a href="http://audio-video.gnu.org/";>audio-video.gnu.org</a>
@@ -48,7 +48,7 @@
 
 <h3 id="introduction">Introduction</h3>
 
-<ul>
+<ul class="link-lists">
   <li><a href="/philosophy/free-sw.html">What is Free Software?</a></li>
   <li><a href="/philosophy/free-software-even-more-important.html">
       Why we must insist on free software</a></li>
@@ -139,7 +139,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/03 19:03:11 $
+$Date: 2015/09/07 22:11:18 $
 <!-- timestamp end -->
 </p>
 </div>

Index: body-include-2.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2.fr.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- body-include-2.fr.html      15 Apr 2014 21:09:07 -0000      1.7
+++ body-include-2.fr.html      7 Sep 2015 22:11:18 -0000       1.8
@@ -33,15 +33,81 @@
 
 <div id="navigation">
  <ul>
-  <li id="tabAboutGNU"><a href="/gnu/gnu.html">À propos de GNU</a></li>
-  <li id="tabPhilosophy"><a 
href="/philosophy/philosophy.html">Philosophie</a></li>
+<!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
+<!--#set var="MARK_END" value=" <span class='no-display'>=</span> " -->
+<!--#if expr="$REQUEST_URI = /gnu\//" -->
+  <li id="tabAboutGNU" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/gnu/about-gnu.html">À propos de GNU</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+   <li id="tabAboutGNU"><a 
href="/gnu/about-gnu.html">À propos de GNU</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /\/philosophy/ || $REQUEST_URI = 
/rms-nyu-2001-transcript/ || $REQUEST_URI = /essays-and-articles/" -->
+  <li id="tabPhilosophy" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="philosophy.html">Philosophie</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+  <li id="tabPhilosophy"><a href="philosophy.html">Philosophie</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /\/license/ || $REQUEST_URI = /^\/copyleft\//" -->
+  <li id="tabLicenses" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/licenses/licenses.html">Licences</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
   <li id="tabLicenses"><a href="/licenses/licenses.html">Licences</a></li>
-  <li class="active" id="tabEducation"><a 
href="education.html">Éducation</a></li>
-  <li id="tabSoftware"><a href="/software/software.html">Logiciel</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /\/edu/" -->
+  <li id="tabEducation" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="education.html">Éducation</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+  <li id="tabEducation"><a href="education.html">Éducation</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /\/software/ || $REQUEST_URI = /\/gethelp/" -->
+  <li id="tabSoftware" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="software.html">Logiciels</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+  <li id="tabSoftware"><a href="software.html">Logiciels</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/doc\// || $REQUEST_URI = /^\/manual\// || 
$REQUEST_URI = /books/" -->
+  <li id="tabDoc" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/doc/doc.html">Documentation</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>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /\/help/" -->
+  <li id="tabHelp" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/help/help.html">Aidez GNU</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
   <li id="tabHelp"><a href="/help/help.html">Aidez GNU</a></li>
+<!--#endif -->
  </ul>
 </div><!--  /navigation -->
 
-<!-- end of server/body-include-2.fr.html -->
+<!--#include virtual="/server/staging/nav-bar/test9/page-tags.html" -->
 
+<!-- end of server/body-include-2 -->

Index: edu-cases-india-ambedkar.html
===================================================================
RCS file: 
/webcvs/www/www/server/staging/nav-bar/test9/edu-cases-india-ambedkar.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- edu-cases-india-ambedkar.html       25 Apr 2014 08:06:45 -0000      1.13
+++ edu-cases-india-ambedkar.html       7 Sep 2015 22:11:18 -0000       1.14
@@ -5,7 +5,7 @@
 <title>Ambedkar Community Computing Center (AC3) - GNU Project - Free Software 
Foundation</title>
 
 <!--#include virtual="/education/po/edu-cases-india-ambedkar.translist" -->
-<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
 
 <div id="education-content">
 
@@ -173,7 +173,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/25 08:06:45 $
+$Date: 2015/09/07 22:11:18 $
 <!-- timestamp end -->
 </p>
 </div>

Index: style.rtl.css
===================================================================
RCS file: style.rtl.css
diff -N style.rtl.css
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ style.rtl.css       7 Sep 2015 22:11:15 -0000       1.1
@@ -0,0 +1,67 @@
+/*
+style.rtl.css -- CSS adjustments for right-to-left languages.
+
+Copyright (C) 2014, 2015 Free Software Foundation
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.  */
+
+ul, ol, dl { margin-right: 2em; }
+
+.nocenter, #fsf-support, #content, #Action, html, body,
+#content .edu-breadcrumb {
+   text-align: right;
+}
+.imgright { float: left; margin: 1em; margin-left: 0; }
+.imgleft { float: right; margin: 1em; margin-right: 0; }
+
+#fsf-frame, #backtotop a {
+   float: left;
+}
address@hidden (max-width: 55em) {
+   #fsf-frame #fssbox { float: left; }
+   #fsf-frame #join-fsf { float: right; }
+}
+
+#searcher, #content p.back { text-align: left; }
+.promo-banner {
+    background-position: 1% 9%;
+}
+#toplinks, #mission-statement img, #gnu-banner img,
+#content div.big-section {
+   float: right;
+}
+#toplinks a, #toplinks a:visited {
+  margin-right: 0; margin-left: 1em
+}
+#gnu-banner img {
+   margin-left: .4em;
+}
+div#backtotop, th.gpl-matrix-license { text-align: left; }
+#home .first-column {
+   clear: right;
+   float: right;
+}
+#home .second-column { float: left; }
+#content .announcement {
+   border-left: 0;
+   border-right: .5em solid #b9bcbf;
+}
+#content .note, #content div.summary #content div.photo {
+   clear: left;
+   float: left;
+   margin: .3em 1.5em 1em 0;
+}
address@hidden (max-width: 46em) {
+   #content .note { float: none; margin: .3em auto 1em auto; }
+}
+

Index: body-include-1.ar.html
===================================================================
RCS file: body-include-1.ar.html
diff -N body-include-1.ar.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ body-include-1.ar.html      7 Sep 2015 22:11:15 -0000       1.1
@@ -0,0 +1,38 @@
+<!-- start of server/body-include-1.html -->
+<!--#set var="HTML_BODY" value="yes" -->
+<!--#set var="language_selector"
+  value='<a href="/server/select-language.html?callback=$REQUEST_URI" 
rel="nofollow">' -->
+<!--#set var="tag_selector"
+  value='' -->
+<!--#set var="closing_anchor" value='</a>' -->
+<div id="toplinks">
+ <a href="#content">تخط إلى النص الرئيسي</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="language_selector" -->
+ Set language
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="closing_anchor" -->
+ <a href="#all-tags">All keywords</a>
+</div> <!-- /toplinks -->
+
+<!-- /toplinks -->
+<div id="searcher">
+ <form method="get" action="//www.gnu.org/cgi-bin/estseek.cgi">
+  <div>
+  <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
+value="لماذا غنو/لينكس؟" onfocus="this.value=''" 
class="rounded-corners" /> <input type="submit"
+value="إبحث" class="rounded-corners" />
+  </div>
+ </form>
+</div>
+
+<!-- /searcher -->
+<!--#if expr="$TRANSLATION_LIST" -->
+<!--#echo encoding="none" var="TRANSLATION_LIST" -->
+<!--#elif expr="$INITIAL_TRANSLATIONS_LIST = included" -->
+<!-- if initial translation list isn't included before banner.html,
+     then the file may use an old boilerplate that contains
+     div#translations in its body, and we mustn't duplicate it here. -->
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
+<!--#endif -->
+<!-- end of server/body-include-1.html -->

Index: body-include-2.ar.html
===================================================================
RCS file: body-include-2.ar.html
diff -N body-include-2.ar.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ body-include-2.ar.html      7 Sep 2015 22:11:16 -0000       1.1
@@ -0,0 +1,127 @@
+
+
+<!-- start of server/body-include-2 -->
+<div id="header">
+<div id="fsf-frame">
+<p id="join-fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052"; 
class="button-shadow">انضم
+إلى إف&#8204;إس&#8204;إف!</a></p>
+<div id="fssbox">
+<p>سجّل نفسك في <a href="http://www.fsf.org/fss";>داعم البرم
جيات الحرة</a></p>
+<form action="https://my.fsf.org/civicrm/profile/create?reset=1&amp;gid=31"; 
method="post">
+ <div>
+  <input name="postURL" type="hidden" value="" /> <input type="hidden"
+name="group[25]" value="1" /> <input name="cancelURL" type="hidden"
+value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; /> <input
+name="_qf_default" type="hidden" value="Edit:cancel" />
+ </div>
+ <p>
+  <input type="text" id="frmEmail" name="email-Primary" size="18"
+maxlength="80" value="عنوان بريدك الإلكتروني" 
onfocus="this.value=''" class="rounded-corners" />
+<input type="submit" name="_qf_Edit_next" value="موافق" 
class="button-shadow" />
+ </p>
+</form>
+</div>
+<!-- /fssbox -->
+</div>
+
+<!-- /fsf-frame -->
+<div id="gnu-banner">
+ <a href="/">
+ <img src="/graphics/heckert_gnu.small.png" alt="[رأس غنو]" />نظام 
التشغيل <strong>غنو</strong></a>
+</div>
+
+<!-- /gnu-banner -->
+<p id="fsf-support">برعاية <a href="#mission-statement">مؤسسة 
البرمجيات الحرة</a></p>
+
+</div>
+
+<!-- /header -->
+<div id="navigation">
+
+  <ul>
+<!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
+<!--#set var="MARK_END" value=" <span class='no-display'>=</span> " -->
+
+<!--#if expr="$REQUEST_URI = /\/gnu/ || $REQUEST_URI = /\/fry\//" -->
+  <li id="tabAboutGNU" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="gnu.html">حول غنو</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+   <li id="tabAboutGNU"><a href="gnu.html">حول غنو</a></li>
+<!--#endif -->
+
+<!--#if expr="$REQUEST_URI = /\/philosophy/ || $REQUEST_URI = 
/rms-nyu-2001-transcript/" -->
+  <li id="tabPhilosophy" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="philosophy.html">الفلسفة</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+   <li id="tabPhilosophy"><a href="philosophy.html">الفلسفة</a></li>
+<!--#endif -->
+
+<!--#if expr="$REQUEST_URI = /\/licenses/ || $REQUEST_URI = /\/copyleft/" -->
+  <li id="tabLicenses" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="licenses.html">التراخيص</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+   <li id="tabLicenses"><a href="licenses.html">التراخيص</a></li>
+<!--#endif -->
+
+<!--#if expr="$REQUEST_URI = /\/edu/ || $REQUEST_URI = /\/encyclopedia/" -->
+  <li id="tabEducation" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="education.html">تعليم</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+   <li id="tabEducation"><a href="education.html">تعليم</a></li>
+<!--#endif -->
+
+<!--#if expr="$REQUEST_URI = /\/software/ || $REQUEST_URI = /\/distros/ || 
$REQUEST_URI = /\/gethelp/" -->
+  <li id="tabSoftware" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="software.html">البرمجيات</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+   <li id="tabSoftware"><a href="software.html">البرمجيات</a></li>
+<!--#endif -->
+
+<!--#if expr="$REQUEST_URI = /\/doc/ || $REQUEST_URI = /\/manual/ || 
$REQUEST_URI = /books/" -->
+  <li id="tabDoc" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="doc.html">وثائق</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+   <li id="tabDoc"><a href="doc.html">وثائق</a></li>
+<!--#endif -->
+
+<!--#if expr="$REQUEST_URI = /\/help/" -->
+  <li id="tabHelp" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="help.html">مساعدة غنو</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+   <li id="tabHelp"><a href="help.html">مساعدة غنو</a></li>
+<!--#endif -->
+  </ul>
+
+</div><!--  /navigation -->
+
+<!--#include virtual="/server/staging/nav-bar/test9/page-tags.html" -->
+
+<!-- end of server/body-include-2 -->

Index: banner.ar.html
===================================================================
RCS file: banner.ar.html
diff -N banner.ar.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ banner.ar.html      7 Sep 2015 22:11:16 -0000       1.1
@@ -0,0 +1,19 @@
+<!-- start of server/banner.html -->
+<!-- start of head-include-2.html -->
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<link rel="stylesheet" href="/combo.css" media="screen" />
+<link rel="stylesheet" href="/mini.css" media="handheld" />
+<link rel="stylesheet" href="/server/staging/nav-bar/test9/layout7.css" 
media="screen" />
+<link rel="stylesheet" href="/print.min.css" media="print" />
+
+<!-- end of head-include-2.html --></head>
+<link rel="stylesheet" href="/server/staging/nav-bar/test9/style.rtl.css" 
media="screen" />
+<link rel="stylesheet" href="/style.ar.css" media="screen" />
+</head>
+<body>
+<div class="inner">
+<!--#include virtual="/server/staging/nav-bar/test9/body-include-1.ar.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/body-include-2.ar.html" -->
+<div id="content">
+<!--#include virtual="/server/top-addendum.ar.html" -->
+<!-- end of server/banner.html -->



reply via email to

[Prev in Thread] Current Thread [Next in Thread]