www-commits
[Top][All Lists]
Advanced

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

www/graphics bwcartoon.html gnu-alternative.htm...


From: Therese Godefroy
Subject: www/graphics bwcartoon.html gnu-alternative.htm...
Date: Mon, 25 Feb 2019 07:33:57 -0500 (EST)

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 19/02/25 07:33:56

Modified files:
        graphics       : bwcartoon.html gnu-alternative.html 
                         gnu-ascii.html 

Log message:
        add author, standardize and restyle.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/bwcartoon.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/gnu-alternative.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/gnu-ascii.html?cvsroot=www&r1=1.21&r2=1.22

Patches:
Index: bwcartoon.html
===================================================================
RCS file: /webcvs/www/www/graphics/bwcartoon.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- bwcartoon.html      12 Apr 2014 12:39:40 -0000      1.23
+++ bwcartoon.html      25 Feb 2019 12:33:56 -0000      1.24
@@ -1,66 +1,68 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.87 -->
 <title>The Dynamic Duo: The Gnu and the Penguin in flight
 - GNU Project - Free Software Foundation</title>
+<link rel="stylesheet" type="text/css" href="/graphics/graphics.css" 
media="print,screen" />
+<style type="text/css" media="print,screen"><!--
+.reduced-width { width: 55em; }
address@hidden (min-width:55em) {
+   #navigation li#more-links, #back-to-top { display: none; }
+}
+--></style>
 <!--#include virtual="/graphics/po/bwcartoon.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>The Dynamic Duo: The Gnu and the Penguin in flight</h2>
 
-<p>
-<a href="/graphics/bwcartoon-m.jpg"><img src="/graphics/bwcartoon-m.jpg"
-   alt=" [B &amp; W Cartoon] "
-   width="598" height="637" /></a>
-</p>
-
-<p>A picture of a the Dynamic Duo: the Gnu and the Penguin in flight.</p>
+<p class="byline">by an anonymous artist</p>
 
-<p>This picture is available in the following formats:</p>
+<div class="reduced-width">
+<div class="pict wide">
+  <a href="/graphics/gnu-and-penguin-color-1024x946.jpg"><img
+     src="/graphics/gnu-and-penguin-color-300x276.jpg"
+     alt="&nbsp;[The Gnu and the Penguin in flight]&nbsp;" /></a>
+</div>
 
-<ul>
-    <li>jpeg <a href="/graphics/bwcartoon-m.jpg">64k</a>,
-       <a href="/graphics/bwcartoon.jpg">185k</a></li>
-    <li>pnm <a href="/graphics/bwcartoon.pnm">190k</a></li>
-</ul>
+<p>Gnu and Tux in their GPL armors are flying to the rescue of
+free software.</p>
 
-<p>They are also available as color images in the following formats:</p>
+<p><em>Black and white drawing</em></p>
 
 <ul>
-    <li>JPEG <a
-    href="/graphics/gnu-and-penguin-color-100x92.jpg">8k</a>, <a
-    href="/graphics/gnu-and-penguin-color-300x276.jpg">48k</a>, <a
-    href="/graphics/gnu-and-penguin-color-1024x946.jpg">412k</a>.</li>
-    <li>PNG <a
-    href="/graphics/gnu-and-penguin-color-100x92.png">12k</a>, <a
-    href="/graphics/gnu-and-penguin-color-300x276.png">83k</a>, <a
-    href="/graphics/gnu-and-penguin-color-1024x946.png">790k</a>.</li>
-    <li>XCF <a 
href="/graphics/gnu-and-penguin-color-original.xcf">5250k</a>.</li>
+  <li>JPEG&nbsp; <a href="/graphics/bwcartoon-m.jpg">66kB</a> (598x637),&nbsp;
+    <a href="/graphics/bwcartoon.jpg">187kB</a>&nbsp;(1197x1275)</li>
+  <li>PNM&nbsp; <a href="/graphics/bwcartoon.pnm">191kB</a> (1197x1275)</li>
+  <li>SVG&nbsp; <a href="/graphics/bwcartoon-m.svg">81kB</a> by Victor 
Siame</li>
+  <li>See also <a
+    href="https://commons.wikimedia.org/wiki/File:Tux-gnu-dynamic-duo.png";>
+    Wikimedia Commons</a>.</li>
 </ul>
 
-<p>
-<a href="/graphics/graphics.html">Other art</a>
-in the GNU Art Gallery.
-</p>
-
-<p>The images linked to from this page are:<br />
-Copyright (C) 1999, Free Software Foundation, Inc.<br />
-Permission is granted to copy, distribute and/or modify this image under
-the terms either:</p>
+<p><em>Colored version</em></p>
 
 <ul>
-    <li>the <a href="/copyleft/gpl.html">GNU General Public License</a>
-          as published by the Free Software Foundation; either version 2 of
-          the License, or (at your option) any later version, or</li>
-    <li>the <a href="/copyleft/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>
+  <li>JPEG&nbsp; <a
+    href="/graphics/gnu-and-penguin-color-100x92.jpg">8kB</a> (100x92),&nbsp; 
<a
+    
href="/graphics/gnu-and-penguin-color-300x276.jpg">48kB</a>&nbsp;(300x276),&nbsp;
 <a
+    
href="/graphics/gnu-and-penguin-color-1024x946.jpg">419kB</a>&nbsp;(1024x946)</li>
+  <li>PNG&nbsp; <a
+    href="/graphics/gnu-and-penguin-color-100x92.png">12kB</a> (100x92),&nbsp; 
<a
+    
href="/graphics/gnu-and-penguin-color-300x276.png">83kB</a>&nbsp;(300x276),&nbsp;
 <a
+    
href="/graphics/gnu-and-penguin-color-1024x946.png">800kB</a>&nbsp;(1024x946)</li>
+  <li>XCF&nbsp; <a
+    href="/graphics/gnu-and-penguin-color-original.xcf">5250kB</a> 
(1024x946)</li>
 </ul>
 
-<p>These images are distributed in the hope that it 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
-details.</p>
+<div id="license" class="infobox">
+<hr />
+<p>Copyright &copy; 1999 Free Software Foundation, Inc.</p>
+
+<p>This image is available under the <a rel="license"
+href="/licenses/old-licenses/gpl-2.0.html">GNU General Public License</a>,
+version&nbsp;2 or any later version, or the <a rel="license"
+href="/licenses/fdl.html">GNU Free Documentation License</a>, version&nbsp;1.1
+or any later version.</p>
+</div>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -92,37 +94,21 @@
 of this article.</p>
 </div>
 
-<!-- Regarding copyright, in general, standalone pages (as opposed to
-     files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
-     without talking with the webmasters or licensing team first.
-     Please make sure the copyright date is consistent with the
-     document.  For web pages, it is ok to list just the latest year the
-     document was modified, or published.
-     
-     If you wish to list earlier years, that is ok too.
-     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
-     years, as long as each year in the range is in fact a copyrightable
-     year, i.e., a year in which the document was published (including
-     being publicly visible on the web or in a revision control system).
-     
-     There is more detail about copyright years in the GNU Maintainers
-     Information document, www.gnu.org/prep/maintain. -->
-
-<p>Copyright &copy; 2014 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>
+<!-- Please only list the latest year the page was modified. -->
+<p><em>Page text:</em>&nbsp;
+Copyright &copy; 2019 Free Software Foundation, Inc.<br />
+Available under the <a rel="license"
+href="https://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
+Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 12:39:40 $
+$Date: 2019/02/25 12:33:56 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: gnu-alternative.html
===================================================================
RCS file: /webcvs/www/www/graphics/gnu-alternative.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- gnu-alternative.html        12 Apr 2014 12:39:41 -0000      1.24
+++ gnu-alternative.html        25 Feb 2019 12:33:56 -0000      1.25
@@ -1,39 +1,57 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.87 -->
 <title>GNU Alternative - GNU Project - Free Software Foundation</title>
+<link rel="stylesheet" type="text/css" href="/graphics/graphics.css" 
media="print,screen" />
+<style type="text/css" media="print,screen"><!--
+.reduced-width { width: 55em; }
address@hidden (min-width: 48em) {
+   #navigation li#more-links, #back-to-top { display: none; }
+}
+--></style>
 <!--#include virtual="/graphics/po/gnu-alternative.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>GNU Alternative</h2>
 
-<p>
-<a href="/graphics/gnu-alternative.jpg"><img 
src="/graphics/gnu-alternative.jpg"
-   alt=" [image of the Head of a GNU] "
-   width="291" height="219" /></a>
-</p>
+<p class="byline">by an anonymous artist</p>
 
-<p>
-This is a new image of a GNU head that can be used as an alternative
-to the <a href="/graphics/agnuhead.html">default GNU head</a>.
-</p>
+<div class="reduced-width">
+<div class="pict medium">
+  <a href="/graphics/gnu-alternative.jpg"><img
+     src="/graphics/gnu-alternative.jpg"
+     alt="&nbsp;[Stylized gnu mask]&nbsp;" /></a>
+</div>
+
+<p>This black and white stylized gnu mask can be used as an alternative to
+the <a href="/graphics/heckert_gnu.html">Bold GNU Head</a>.</p>
 
-<p>
-This picture is available in the following formats:
-</p>
-<ul>
-       <li>jpeg <a href="/graphics/gnu-alternative.jpg">10k</a></li>
-       <li>png <a href="/graphics/gnu-alternative.png">3k</a></li>
-</ul>
-<p>
-Two wallpapers based on the alternative GNU head.
-</p>
-<p>
-This pictures are available in the following formats:
-</p>
 <ul>
-       <li>png <a href="/graphics/gnu-alt-wp1.png">wallpaper 1 - 844k</a></li>
-       <li>png <a href="/graphics/gnu-alt-wp2.png">wallpaper 2 - 487k</a></li>
+  <li>JPEG&nbsp; <a href="/graphics/gnu-alternative.jpg">10kB</a> 
(291x219)</li>
+  <li>PNG&nbsp; <a href="/graphics/gnu-alternative.png">3kB</a> (291x219)</li>
+  <li>SVG&nbsp; <a href="/graphics/gnu-alternative.svg">14kB</a>, vectorized
+    by Sergiy S. Kolesnikov
 </ul>
 
+<div id="license" class="infobox">
+<hr />
+<p>Copyright &copy; 2000 Free Software Foundation, Inc.<br />
+
+<p>These images are available under the <a rel="license"
+href="/licenses/fdl">GNU Free Documentation License</a>, version&nbsp;1.2 or
+any later version, or the <a rel="license"
+href="https://creativecommons.org/licenses/by-sa/3.0/";>Creative Commons
+Attribution-ShareAlike 3.0 International License</a>.</p>
+
+<p>The GNU head is, however, also a trademark for the GNU Project.
+<strong>If you want to use the GNU head to link to a website run by
+the Free Software Foundation or the GNU project, feel free, or if
+you're using it in contexts talking about GNU in a supportive and
+accurate way, you can also do this without permission.  For any other
+requests, please ask &lt;<a
+href="mailto:address@hidden";>address@hidden</a>&gt; for
+permission first.</strong></p>
+</div>
+</div>
+
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -64,37 +82,21 @@
 of this article.</p>
 </div>
 
-<!-- Regarding copyright, in general, standalone pages (as opposed to
-     files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
-     without talking with the webmasters or licensing team first.
-     Please make sure the copyright date is consistent with the
-     document.  For web pages, it is ok to list just the latest year the
-     document was modified, or published.
-     
-     If you wish to list earlier years, that is ok too.
-     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
-     years, as long as each year in the range is in fact a copyrightable
-     year, i.e., a year in which the document was published (including
-     being publicly visible on the web or in a revision control system).
-     
-     There is more detail about copyright years in the GNU Maintainers
-     Information document, www.gnu.org/prep/maintain. -->
-
-<p>Copyright &copy; 2014 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>
+<!-- Please only list the latest year the page was modified. -->
+<p><em>Page text:</em>&nbsp;
+Copyright &copy; 2019 Free Software Foundation, Inc.<br />
+Available under the <a rel="license"
+href="https://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
+Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 12:39:41 $
+$Date: 2019/02/25 12:33:56 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: gnu-ascii.html
===================================================================
RCS file: /webcvs/www/www/graphics/gnu-ascii.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gnu-ascii.html      2 Nov 2015 01:27:51 -0000       1.21
+++ gnu-ascii.html      25 Feb 2019 12:33:56 -0000      1.22
@@ -1,10 +1,21 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.87 -->
 <title>ASCII Gnu - GNU Project - Free Software Foundation</title>
+<link rel="stylesheet" type="text/css" href="/graphics/graphics.css" 
media="print,screen" />
+<style type="text/css" media="print,screen"><!--
+.reduced-width { width: 40em; }
+pre { margin-left: 15%; }
address@hidden (min-width: 35em) {
+   #navigation li#more-links, #back-to-top { display: none; }
+}
+--></style>
 <!--#include virtual="/graphics/po/gnu-ascii.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>ASCII Gnu</h2>
 
+<p class="byline">by Przemys&#322;aw Borys</p>
+
+<div class="reduced-width">
 <pre>
   ,           , 
  /             \ 
@@ -22,26 +33,17 @@
 terminals.
 </p>
 
-<p>The ASCII image above is:<br />
-Copyright (C) 2001, Free Software Foundation, Inc.<br />
-Permission is granted to copy, distribute and/or modify this image under
-the terms either:</p>
-
-<ul>
-    <li>the <a href="/copyleft/gpl.html">GNU General Public License</a>
-          as published by the Free Software Foundation; either version 2 of
-          the License, or (at your option) any later version, or</li>
-    <li>the <a href="/copyleft/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
-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
-details.</p>
+<div id="license" class="infobox">
+<hr />
+<p>Copyright &copy; 2001 Free Software Foundation, Inc.</p>
+
+<p>This work is available under the <a rel="license"
+href="/licenses/old-licenses/gpl-2.0.html">GNU General Public License</a>,
+version&nbsp;2 or any later version, or the <a rel="license"
+href="/licenses/fdl.html">GNU Free Documentation License</a>, version&nbsp;1.1
+or any later version.</p>
+</div>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -73,38 +75,21 @@
 of this article.</p>
 </div>
 
-<!-- Regarding copyright, in general, standalone pages (as opposed to
-     files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 4.0.  Please do NOT change or remove this
-     without talking with the webmasters or licensing team first.
-     Please make sure the copyright date is consistent with the
-     document.  For web pages, it is ok to list just the latest year the
-     document was modified, or published.
-     
-     If you wish to list earlier years, that is ok too.
-     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
-     years, as long as each year in the range is in fact a copyrightable
-     year, i.e., a year in which the document was published (including
-     being publicly visible on the web or in a revision control system).
-     
-     There is more detail about copyright years in the GNU Maintainers
-     Information document, www.gnu.org/prep/maintain. -->
-
-<p>Copyright &copy; 2001, 2015 Free Software Foundation, Inc.</p>
-
-<p>ASCII Gnu is licensed under the
-  the <a href="/licenses/gpl-2.0.html">GNU General Public License</a>
-  either version 2 or later and the <a href="/licenses/fdl-1.1.html">GNU
-  Free Documentation License</a> version 1.1 or any later.</p>
+<!-- Please only list the latest year the page was modified. -->
+<p><em>Page text:</em>&nbsp;
+Copyright &copy; 2019 Free Software Foundation, Inc.<br />
+Available under the <a rel="license"
+href="https://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
+Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/11/02 01:27:51 $
+$Date: 2019/02/25 12:33:56 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>



reply via email to

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