www/server/staging for-windows.1.html

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 15/04/07 21:56:03

Modified files:
        server/staging : for-windows.1.html 

Log message:
        Add a column for the Windows programs and the note about Firefox to the 
table; remove the corresponding paragraphs.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/for-windows.1.html?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: for-windows.1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/for-windows.1.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- for-windows.1.html  2 Mar 2015 16:07:23 -0000       1.6
+++ for-windows.1.html  7 Apr 2015 21:56:02 -0000       1.7
@@ -7,7 +7,6 @@
 <style type="text/css" media="print,screen">
 <!--
 table#TOC {
-   width: 45em; max-width: 100%;
    border-collapse: collapse;
    margin: 2.5em auto 2em auto;
    border: 2px solid #6989b6;
@@ -88,50 +87,84 @@
 <table id="TOC">
  <thead>
   <tr><th>Category</th>
-      <th>Free Programs<sup>1</sup></th>
+      <th>Free program<a href="#f1"><sup>1</sup></a></th>
+      <th>Replacement for</th>
   </tr>
  </thead>
  <tfoot>
-  <tr><td colspan="2"><ol><li>This is a selection of the more
+  <tr><td colspan="3">
+      <ol><li id="f1">This is a selection of the more
        common free software applications available for the Microsoft Windows
-       platform, and is nothing like a comprehensive list.</li></ol></td></tr>
+      platform, and is nothing like a comprehensive list.</li>
+          <li id="f2">Why not recommend Firefox? As explained in our <a
+      href="/philosophy/free-sw.html">Free Software Definition</a>, all 
+      four freedoms must be available on both a commercial and non-commercial
+      basis. Mozilla's trademark policy serves to limit Freedom 2 to gratis
+      distribution only, making the software nonfree.</li>
+      </ol>
+      </td>
+  </tr>
  </tfoot>
  <tbody>
-  <tr><td>Graphics and Design</td>
-      <td><a href="#Dia">Dia</a>&nbsp;&nbsp;
-          <a href="#GIMP">GIMP</a>&nbsp;&nbsp;
-          <a href="#Inkscape">Inkscape</a></td>
-  </tr>
-  <tr><td>Internet</td>
-      <td><a href="#ClawsMail">Claws Mail</a>&nbsp;&nbsp;
-          <a href="#GNUnet">GNUnet</a>&nbsp;&nbsp;
-          <a href="#Pidgin">Pidgin</a>&nbsp;&nbsp;
-          <a href="#QupZilla">QupZilla</a>&nbsp;&nbsp;
-          <a href="#Tribler">Tribler</a></td>
-  </tr>
-  <tr><td>Multimedia</td>
-      <td><a href="#Blender3D">Blender3D</a>&nbsp;&nbsp;
-          <a href="#VLC">VideoLan Client (VLC)</a></td>
+  <tr><td rowspan="3">Graphics and Design</td>
+      <td><a href="#Dia">Dia</a></td>
+      <td>Microsoft Visio</td>
+  </tr>
+  <tr>
+      <td><a href="#GIMP">GIMP</a></td>
+      <td>Photoshop, Paint Shop Pro</td>
+  </tr>
+  <tr>
+      <td><a href="#Inkscape">Inkscape</a></td>
+      <td>Adobe Illustrator, Macromedia Freehand, CorelDraw, Xara Xtreme</td>
+  </tr>
+  <tr><td rowspan="5">Internet</td>
+      <td><a href="#ClawsMail">Claws Mail</a></td>
+      <td>Outlook, Outlook Express</td>
+  </tr>
+  <tr>
+      <td><a href="#GNUnet">GNUnet</a></td>
+      <td>Napster, etc.</td>
+  </tr>
+  <tr>
+      <td><a href="#Pidgin">Pidgin</a></td>
+      <td>Trillian, AIM, MSN, Yahoo, ICQ chat clients</td>
+  </tr>
+  <tr>
+      <td><a href="#QupZilla">QupZilla</a></td>
+      <td>Firefox<a href="#f2"><sup>2</sup></a>, Chrome, Internet Explorer</td>
+  </tr>
+  <tr>
+      <td><a href="#Tribler">Tribler</a></td>
+      <td>BitTorrent</td>
+  </tr>
+  <tr><td rowspan="2">Multimedia</td>
+      <td><a href="#Blender3D">Blender3D</a></td>
+      <td>Maya, 3DSMax</td>
+  </tr>
+  <tr>
+      <td><a href="#VLC">VideoLan Client (VLC)</a></td>
+      <td>Windows Media Player, PowerDVD</td>
   </tr>
   <tr><td>Office and Productivity</td>
       <td><a href="#LibreOffice">LibreOffice</a></td>
+      <td>Microsoft Office</td>
   </tr>
   <tr><td>Publishing</td>
       <td><a href="#Scribus">Scribus</a></td>
+      <td>PageMaker, InDesign, QuarkXPress</td>
   </tr>
   <tr><td>Programming Utilities</td>
       <td><a href="#MinGW">MinGW</a></td>
+      <td>Microsoft Visual C++</td>
   </tr>
  </tbody>
 </table>
 
-
 <dl>
 
 <dt id="Dia"><a href="http://directory.fsf.org/dia.html";>Dia</a></dt>
 <dd>
-  <p><strong>Replacement for:</strong> Microsoft Visio</p>
-
   <p>Dia is designed to be much like the proprietary
   Microsoft program 'Visio'. It can be used to draw many
   different kinds of diagrams. It currently has special
@@ -150,8 +183,6 @@
 
 <dt id="GIMP"><a href="http://directory.fsf.org/gimp.html";>GIMP</a></dt>
 <dd>
-  <p><strong>Replacement for:</strong> Photoshop, Paint Shop Pro</p>
-
   <p>GIMP is an acronym for GNU Image Manipulation Program.
   It can be used as a simple paint program, an expert
   quality photo retouching program, an online batch
@@ -172,9 +203,6 @@
 
 <dt id="Inkscape"><a href="http://www.inkscape.org/";>Inkscape</a></dt>
 <dd>
-  <p><strong>Replacement for:</strong> Adobe Illustrator,
-  Macromedia Freehand, CorelDraw or Xara Xtreme</p>
-
   <p>Inkscape is an vector graphics editor, with
   capabilities similar to Illustrator, Freehand, CorelDraw,
   or Xara Xtreme using the W3C standard Scalable Vector
@@ -194,8 +222,6 @@
 
 <dt id="ClawsMail"><a href="http://www.claws-mail.org/";>Claws Mail</a></dt>
 <dd>
-  <p><strong>Replacement for:</strong> Outlook, Outlook Express</p>
-
   <p>Claws Mail is designed to be familiar to new users coming from other
   popular email clients, as well as experienced users.</p>
 </dd>
@@ -203,8 +229,6 @@
 
 <dt id="GNUnet"><a href="http://gnunet.org";>GNUnet</a></dt>
 <dd>
-  <p><strong>Replacement for:</strong> Napster, etc.</p>
-
   <p>GNUnet is a framework for secure peer-to-peer
   networking that does not use any centralized or otherwise
   trusted services. A first service implemented on top of
@@ -219,9 +243,6 @@
 
 <dt id="Pidgin"><a href="http://directory.fsf.org/pidgin.html";>Pidgin</a></dt>
 <dd>
-  <p><strong>Replacement for:</strong> Trillian, AIM, MSN, Yahoo and ICQ chat 
-  clients</p>
-
   <p>Pidgin (Gaim) is a multi-protocol instant messaging client,
   with support for:</p>
 
@@ -251,9 +272,6 @@
 
 <dt id="QupZilla"><a href="http://www.qupzilla.com/";>QupZilla</a></dt>
 <dd>
-  <p><strong>Replacement for:</strong> Mozilla Firefox, Google
-  Chrome, Microsoft Internet Explorer</p>
-
   <p>QupZilla is a cross-platform web browser with a unified RSS reader,
   history and bookmarks in a single window.</p>
 </dd>
@@ -261,8 +279,6 @@
 
 <dt id="Tribler"><a href="http://www.tribler.org/";>Tribler</a></dt>
 <dd>
-  <p><strong>Replacement for:</strong> BitTorrent</p>
-
   <p>Tribler is an application that enables its users to find, 
   enjoy and share video, audio, pictures, and other things.</p>
 </dd>
@@ -270,8 +286,6 @@
 
 <dt id="Blender3D"><a href="http://directory.fsf.org/blender.html";>Blender 
3D</a></dt>
 <dd>
-  <p><strong>Replacement for:</strong> Maya, 3DSMax</p>
-
   <p>Blender is the first and only fully integrated 3D
   graphics creation suite allowing modeling, animation,
   rendering, post-production, realtime interactive 3D and
@@ -282,8 +296,6 @@
 
 <dt id="VLC"><a href="http://videolan.org/vlc/";>VideoLAN Client (VLC)</a></dt>
 <dd>
-  <p><strong>Replacement for:</strong> Windows Media Player, PowerDVD</p>
-
   <p>VLC (initially VideoLAN Client) is a highly portable
   multimedia player for various audio and video formats
   (MPEG-1, MPEG-2, MPEG-4, DivX, MP3, OGG, etc.) as well as
@@ -295,8 +307,6 @@
 
 <dt id="LibreOffice"><a href="http://www.libreoffice.org/";>LibreOffice</a></dt>
 <dd>
-  <p><strong>Replacement for:</strong> Microsoft Office</p>
-
   <p>LibreOffice is a multi-platform office productivity
   suite compatible with all major file formats.</p>
 </dd>
@@ -304,8 +314,6 @@
 
 <dt id="Scribus"><a href="http://www.scribus.net/";>Scribus</a></dt>
 <dd>
-  <p><strong>Replacement for:</strong> PageMaker, InDesign, QuarkXPress</p>
-
   <p>Scribus is a desktop publishing application, like Adobe PageMaker
   or Adobe InDesign from the proprietary software world. It is
   free software, distributed under the terms of the Gnu
@@ -319,8 +327,6 @@
 
 <dt id="MinGW"><a href="http://www.mingw.org";>MinGW</a></dt>
 <dd>
-  <p><strong>Replacement for:</strong> Microsoft Visual C++</p>
-
   <p>MinGW (Minimalist GNU for Windows) provides many of
   the GNU programming utilities on Windows. It includes the
   GNU Compiler Collection (GCC), Binutils, GNU Debugger
@@ -330,15 +336,6 @@
 </dl>
 
 
-<h4>Note</h4>
-
-<p>Why not recommend Firefox? As explained in our <a
-href="/philosophy/free-sw.html">Free Software Definition</a>, all 
-four freedoms must be available on both a commercial and non-commercial
-basis. Mozilla's trademark policy serves to limit Freedom 2 to gratis
-distribution only, making the software nonfree.</p>
-
-
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 
@@ -400,7 +397,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/03/02 16:07:23 $
+$Date: 2015/04/07 21:56:02 $
 <!-- timestamp end -->
 </p>
 </div>