www-commits
[Top][All Lists]
Advanced

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

www distros/free-distros.es.html distros/po/fre...


From: GNUN
Subject: www distros/free-distros.es.html distros/po/fre...
Date: Wed, 13 Mar 2013 23:00:50 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     13/03/13 23:00:50

Modified files:
        distros        : free-distros.es.html 
        distros/po     : free-distros.es-en.html 
        philosophy     : can-you-trust.es.html 
                         government-free-software.es.html 
                         nonfree-games.es.html words-to-avoid.es.html 
        philosophy/po  : can-you-trust.es-en.html 
                         government-free-software.es-en.html 
                         nonfree-games.es-en.html 
                         words-to-avoid.es-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-distros.es.html?cvsroot=www&r1=1.59&r2=1.60
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.es-en.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/can-you-trust.es.html?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/government-free-software.es.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/nonfree-games.es.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.es.html?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/can-you-trust.es-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/government-free-software.es-en.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/nonfree-games.es-en.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.es-en.html?cvsroot=www&r1=1.24&r2=1.25

Patches:
Index: distros/free-distros.es.html
===================================================================
RCS file: /web/www/www/distros/free-distros.es.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- distros/free-distros.es.html        10 Mar 2013 07:16:20 -0000      1.59
+++ distros/free-distros.es.html        13 Mar 2013 23:00:21 -0000      1.60
@@ -101,6 +101,13 @@
 distribución de GNU/Linux completamente libre reconocida por el Proyecto
 GNU.</td></tr>
 
+ <tr class="odd">
+   <td><a href="http://venenux.net/";>
+       <img src="/graphics/distros-venenux.png" alt="Venenux" /></a></td>
+   <td>Venenux, una distribución GNU/Linux suramericana pensada 
principalmente para
+usuarios hispanohablantes. Es principalmente un sistema operativo de
+escritorio, pero también puede instalarse como servidor.</td></tr>
+
 </table>
 
 <p>Además de sus propios sitios web, muchas de estas distribuciones estan
@@ -219,7 +226,7 @@
  <p><!-- timestamp start -->
 Última actualización: 
 
-$Date: 2013/03/10 07:16:20 $
+$Date: 2013/03/13 23:00:21 $
 
 <!-- timestamp end -->
 </p>

Index: distros/po/free-distros.es-en.html
===================================================================
RCS file: /web/www/www/distros/po/free-distros.es-en.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- distros/po/free-distros.es-en.html  10 Mar 2013 07:16:29 -0000      1.29
+++ distros/po/free-distros.es-en.html  13 Mar 2013 23:00:25 -0000      1.30
@@ -94,6 +94,13 @@
    <td>Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first
        fully free GNU/Linux system recognized by the GNU Project.</td></tr>
 
+ <tr class="odd">
+   <td><a href="http://venenux.net/";>
+       <img src="/graphics/distros-venenux.png" alt="Venenux" /></a></td>
+   <td>Venenux, a South American GNU/Linux distribution intended primarily for
+       Spanish-speaking users. Primarily a desktop operating system, but also
+       supports server setups.</td></tr>
+
 </table>
 
 <p>In addition to their own sites, many of these distributions are
@@ -187,7 +194,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/03/10 07:16:29 $
+$Date: 2013/03/13 23:00:25 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/can-you-trust.es.html
===================================================================
RCS file: /web/www/www/philosophy/can-you-trust.es.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- philosophy/can-you-trust.es.html    28 Feb 2013 19:11:06 -0000      1.39
+++ philosophy/can-you-trust.es.html    13 Mar 2013 23:00:28 -0000      1.40
@@ -1,22 +1,17 @@
 
+
 <!--#include virtual="/server/header.es.html" -->
+<!-- Parent-Version: 1.75 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
  <!--#set var="ENGLISH_PAGE" value="/philosophy/can-you-trust.en.html" -->
 
-<title>¿Puede confiar en su computadora? - Proyecto GNU - Free Software 
Foundation
-(FSF)</title>
+<title>¿Puede confiar en su computadora? - Proyecto GNU - Free Software 
Foundation </title>
 
 <!--#include virtual="/philosophy/po/can-you-trust.translist" -->
 <!--#include virtual="/server/banner.es.html" -->
 <h2>¿Puede confiar en su computadora?</h2>
 
-<!-- This document uses XHTML 1.0 Strict, but may be served as -->
-<!-- text/html.  Please ensure that markup style considers -->
-<!-- appendex C of the XHTML 1.0 standard. See validator.w3.org. -->
-<!-- Please ensure links are consistent with Apache's MultiView. -->
-<!-- Change include statements to be consistent with the relevant -->
-<!-- language, where necessary. -->
 <p>por <a href="http://www.stallman.org/";>Richard Stallman</a></p>
 
 <p>
@@ -63,17 +58,16 @@
 dejarán automáticamente de funcionar. </p>
 <p>
 Por supuesto, Hollywood y las compañías discográficas planean usar la
-computación traidora para el «DRM» («Administración de Restricciones
-Digitales» o «<span style="font-style:italic;">Digital Restriction
-Management</span>» en inglés). De ese modo, los vídeos y la música
-descargados podrán reproducirse sólo en  un ordenador determinado. Compartir
-será completamente imposible, al menos usando los archivos autorizados que
-deberá obtener de dichas compañías. Usted, el público, debería tener la
-libertad y la habilidad de compartir esas cosas. (Espero que alguien
-encuentre la forma de producir versiones que no estén cifradas, de subirlas
-y compartirlas, así el <abbr title="Digital Restriction
-Management">DRM</abbr> no tendrá éxito completamente, pero esto no es excusa
-para el sistema.). </p>
+computación traidora para la «<abbr title="Digital Restriction
+Management">DRM</abbr>» («Gestión Digital de Restricciones» 
(«<cite>Digital
+Restriction Management</cite>» en inglés). De ese modo, los videos y la
+música descargados podrán reproducirse sólo en  un ordenador
+determinado. Compartir será completamente imposible, al menos usando los
+archivos autorizados que deberá obtener de dichas compañías. Usted, el
+público, debería tener la libertad y la posibilidad de compartir esas
+cosas. (Espero que alguien encuentre la forma de producir versiones que no
+estén cifradas, de subirlas y compartirlas, así la DRM no tendrá éxito
+completamente, pero esto no es excusa para el sistema). </p>
 <p>
 Hacer imposible el compartir ya es lo suficientemente malo, pero va a
 peor. Existen planes para usar el mismo mecanismo al enviar documentos por
@@ -253,12 +247,7 @@
 Software, Free Society: The Selected Essays of Richard
 M. Stallman</cite></a></h4>
 
-<!-- If needed, change the copyright block at the bottom. In general, -->
-<!-- all pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. -->
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
+
 <div style="font-size: small;">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -269,17 +258,28 @@
 <!--#include virtual="/server/footer.es.html" -->
 <div id="footer">
 
-<p>
-Envíe sus consultas acerca de la FSF  y GNU a <a
+<p>Envíe sus consultas acerca de la FSF y GNU a <a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Existen también <a
-href="/contact/">otros medios para contactar</a> con la FSF.
-<br />
-Para avisar de enlaces rotos y proponer otras correcciones o sugerencias,
+href="/contact/">otros medios para contactar</a> con la FSF. <br /> Para
+avisar de enlaces rotos y proponer otras correcciones o sugerencias,
 diríjase a <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p>
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
 <p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
 El equipo de traductores al español se esfuerza por ofrecer traducciones
 fieles al original y de buena calidad, pero no estamos libres de cometer
 errores.<br /> Por favor envíe sus comentarios y sugerencias sobre las
@@ -287,16 +287,13 @@
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 </p><p>Consulte la <a href="/server/standards/README.translations.html">Guía
 para las traducciones</a> para obtener información sobre la coordinación y
-el envío de traducciones de las páginas de este sitio web.
-</p>
+el envío de traducciones de las páginas de este sitio web.</p>
+
+<p>Copyright &copy; 2002, 2007 Richard Stallman</p>
 
-<p>
-Copyright &copy; 2002, 2007 Richard Stallman
-</p>
 <p>Esta página está bajo una <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.es";>licencia
-Creative Commons Atribución-SinDerivadas 3.0 Estados Unidos de América</a>.
-</p>
+Creative Commons Atribución-SinDerivadas 3.0 Estados Unidos de 
América</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.es.html" -->
 <div class="translators-credits">
@@ -314,12 +311,11 @@
  <p><!-- timestamp start -->
 Última actualización: 
 
-$Date: 2013/02/28 19:11:06 $
+$Date: 2013/03/13 23:00:28 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: philosophy/government-free-software.es.html
===================================================================
RCS file: /web/www/www/philosophy/government-free-software.es.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- philosophy/government-free-software.es.html 10 Mar 2013 15:13:12 -0000      
1.30
+++ philosophy/government-free-software.es.html 13 Mar 2013 23:00:29 -0000      
1.31
@@ -21,7 +21,10 @@
 
 <p>La misión del estado es organizar a la sociedad para la libertad y el
 bienestar del pueblo. Un aspecto de esta misión, en la informática, es
-exhortar a los usuarios de computadoras a adoptar el software libre. </p>
+exhortar a los usuarios de computadoras a adoptar el software libre: <a
+href="/philosophy/free-sw.html">software que respeta la libertad de los
+usuarios</a>. Un programa privativo (que no es libre) oprime la libertad de
+quienes lo usan; es un problema social y el estado debe erradicarlo.</p>
 
 <p>El estado tiene que insistir en el uso de software libre para alcanzar la
 soberanía en el campo informático (control del estado sobre su actividad
@@ -249,7 +252,7 @@
  <p><!-- timestamp start -->
 Última actualización: 
 
-$Date: 2013/03/10 15:13:12 $
+$Date: 2013/03/13 23:00:29 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/nonfree-games.es.html
===================================================================
RCS file: /web/www/www/philosophy/nonfree-games.es.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/nonfree-games.es.html    28 Feb 2013 19:11:48 -0000      1.7
+++ philosophy/nonfree-games.es.html    13 Mar 2013 23:00:29 -0000      1.8
@@ -1,7 +1,7 @@
 
 
 <!--#include virtual="/server/header.es.html" -->
-<!-- Parent-Version: 1.68 -->
+<!-- Parent-Version: 1.75 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
  <!--#set var="ENGLISH_PAGE" value="/philosophy/nonfree-games.en.html" -->
@@ -90,22 +90,7 @@
 href="http://libreplanet.org/wiki/Group:LibrePlanet_Gaming_Collective";>noche
 de juego libre</a>. </p>
 
-<!-- If needed, change the copyright block at the bottom. In general,
-     pages 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. -->
 <div style="font-size: small;">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -149,7 +134,23 @@
 para las traducciones</a> para obtener información sobre la coordinación y
 el envío de traducciones de las páginas de este sitio web.</p>
 
-<p>Copyright &copy; 2012 Free Software Foundation, Inc.</p>
+<!-- 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; 2013 Free Software Foundation, Inc.</p>
 
 <p>Esta página está bajo una <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.es";>licencia
@@ -170,7 +171,7 @@
  <p><!-- timestamp start -->
 Última actualización: 
 
-$Date: 2013/02/28 19:11:48 $
+$Date: 2013/03/13 23:00:29 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/words-to-avoid.es.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.es.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- philosophy/words-to-avoid.es.html   10 Mar 2013 07:18:08 -0000      1.58
+++ philosophy/words-to-avoid.es.html   13 Mar 2013 23:00:30 -0000      1.59
@@ -126,7 +126,7 @@
 
 <p>
 Uno de los muchos significados de «computación en la nube» es el
-almacenamiento de sus datos en servicios online. Eso le expone a <a
+almacenamiento de sus datos en servicios  en línea. Eso le expone a <a
 
href="http://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream";>vigilancia</a>.
 </p>
 
@@ -142,6 +142,20 @@
 o virtual. Estos pueden ser aceptables bajo ciertas circumstancias.
 </p>
 
+<p>
+En su definición de «computación en la nube», el <abbr title="National
+Institute of Standards and Technology">NIST</abbr> (Instituto Nacional de
+Estándares y Tecnología) menciona tres situaciones que presentan cuestiones
+éticas diferentes: software como servicio, plataforma como servicio e
+infraestructura como servicio. Sin embargo, la definición no corresponde al
+uso común de la expresión porque no incluye el almacenamiento de datos en
+los servicios en línea.
+</p>
+
+<p>
+La mejor manera de evitar esta confusión es no usar la expresión.
+</p>
+
 <h4 id="Commercial">«Comercial»</h4>
 <p>
 No utilice el término «comercial» como sinónimo de «no es libre», ya que
@@ -791,7 +805,7 @@
  <p><!-- timestamp start -->
 Última actualización: 
 
-$Date: 2013/03/10 07:18:08 $
+$Date: 2013/03/13 23:00:30 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/can-you-trust.es-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/can-you-trust.es-en.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- philosophy/po/can-you-trust.es-en.html      28 Feb 2013 19:12:23 -0000      
1.18
+++ philosophy/po/can-you-trust.es-en.html      13 Mar 2013 23:00:35 -0000      
1.19
@@ -1,17 +1,11 @@
 <!--#include virtual="/server/header.html" -->
-<title>Can You Trust Your Computer? - GNU Project - Free Software Foundation 
(FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>Can You Trust Your Computer?
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/can-you-trust.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Can You Trust Your Computer?</h2>
 
-<!-- This document uses XHTML 1.0 Strict, but may be served as -->
-<!-- text/html.  Please ensure that markup style considers -->
-<!-- appendex C of the XHTML 1.0 standard. See validator.w3.org. -->
-
-<!-- Please ensure links are consistent with Apache's MultiView. -->
-<!-- Change include statements to be consistent with the relevant -->
-<!-- language, where necessary. -->
-
 <p>by <a href="http://www.stallman.org/";>Richard Stallman</a></p>
 
 <p>
@@ -237,51 +231,47 @@
 Software, Free Society: The Selected Essays of Richard
 M. Stallman</cite></a></h4>
 
-
-<!-- If needed, change the copyright block at the bottom. In general, -->
-<!-- all pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. --> 
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- 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="footer">
 
-<p>
-Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-There are also <a href="/contact/">other ways to contact</a> 
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p>
+<p>Please send general FSF &amp; GNU inquiries to <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also <a
+href="/contact/">other ways to contact</a> the FSF.  Broken links and other
+corrections or suggestions can be sent to <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations README</a> for
+information on coordinating and submitting translations of this article.</p>
 
-<p>
-Please see the 
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p>Copyright &copy; 2002, 2007 Richard Stallman</p>
 
-<p>
-Copyright &copy; 2002, 2007 Richard Stallman
-</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>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 19:12:23 $
+$Date: 2013/03/13 23:00:35 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: philosophy/po/government-free-software.es-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/government-free-software.es-en.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- philosophy/po/government-free-software.es-en.html   10 Mar 2013 15:13:13 
-0000      1.28
+++ philosophy/po/government-free-software.es-en.html   13 Mar 2013 23:00:38 
-0000      1.29
@@ -15,7 +15,11 @@
 
 <p>The mission of the state is to organize society for the freedom and
 well-being of the people.  One aspect of this mission, in the
-computing field, is to encourage users to adopt free software.</p>
+computing field, is to encourage users to adopt free software:
+<a href="/philosophy/free-sw.html">software that respects the users'
+freedom</a>.  A proprietary (non-free) program tramples the freedom of
+those that use it; it is a social problem that the state should work
+to eradicate.</p>
 
 <p>The state needs to insist on free software in its own computing for
 the sake of its computational sovereignty (the state's control over
@@ -208,7 +212,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/03/10 15:13:13 $
+$Date: 2013/03/13 23:00:38 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/nonfree-games.es-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/nonfree-games.es-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/po/nonfree-games.es-en.html      28 Feb 2013 19:12:48 -0000      
1.7
+++ philosophy/po/nonfree-games.es-en.html      13 Mar 2013 23:00:48 -0000      
1.8
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.68 -->
+<!-- Parent-Version: 1.75 -->
 <title>Nonfree DRM'd Games on GNU/Linux: Good or Bad?
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/nonfree-games.translist" -->
@@ -77,24 +77,6 @@
 Collective's <a 
href="http://libreplanet.org/wiki/Group:LibrePlanet_Gaming_Collective";>
 free gaming night.</a> </p>
 
-<!-- If needed, change the copyright block at the bottom. In general,
-     pages 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. -->
-
-
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -123,7 +105,24 @@
 README</a> for information on coordinating and submitting translations
 of this article.</p>
 
-<p>Copyright &copy; 2012 Free Software Foundation, Inc.</p>
+<!-- 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; 2013 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
@@ -133,7 +132,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 19:12:48 $
+$Date: 2013/03/13 23:00:48 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/words-to-avoid.es-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.es-en.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/po/words-to-avoid.es-en.html     10 Mar 2013 07:19:07 -0000      
1.24
+++ philosophy/po/words-to-avoid.es-en.html     13 Mar 2013 23:00:49 -0000      
1.25
@@ -177,6 +177,19 @@
 These can be ok under certain circumstances.
 </p>
 
+<p>
+The <a href="http://csrc.nist.gov/publications/nistpubs/800-145/SP800-145.pdf";>
+NIST definition of "cloud computing"</a> mentions three scenarios that
+raise different ethical issues: Software as a Service, Platform as a
+Service, and Infrastructure as a Service.  However, that definition
+does not match the common use of the term, since it does not include
+storing data in online services.
+</p>
+
+<p>
+The best way to avoid this confusion is not to use the term.
+</p>
+
 <h4 id="Commercial">&ldquo;Commercial&rdquo;</h4>
 <p>
 Please don't use &ldquo;commercial&rdquo; as a synonym for
@@ -800,7 +813,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/03/10 07:19:07 $
+$Date: 2013/03/13 23:00:49 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

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