www/graphics meditate.html

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 17/06/23 03:43:05

Modified files:
        graphics       : meditate.html 

Log message:
        Add the Papo Livre variant and reorganize the page (RT #1217028).

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/meditate.html?cvsroot=www&r1=1.41&r2=1.42

Patches:
Index: meditate.html
===================================================================
RCS file: /webcvs/www/www/graphics/meditate.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- meditate.html       12 Apr 2014 12:39:46 -0000      1.41
+++ meditate.html       23 Jun 2017 07:43:04 -0000      1.42
@@ -20,97 +20,100 @@
 is a gleam in his eyes as he gazes ahead at his computer screen.</p>
 
 <p>
-We thank the artists of the Nevrax Design Team, for drawing this
-beautiful picture, and their employer, Nevrax Limited, for giving them
-time to work on it.</p>
-<p>
-This color picture is available in the following formats:
+This picture is available in the following formats:
 </p>
 <ul>
-  <li>JPEG <a href="/graphics/meditate-tiny.jpg">4.4k
-           (10% of full size and reasonable quality)</a>,
+  <li>JPEG <a href="/graphics/meditate-tiny.jpg">4.4kB</a>
+           (10% of full size and reasonable quality),
 
-           <a href="/graphics/meditate-small-half.jpg">11k
-           (half size and low quality)</a>,
+           <a href="/graphics/meditate-small-half.jpg">11kB</a>
+           (half size and low quality),
 
-           <a href="/graphics/meditate-small.jpg">36k (full size and low
-           quality)</a>,
+           <a href="/graphics/meditate-small.jpg">36kB</a> (full size and low
+           quality),
 
-          <a href="/graphics/meditate.jpg">580k (full size and quality)</a>
-   </li>
+           <a href="/graphics/meditate.jpg">580kB</a> (full size and 
quality)</li>
 
-  <li> PNG <a href="/graphics/meditate.png">594k (full size and quality with
-  transparent background) </a></li>
+  <li> PNG <a href="/graphics/meditate.png">594kB</a> (full size and quality 
with
+  transparent background)</li>
 
-  <li> XCF <a href="/graphics/meditate.xcf.gz">2.0M (a gzip'ed, full size
-  and quality file in GIMP's native format) </a></li>
+  <li> XCF <a href="/graphics/meditate.xcf.gz">2.0MB</a> (GIMP's native format,
+  full size and quality, gzip'ed)</li>
 
+  <li> SVG <a href="/graphics/meditate.svg">1.5MB</a>, made with Inkscape from
+  the original GIMP version. Thanks to Mar&iacute;a del Pilar Saenz.</li>
 </ul>
-
 <p>
-The images linked to from this page are:
-<br />
+We thank the artists of the Nevrax Design Team for drawing this
+beautiful picture, and their employer, Nevrax Limited, for giving them
+time to work on it.<br />
+Copyright &copy; 2001 Free Software Foundation, Inc.</p>
 
-Copyright (C) 2001 Free Software Foundation, Inc. <br />
+<h3>Variants</h3>
+
+<h4>With the words &ldquo;Free Software&rdquo; behind the image</h4>
+
+<p>1. Gray text, white background:</p>
+<ul>
+  <li>JPEG <a href="/graphics/meditate-fs.jpg">1.4MB</a></li>
+</ul>
+<p>Copyright &copy; 2001 Free Software Foundation, Inc.</p>
+
+<p>2. Gray text, black background:</p>
+<ul>
+  <li>JPEG <a href="/graphics/meditate_fel.jpg">480kB</a></li>
+  <li> PNG <a href="/graphics/meditate_fel.png">1.4MB</a></li>
+  <li> XCF <a href="/graphics/meditate_fel_xcf.tar.gz">2.0MB</a> (GIMP's native
+  format, full size and quality, gzip'ed)</li>
+</ul>
+<p>Thanks to Gonzalo Pineda for this nice wallpaper.<br /> 
+Copyright &copy; 2001, 2004 Free Software Foundation, Inc.</p>
+
+<h4>With a microphone replacing the computer</h4>
+
+<ul>
+  <li>PNG <a href="/graphics/meditate-papolivre-small.png">111kB</a></li>
+  <li>PNG <a href="/graphics/meditate-papolivre.png">739kB</a></li>
+  <li>SVG <a href="/graphics/meditate-papolivre.svg">431kB</a></li>
+</ul>
+<p>Thanks to Aur&eacute;lio Heckert for this modified version, which was made
+for the website of <cite><a href="https://papolivre.org/";>Papo Livre</a></cite>
+(Free Chat), a Brazilian podcast on free software.<br />
+Copyright &copy; 2001, 2017 Free Software Foundation, Inc.</p>
 
-    Permission is granted to copy, distribute and/or modify this image under
-    the terms either:
+<h3>Licensing</h3>
+<p>
+    Permission is granted to copy, distribute and/or modify these images under
+    the terms of either:
 </p>
 
 <ul>
-      <li> the <a href="/copyleft/gpl.html">GNU General Public License</a>
+      <li> the <a href="/licenses/gpl.html">GNU General Public License</a>
           as published by the Free Software Foundation; either version 3 of
           the License, or (at your option) any later version, or</li>
 
-      <li> the <a href="/copyleft/fdl.html"> GNU Free Documentation
+      <li> the <a href="/licenses/fdl.html"> GNU Free Documentation
           License</a>, Version 1.1 or any later version published by the
           Free Software Foundation; with the no Invariant Sections, with no
           Front-Cover Texts and with no Back-Cover Texts.</li>
 </ul>
 
 <p>
-    These images are distributed in the hope that it will be useful, but
+    These images are distributed in the hope that they will be useful, but
     WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the <a
-    href="/copyleft/gpl.html">GNU General Public License</a> for more
+    href="/licenses/gpl.html">GNU General Public License</a> for more
     details.
 </p>
 
 <p>
-    You can find a copy of the <a href="/copyleft/gpl.html">GNU General
-    Public License</a> and the <a href="/copyleft/fdl.html">GNU Free
+    You can find a copy of the <a href="/licenses/gpl.html">GNU General
+    Public License</a> and the <a href="/licenses/fdl.html">GNU Free
     Documentation License</a> via the preceding links.  If you have trouble
     downloading it, write to the Free Software Foundation, Inc., 51 
     Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 </p>
 
-<p> This image is also available
-  in <a href="/graphics/meditate.svg">SVG 1.5M</a>, 
-  created with inkscape. Thanks to Mar&iacute;a del Pilar Saenz. 
-  This image is licenced under the terms of the GFDL licence.
-
-</p>
-
-<p>
-A modified version of this color picture, with the words "Free Software"
-in gray text behind the image, is available in the following formats:
-</p>
-<ul>
-  <li>JPEG <a href="/graphics/meditate-fs.jpg">1.4M</a></li>
-</ul>
-<p>
-Another version of this color picture, with the words "Free Software"
-in gray text behind the image with a black background. Thanks to Gonzalo 
Pineda for this nice wallpaper. 
-It is available in the following formats:
-</p>
-
-<ul>
-  <li>JPEG <a href="/graphics/meditate_fel.jpg">480k</a></li>
-  <li> PNG <a href="/graphics/meditate_fel.png">1.4M</a></li>
-  <li> XCF <a href="/graphics/meditate_fel_xcf.tar.gz">2.0M (a tar,gzip'ed, 
full size
-  and quality file in GIMP's native format)</a></li>
-</ul>
-
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -168,7 +171,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 12:39:46 $
+$Date: 2017/06/23 07:43:04 $
 <!-- timestamp end -->
 </p>
 </div>