www gnu/gnu.html software/for-windows.html soft...

[Pavel Kharitonov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       14/03/29 07:09:10

Modified files:
        gnu            : gnu.html 
        software       : for-windows.html software.html 

Log message:
        Add fs-gang image; restyle dynamic-duo passage.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu.html?cvsroot=www&r1=1.63&r2=1.64
http://web.cvs.savannah.gnu.org/viewcvs/www/software/for-windows.html?cvsroot=www&r1=1.62&r2=1.63
http://web.cvs.savannah.gnu.org/viewcvs/www/software/software.html?cvsroot=www&r1=1.208&r2=1.209

Patches:
Index: gnu/gnu.html
===================================================================
RCS file: /web/www/www/gnu/gnu.html,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- gnu/gnu.html        27 Mar 2014 04:38:03 -0000      1.63
+++ gnu/gnu.html        29 Mar 2014 07:09:09 -0000      1.64
@@ -2,18 +2,40 @@
 <!-- Parent-Version: 1.76 -->
 <title>The GNU Operating System
 - GNU project - Free Software Foundation</title>
+
+<style type="text/css" media="print,screen">
+#dynamic-duo {
+   float: right;
+   width: 24em;
+   font-style: normal;
+   text-align: center;
+   padding: .8em;
+   margin: .3em 1em 1em 1em;
+   border: .5em solid #acc890;
+}
+#dynamic-duo p strong {
+   font-size: 1.3em;
+}
+#dynamic-duo img { width: 100%; }
+#dynamic-duo p.highlight-para {
+   text-align: left;
+   padding: .5em .8em .7em .8em;
+   margin: .5em;
+   border-width: 1px;
+}
+</style>
 <!--#include virtual="/gnu/po/gnu.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>The GNU Operating System</h2>
 
-<div style="width: 300px; padding: 15px; margin: 15px; margin-top: 0; float: 
right; border: 6px solid #bd0;">
-<h4 class="center">Download distributions</h4>
-<p><a href="/distros/free-distros.html"><img 
src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU and Linux" /></a></p>
-<p><span class="highlight">If you're looking for a whole system to
-install, see
-our <a href="/distros/free-distros.html">list of
-GNU/Linux distributions which are entirely free software</a>.</span></p>
-</div>
+<blockquote id="dynamic-duo">
+<p><strong>Download distributions</strong></p>
+<p><a href="/distros/free-distros.html">
+<img src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU and Linux" 
/></a></p>
+<p class="highlight-para">If you're looking for a whole system to
+install, see our <a href="/distros/free-distros.html">list of
+GNU/Linux distributions which are entirely free software</a>.</p>
+</blockquote>
 
 <ul>
   <li><a href="/gnu/about-gnu.html">About the GNU Operating System</a></li>
@@ -121,7 +143,7 @@
 
 <p></p><p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/03/27 04:38:03 $
+$Date: 2014/03/29 07:09:09 $
 <!-- timestamp end -->
 </p>
 </div>

Index: software/for-windows.html
===================================================================
RCS file: /web/www/www/software/for-windows.html,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- software/for-windows.html   14 Mar 2014 04:05:22 -0000      1.62
+++ software/for-windows.html   29 Mar 2014 07:09:10 -0000      1.63
@@ -3,7 +3,21 @@
 <title>Free Software for Windows
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/software/po/for-windows.translist" -->
+
+<style type="text/css" media="print,screen">
+#windows7sins {
+   float: right;
+   width: 25em;
+   text-align: center;
+   margin: 0 1em 1em 1em;
+}
+blockquote#windows7sins p { margin: .3em 0 0 0; }
+#windows7sins img { width: 100%; }
+</style>
+
+<!--#include virtual="/server/fs-gang-definitions.html" -->
 <!--#include virtual="/server/banner.html" -->
+
 <h2>Free Software for Windows</h2>
 
   <p>Here is a list of popular free software applications that run on
@@ -11,10 +25,12 @@
   they replace. If you are still a Windows user, you can take a first
   step towards free software by installing these applications.</p>
 
-<div id="windows7sins"><p><a href="http://www.fsf.org/windows8";><img
-src="http://static.fsf.org/fsforg/graphics/windows-infographic_medium.png";
-width="300" alt="Upgrade from Windows 8" /></a></p><p><small>Upgrade
-from Windows 8</small></p></div>
+<blockquote id="windows7sins">
+<p><a href="http://www.upgradefromwindows8.com";><img
+src="https://static.fsf.org/fsforg/graphics/windows-infographic_medium.png";
+alt="Close Windows, Open Doors" /></a></p>
+<p>Upgrade from Windows 8</p>
+</blockquote>
 
   <p>When we say these application programs are <a href=
   "/philosophy/free-sw.html">free software</a>, we're talking about
@@ -241,6 +257,14 @@
      and that it is like this: "2001, 2002", not this: "2001-2002". -->
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
+
+<div id="fs-gang">
+<div class="img-container">
+<a href="http://www.fsf.org/working-together/gang";>meet the free software
+gang<img src="fs-gang.png" alt=" [FS gang] "/></a>
+</div> <!-- /img-container -->
+</div> <!-- /fs-gang -->
+
 <div id="footer">
 <div class="unprintable">
 
@@ -280,7 +304,7 @@
 
 <p></p><p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/03/14 04:05:22 $
+$Date: 2014/03/29 07:09:10 $
 <!-- timestamp end -->
 </p>
 </div>

Index: software/software.html
===================================================================
RCS file: /web/www/www/software/software.html,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -b -r1.208 -r1.209
--- software/software.html      23 Mar 2014 15:39:14 -0000      1.208
+++ software/software.html      29 Mar 2014 07:09:10 -0000      1.209
@@ -1,20 +1,44 @@
 <!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.76 -->
-<title>Software - GNU Project - Free Software Foundation</title>
-
+<title>Software
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/software/po/software.translist" -->
+
+<style type="text/css" media="print,screen">
+#dynamic-duo {
+   float: right;
+   width: 24em;
+   font-style: normal;
+   text-align: center;
+   padding: .8em;
+   margin: .3em 1em 1em 1em;
+   border: .5em solid #acc890;
+}
+#dynamic-duo p strong {
+   font-size: 1.3em;
+}
+#dynamic-duo img { width: 100%; }
+#dynamic-duo p.highlight-para {
+   text-align: left;
+   padding: .5em .8em .7em .8em;
+   margin: .5em;
+   border-width: 1px;
+}
+</style>
+
+<!--#include virtual="/server/fs-gang-definitions.html" -->
 <!--#include virtual="/server/banner.html" -->
 
 <h2>GNU Software</h2>
 
-<div style="width: 300px; padding: 15px; margin: 15px; float: right; border: 
6px solid #bd0;">
-<h4 class="center">Download distributions</h4>
-<p><a href="/distros/free-distros.html"><img 
src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU and Linux" /></a></p>
-<p><span class="highlight">If you're looking for a whole system to
-install, see
-our <a href="/distros/free-distros.html">list of
-GNU/Linux distributions which are entirely free software</a>.</span></p>
-</div>
+<blockquote id="dynamic-duo">
+<p><strong>Download distributions</strong></p>
+<p><a href="/distros/free-distros.html">
+<img src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU and Linux" 
/></a></p>
+<p class="highlight-para">If you're looking for a whole system to
+install, see our <a href="/distros/free-distros.html">list of
+GNU/Linux distributions which are entirely free software</a>.</p>
+</blockquote>
 
 <p><a href="/gnu/about-gnu.html">GNU</a> is an operating system which is
 100% free software.  It was launched in 1983 by Richard Stallman (rms)
@@ -231,6 +255,14 @@
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
+
+<div id="fs-gang">
+<div class="img-container">
+<a href="http://www.fsf.org/working-together/gang";>meet the free software
+gang<img src="fs-gang.png" alt=" [FS gang] "/></a>
+</div> <!-- /img-container -->
+</div> <!-- /fs-gang -->
+
 <div id="footer">
 <div class="unprintable">
 
@@ -286,7 +318,7 @@
 
 <p></p><p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/03/23 15:39:14 $
+$Date: 2014/03/29 07:09:10 $
 <!-- timestamp end -->
 </p>
 </div>