www-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/server/staging nav-bar/test9/edu-software-g...

From: Therese Godefroy
Subject: www/server/staging nav-bar/test9/edu-software-g...
Date: Sun, 16 Feb 2020 13:08:47 -0500 (EST) 
CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 20/02/16 13:08:47

Modified files:
        server/staging/nav-bar/test9: edu-software-gcompris.html 
                                      edu-software-gimp.html 
        server/staging/proprietary: proprietary-addictions.html 
                                    proprietary-back-doors.html 
                                    proprietary-censorship.html 
                                    proprietary-fraud.html 
                                    proprietary-jails.html 
                                    proprietary-obsolescence.html 
                                    proprietary-surveillance.html 

Log message:
        Update to new layout.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-gcompris.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-gimp.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/proprietary/proprietary-addictions.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/proprietary/proprietary-back-doors.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/proprietary/proprietary-censorship.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/proprietary/proprietary-fraud.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/proprietary/proprietary-jails.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/proprietary/proprietary-obsolescence.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/proprietary/proprietary-surveillance.html?cvsroot=www&r1=1.18&r2=1.19

Patches:
Index: nav-bar/test9/edu-software-gcompris.html
===================================================================
RCS file: 
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-gcompris.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- nav-bar/test9/edu-software-gcompris.html    1 Jan 2020 14:26:20 -0000       
1.24
+++ nav-bar/test9/edu-software-gcompris.html    16 Feb 2020 18:08:47 -0000      
1.25
@@ -19,13 +19,23 @@
 .pict { width: 25em; }
 -->
 </style>
+<!--#include virtual="/education/po/edu-software-gcompris.translist" -->
 <!--#include virtual="/server/staging/banner.html" -->
-<!--#include virtual="/server/staging/education-menu.html" -->
-<div id="main-text" class="article">
-<p class="edu-breadcrumb"><a href="/education/education.html">Education</a> 
&rarr; 
-<a href="/education/edu-resources.html">Educational Resources</a> &rarr; 
-<a href="/education/edu-software.html">Educational Free Software</a> &rarr;
-GCompris</p>
+<div id="main">
+
+<div id="section-menu">
+ <a id="sect-menu-button" class="switch" href="#navlinks">
+ <img id="sect-menu-icon" height="32"
+       src="/server/staging/layout/sect-menu.png"
+       alt="Section menu" /></a>
+</div>
+<p class="breadcrumb">
+ <a href="/education/education.html">Education</a> &gt;
+ <a href="/education/edu-contents.html">Contents</a> &gt;
+ <a href="/education/edu-resources.html">Resources</a> &gt;
+ <a href="/education/edu-software.html">Educational Software</a> &gt;
+ GCompris
+</p>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
@@ -37,6 +47,7 @@
 
 <h2 id="main-heading">GCompris</h2>
 
+<div class="article">
 <h3>Description</h3>
 
 <p>GCompris is a cross-platform complete educational suite for children 
@@ -122,8 +133,9 @@
 challenged children.</p>
 
 </div>
-</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/layout/footer-text.html" -->
+</div><!-- /#main -->
+<!--#include virtual="/server/staging/education-menu.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -162,7 +174,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/01/01 14:26:20 $
+$Date: 2020/02/16 18:08:47 $
 <!-- timestamp end -->
 </p>
 </div>

Index: nav-bar/test9/edu-software-gimp.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/edu-software-gimp.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- nav-bar/test9/edu-software-gimp.html        1 Jan 2020 14:26:20 -0000       
1.16
+++ nav-bar/test9/edu-software-gimp.html        16 Feb 2020 18:08:47 -0000      
1.17
@@ -1,5 +1,6 @@
+<!--#set var="ENGLISH_PAGE" value="/education/edu-cases.en.html" -->
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="fr" lang="fr">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <link rev="made" href="mailto:address@hidden"; />
@@ -10,7 +11,6 @@
 <link rel="stylesheet" type="text/css" href="/mini.css" media="handheld" />
 <link rel="stylesheet" type="text/css" href="/server/staging/layout.css" 
media="screen" />
 <link rel="stylesheet" type="text/css" href="/print.min.css" media="print" />
-<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>GIMP - GNU Project - Free Software Foundation</title>
 <link rel="stylesheet" type="text/css" href="/server/staging/education.css" 
media="screen" />
 <style type="text/css" media="screen">
@@ -20,26 +20,46 @@
    margin: 2em auto;
 }
 #mani-movie video { width: 100%; margin-bottom: .3em; }
-#mani-movie p { margin: .5em 0 0; text-align: justify; }
+#mani-movie p {
+   font-size: .941em;
+   text-align: justify;
+   margin: .5em 0 0;
+}
 -->
 </style>
+<!--#include virtual="/education/po/edu-software-gimp.translist" -->
 <!--#include virtual="/server/staging/banner.html" -->
-<!--#include virtual="/server/staging/education-menu.html" -->
-<div id="main-text" class="article">
-<p class="edu-breadcrumb"><a href="/education/education.html">Education</a> 
&rarr; 
-<a href="/education/edu-resources.html">Educational Resources</a> &rarr; 
-<a href="/education/edu-software.html">Educational Free Software</a> &rarr;
-GIMP</p>
-
-<!--GNUN: OUT-OF-DATE NOTICE-->
-<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
-<!--#if expr="$LANGUAGE_SUFFIX" -->
-<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
-<!--#include virtual="/server/top-addendum.html" -->
-<!--#endif -->
-<!--#endif -->
+<div id="main">
+
+<a id="sect-menu-button" href="#navlinks"><img height="32"
+   src="/server/staging/layout/sect-menu.png"
+   alt="Section menu" /></a>
+<p class="breadcrumb">
+ <a href="/education/education.html">Education</a> &gt;
+ <a href="/education/edu-contents.html">Contents</a> &gt;
+ <a href="/education/edu-resources.html">Resources</a> &gt;
+ <a href="/education/edu-software.html">Educational Software</a> &gt;
+ GIMP
+</p>
+
+<label for="outdated-input" id="outdated-button" class="switch">
+ <img id="outdated-icon" width="1" height="1"
+      src="/server/staging/layout/flags-warn.png"
+      alt="&nbsp;[Show/hide outdated-translation warning]&nbsp;" />
+</label>
+<input type="checkbox" id="outdated-input" tabindex="-1" />
+<div id="outdated">
+<p>
+This translation may not reflect the changes made since
+2020-13-32 in the <a href="/education/edu-software.en.html">
+English original</a>. Please see the <a
+href="/server/standards/README.translations.html">Translations README</a>
+for information on maintaining translations of this article.</p>
+</div>
+
 <h2 id="main-heading">GIMP</h2>
 
+<div class="article">
 <h3>Description</h3>
 
 <p>GIMP stands for &ldquo;GNU Image Manipulation Program&rdquo;, 
@@ -111,7 +131,7 @@
     type='video/ogg; codecs="theora, vorbis"' />
 </video>
 
-<div class="emph-box small">
+<div class="emph-box">
 <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>
@@ -253,8 +273,9 @@
 the program be made proprietary.</p>
 
 </div>
-</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/layout/footer-text.html" -->
+</div><!-- /#main -->
+<!--#include virtual="/server/staging/education-menu.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -293,7 +314,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/01/01 14:26:20 $
+$Date: 2020/02/16 18:08:47 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/proprietary-addictions.html
===================================================================
RCS file: 
/webcvs/www/www/server/staging/proprietary/proprietary-addictions.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- proprietary/proprietary-addictions.html     1 Jan 2020 16:01:48 -0000       
1.14
+++ proprietary/proprietary-addictions.html     16 Feb 2020 18:08:47 -0000      
1.15
@@ -27,11 +27,20 @@
 </style>
  <!--#include virtual="/proprietary/po/proprietary-addictions.translist" -->
 <!--#include virtual="/server/staging/banner.html" -->
-<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
-<div id="main-text" class="article">
-<p id="breadcrumb">
-<a href="/proprietary/proprietary.html">Proprietary malware</a> &rarr;
-By type &rarr; Addictions</p>
+<div id="main">
+
+<div id="section-menu">
+ <a id="sect-menu-button" class="switch" href="#navlinks">
+ <img id="sect-menu-icon" height="32"
+       src="/server/staging/layout/sect-menu.png"
+       alt="Section menu" /></a>
+</div>
+<p class="breadcrumb">
+ <a href="/proprietary/proprietary.html#content">Proprietary malware</a> &gt;
+ <a href="/proprietary/proprietary.html#TOC">By type</a> &gt;
+ Addictions
+</p>
+
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -39,6 +48,8 @@
 <!--#include virtual="/server/top-addendum.html" -->
 <!--#endif -->
 <!--#endif -->
+<h2 id="main-heading">Proprietary Addictions</h2>
+
 <div id="about-dir">
 <hr class="thin" />
 <p>Nonfree (proprietary) software is very often malware (designed to
@@ -52,6 +63,7 @@
 <hr class="thin" />
 </div>
 
+<div class="article">
 <div id="about-page">
 <p>This page deals with malicious functionalities that are added to
 some programs for the sole purpose of luring users into more and more
@@ -277,9 +289,9 @@
 </ul>
 
 </div>
-
-</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/layout/footer-text.html" -->
+</div>
+<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -335,7 +347,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/01/01 16:01:48 $
+$Date: 2020/02/16 18:08:47 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/proprietary-back-doors.html
===================================================================
RCS file: 
/webcvs/www/www/server/staging/proprietary/proprietary-back-doors.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- proprietary/proprietary-back-doors.html     1 Jan 2020 16:01:48 -0000       
1.12
+++ proprietary/proprietary-back-doors.html     16 Feb 2020 18:08:47 -0000      
1.13
@@ -22,11 +22,20 @@
 <link rel="stylesheet" type="text/css" href="/server/staging/education.css" 
media="screen" />
  <!--#include virtual="/proprietary/po/proprietary-back-doors.translist" -->
 <!--#include virtual="/server/staging/banner.html" -->
-<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
-<div id="main-text" class="article">
-<p id="breadcrumb">
-<a href="/proprietary/proprietary.html#content">Proprietary malware</a> &rarr;
-By type &rarr; Back doors</p>
+<div id="main">
+
+<div id="section-menu">
+ <a id="sect-menu-button" class="switch" href="#navlinks">
+ <img id="sect-menu-icon" height="32"
+       src="/server/staging/layout/sect-menu.png"
+       alt="Section menu" /></a>
+</div>
+<p class="breadcrumb">
+ <a href="/proprietary/proprietary.html#content">Proprietary malware</a> &gt;
+ <a href="/proprietary/proprietary.html#TOC">By type</a> &gt;
+ Back doors
+</p>
+
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -49,6 +58,7 @@
 <hr class="thin" />
 </div>
 
+<div class="article">
 <div id="about-page">
 <p>Some malicious functionalities are mediated by <a
 href="/proprietary/proprietary.html#f1">back doors</a>.  Here are
@@ -638,9 +648,9 @@
 use of back doors</a>.</p>
 
 </div>
-
-</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/layout/footer-text.html" -->
+</div>
+<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -679,7 +689,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/01/01 16:01:48 $
+$Date: 2020/02/16 18:08:47 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/proprietary-censorship.html
===================================================================
RCS file: 
/webcvs/www/www/server/staging/proprietary/proprietary-censorship.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- proprietary/proprietary-censorship.html     1 Jan 2020 16:01:48 -0000       
1.10
+++ proprietary/proprietary-censorship.html     16 Feb 2020 18:08:47 -0000      
1.11
@@ -22,11 +22,20 @@
 <link rel="stylesheet" type="text/css" href="/server/staging/education.css" 
media="screen" />
  <!--#include virtual="/proprietary/po/proprietary-censorship.translist" -->
 <!--#include virtual="/server/staging/banner.html" -->
-<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
-<div id="main-text" class="article">
-<p id="breadcrumb">
-<a href="/proprietary/proprietary.html">Proprietary malware</a> &rarr;
-By type &rarr; Censorship</p>
+<div id="main">
+
+<div id="section-menu">
+ <a id="sect-menu-button" class="switch" href="#navlinks">
+ <img id="sect-menu-icon" height="32"
+       src="/server/staging/layout/sect-menu.png"
+       alt="Section menu" /></a>
+</div>
+<p class="breadcrumb">
+ <a href="/proprietary/proprietary.html#content">Proprietary malware</a> &gt;
+ <a href="/proprietary/proprietary.html#TOC">By type</a> &gt;
+ Censorship
+</p>
+
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -49,6 +58,7 @@
 <hr class="thin" />
 </div>
 
+<div class="article">
 <div id="about-page">
 <p>One kind of malicious functionality is censorship of what
 users can access.  Here are examples of programs which do this.
@@ -131,9 +141,9 @@
 </ul>
 
 </div>
-
-</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/layout/footer-text.html" -->
+</div>
+<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -189,7 +199,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/01/01 16:01:48 $
+$Date: 2020/02/16 18:08:47 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/proprietary-fraud.html
===================================================================
RCS file: /webcvs/www/www/server/staging/proprietary/proprietary-fraud.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- proprietary/proprietary-fraud.html  1 Jan 2020 16:01:48 -0000       1.8
+++ proprietary/proprietary-fraud.html  16 Feb 2020 18:08:47 -0000      1.9
@@ -45,11 +45,20 @@
 <link rel="stylesheet" type="text/css" href="/server/staging/education.css" 
media="screen" />
  <!--#include virtual="/proprietary/po/proprietary-obsolescence.translist" -->
 <!--#include virtual="/server/staging/banner.html" -->
-<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
-<div id="main-text" class="article">
-<p class="edu-breadcrumb">
-<a href="/proprietary/proprietary.html">Proprietary malware</a> &rarr;
-By type &rarr; Fraud</p>
+<div id="main">
+
+<div id="section-menu">
+ <a id="sect-menu-button" class="switch" href="#navlinks">
+ <img id="sect-menu-icon" height="32"
+       src="/server/staging/layout/sect-menu.png"
+       alt="Section menu" /></a>
+</div>
+<p class="breadcrumb">
+ <a href="/proprietary/proprietary.html#content">Proprietary malware</a> &gt;
+ <a href="/proprietary/proprietary.html#TOC">By type</a> &gt;
+ Fraud
+</p>
+
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -72,6 +81,7 @@
 <hr class="thin" />
 </div>
 
+<div class="article">
 <div id="about-page">
   <p>Here are some examples of proprietary software that defrauds
   users&mdash;taking their money by trickery.</p>
@@ -103,9 +113,9 @@
 </ul>
 
 </div>
-
-</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/layout/footer-text.html" -->
+</div>
+<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -161,7 +171,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/01/01 16:01:48 $
+$Date: 2020/02/16 18:08:47 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/proprietary-jails.html
===================================================================
RCS file: /webcvs/www/www/server/staging/proprietary/proprietary-jails.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- proprietary/proprietary-jails.html  1 Jan 2020 16:01:48 -0000       1.4
+++ proprietary/proprietary-jails.html  16 Feb 2020 18:08:47 -0000      1.5
@@ -22,11 +22,20 @@
 <link rel="stylesheet" type="text/css" href="/server/staging/education.css" 
media="screen" />
  <!--#include virtual="/proprietary/po/proprietary-obsolescence.translist" -->
 <!--#include virtual="/server/staging/banner.html" -->
-<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
-<div id="main-text" class="article">
-<p class="edu-breadcrumb">
-<a href="/proprietary/proprietary.html">Proprietary malware</a> &rarr;
-Jails</p>
+<div id="main">
+
+<div id="section-menu">
+ <a id="sect-menu-button" class="switch" href="#navlinks">
+ <img id="sect-menu-icon" height="32"
+       src="/server/staging/layout/sect-menu.png"
+       alt="Section menu" /></a>
+</div>
+<p class="breadcrumb">
+ <a href="/proprietary/proprietary.html#content">Proprietary malware</a> &gt;
+ <a href="/proprietary/proprietary.html#TOC">By type</a> &gt;
+ Jails
+</p>
+
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -49,6 +58,7 @@
 <hr class="thin" />
 </div>
 
+<div class="article">
 <div id="about-page">
 <p>The &ldquo;jails&rdquo; are malicious operating systems that are
 designed to impose censorship of which applications the user can install.
@@ -300,9 +310,9 @@
 for this fact.  Please inform us if you know of one.</p>
 
 </div>
-
-</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/layout/footer-text.html" -->
+</div>
+<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -358,7 +368,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/01/01 16:01:48 $
+$Date: 2020/02/16 18:08:47 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/proprietary-obsolescence.html
===================================================================
RCS file: 
/webcvs/www/www/server/staging/proprietary/proprietary-obsolescence.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- proprietary/proprietary-obsolescence.html   1 Jan 2020 16:01:48 -0000       
1.11
+++ proprietary/proprietary-obsolescence.html   16 Feb 2020 18:08:47 -0000      
1.12
@@ -22,11 +22,20 @@
 <link rel="stylesheet" type="text/css" href="/server/staging/education.css" 
media="screen" />
  <!--#include virtual="/proprietary/po/proprietary-obsolescence.translist" -->
 <!--#include virtual="/server/staging/banner.html" -->
-<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
-<div id="main-text" class="article">
-<p id="breadcrumb">
-<a href="/proprietary/proprietary.html">Proprietary malware</a> &rarr;
-By type &rarr; Obsolescence</p>
+<div id="main">
+
+<div id="section-menu">
+ <a id="sect-menu-button" class="switch" href="#navlinks">
+ <img id="sect-menu-icon" height="32"
+       src="/server/staging/layout/sect-menu.png"
+       alt="Section menu" /></a>
+</div>
+<p class="breadcrumb">
+ <a href="/proprietary/proprietary.html#content">Proprietary malware</a> &gt;
+ <a href="/proprietary/proprietary.html#TOC">By type</a> &gt;
+ Obsolescence
+</p>
+
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -49,6 +58,7 @@
 <hr class="thin" />
 </div>
 
+<div class="article">
 <div id="about-page">
 <p>Programmed obsolescence is one of the malicious functionalities that
 may be designed into proprietary software.</p>
@@ -149,9 +159,9 @@
 </ul>
 
 </div>
-
-</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/layout/footer-text.html" -->
+</div>
+<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -207,7 +217,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/01/01 16:01:48 $
+$Date: 2020/02/16 18:08:47 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/proprietary-surveillance.html
===================================================================
RCS file: 
/webcvs/www/www/server/staging/proprietary/proprietary-surveillance.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- proprietary/proprietary-surveillance.html   1 Jan 2020 16:01:49 -0000       
1.18
+++ proprietary/proprietary-surveillance.html   16 Feb 2020 18:08:47 -0000      
1.19
@@ -37,11 +37,20 @@
 <!-- GNUN: localize URL /graphics/dog.small.jpg -->
 <!--#include virtual="/proprietary/po/proprietary-surveillance.translist" -->
 <!--#include virtual="/server/staging/banner.html" -->
-<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
-<div id="main-text" class="article">
-<p id="breadcrumb">
-<a href="/proprietary/proprietary.html">Proprietary malware</a> &rarr;
-By type &rarr; Surveillance</p>
+<div id="main">
+
+<div id="section-menu">
+ <a id="sect-menu-button" class="switch" href="#navlinks">
+ <img id="sect-menu-icon" height="32"
+       src="/server/staging/layout/sect-menu.png"
+       alt="Section menu" /></a>
+</div>
+<p class="breadcrumb">
+ <a href="/proprietary/proprietary.html#content">Proprietary malware</a> &gt;
+ <a href="/proprietary/proprietary.html#TOC">By type</a> &gt;
+ Surveillance
+</p>
+
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -64,12 +73,17 @@
 <hr class="thin" />
 </div>
 
+<p>This typically takes the form of malicious functionalities.</p>
+<hr class="thin" />
+</div>
+
 <div id="surveillance" class="pict">
 <a href="/graphics/dog.html">
 <img src="/graphics/dog.small.jpg" alt="Cartoon of a dog, wondering at the 
three ads that popped up on his computer screen..." /></a>
 <p>&ldquo;How did they find out I'm a dog?&rdquo;</p>
 </div>
 
+<div class="article">
 <div id="about-page">
 <p>A common malicious functionality is to snoop on the user.  This page
 records <strong>clearly established cases of proprietary software that
@@ -2486,9 +2500,9 @@
 </ul>
 
 </div>
-
-</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.html" -->
+</div>
+<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -2544,7 +2558,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/01/01 16:01:49 $
+$Date: 2020/02/16 18:08:47 $
 <!-- timestamp end -->
 </p>
 </div>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]