www/philosophy ICT-for-prosperity.fr.html bsd.c...

[Yavor Doganov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   10/04/09 08:26:30

Modified files:
        philosophy     : ICT-for-prosperity.fr.html bsd.ca.html 
                         bsd.fr.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/ICT-for-prosperity.fr.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/bsd.ca.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/bsd.fr.html?cvsroot=www&r1=1.25&r2=1.26

Patches:
Index: ICT-for-prosperity.fr.html
===================================================================
RCS file: /web/www/www/philosophy/ICT-for-prosperity.fr.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ICT-for-prosperity.fr.html  2 Aug 2009 20:29:33 -0000       1.12
+++ ICT-for-prosperity.fr.html  9 Apr 2010 08:26:23 -0000       1.13
@@ -26,13 +26,10 @@
 </p>
 
 <p>
-Le titre de cette pr&eacute;sentation est &laquo;&nbsp;Fa&ccedil;onner le
-d&eacute;veloppement collaboratif des <abbr title="Technologies de
-l'information et des communications">TIC</abbr> et les initiatives pour une
-prosp&eacute;rit&eacute; globale&raquo; et les th&egrave;mes de  cette
-conf&eacute;rence sont &laquo;acc&eacute;der&nbsp;&raquo;,
-&laquo;&nbsp;donner du pouvoir&nbsp;&raquo; et
-&laquo;&nbsp;gouverner&nbsp;&raquo;.
+The title of this presentation is &lsquo;Shaping Collaborative
+<abbr>ICT</abbr> Development and Initiatives for Global Prosperity&rsquo;
+and the themes of this conference are &lsquo;access&rsquo;,
+&lsquo;empowerment&rsquo; and &lsquo;governance&rsquo;.
 </p>
 <p>
 Ce que nous nous proposons de faire aujourd'hui, c'est de prendre une
@@ -620,9 +617,8 @@
 On m'a demand&eacute; de parler sur&nbsp;:
 </p>
 <p>
-&laquo;&nbsp;Fa&ccedil;onner le d&eacute;veloppement collaboratif des
-technologies de l'information et des communications et les initiatives pour
-une prosp&eacute;rit&eacute; globale&nbsp;&raquo;
+&lsquo;Shaping Collaborative <abbr>ICT</abbr> Development and Initiatives
+for Global Prosperity&rsquo;
 </p>
 <p>
 Ces 16 derni&egrave;res ann&eacute;es, je les ai pass&eacute; &agrave;
@@ -709,7 +705,8 @@
 </p>
 
 <p>
-Copyright &copy; 1996, 1997, 1998, 2007 Free Software Foundation, Inc.,</p>
+Copyright &copy; 1996, 1997, 1998, 2007, 2008, 2010 Free Software
+Foundation, Inc.,</p>
 <address>51 Franklin St, Fifth Floor, Boston, MA 02110, USA</address>
 <p>La reproduction exacte et la distribution intégrale de cet article est
 permise sur n'importe quel support d'archivage, pourvu que cette notice soit
@@ -726,7 +723,7 @@
 <!-- timestamp start -->
 Dernière mise à jour&nbsp;:
 
-$Date: 2009/08/02 20:29:33 $
+$Date: 2010/04/09 08:26:23 $
 
 <!-- timestamp end -->
 </p>

Index: bsd.ca.html
===================================================================
RCS file: /web/www/www/philosophy/bsd.ca.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- bsd.ca.html 2 Aug 2009 20:29:34 -0000       1.7
+++ bsd.ca.html 9 Apr 2010 08:26:23 -0000       1.8
@@ -33,9 +33,9 @@
 software licenses</a>, such as the Expat license, FreeBSD license, X10
 license, the X11 license, and the two BSD (Berkeley Software Distribution)
 licenses.  Most of them are equivalent except for details of wording, but
-the license used for BSD until 1999 had a special problem: the <q>obnoxious
-BSD advertising clause.</q> It said that every advertisement mentioning the
-software must include a particular sentence:</p>
+the license used for BSD until 1999 had a special problem: the
+&ldquo;obnoxious BSD advertising clause&rdquo;. It said that every
+advertisement mentioning the software must include a particular sentence:</p>
 
 <pre>
 3. All advertising materials mentioning features or use of this software
@@ -194,7 +194,7 @@
 <!-- timestamp start -->
 Updated:
 
-$Date: 2009/08/02 20:29:34 $
+$Date: 2010/04/09 08:26:23 $
 
 <!-- timestamp end -->
 </p>

Index: bsd.fr.html
===================================================================
RCS file: /web/www/www/philosophy/bsd.fr.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- bsd.fr.html 2 Aug 2009 20:29:34 -0000       1.25
+++ bsd.fr.html 9 Apr 2010 08:26:23 -0000       1.26
@@ -30,18 +30,14 @@
 communaut&eacute; du logiciel libre.
 </p>
 
-<p>Il y a diff&eacute;rentes <a
-href="/licenses/license-list.fr.html#GPLCompatibleLicenses">licences libres
-non copyleft&eacute;es</a>, dont les licences Expat, FreeBSD, X10, X11, la
-licence FreeBSD et les deux licences BSD (Berkeley System Distribution). La
-plupart de ces licences non copyleft&eacute;es sont &eacute;quivalentes
-&agrave; part sur des d&eacute;tails de formulation, mais la licence
-utilis&eacute;e par BSD jusqu' en 1999 avait un probl&egrave;me
-sp&eacute;cial&nbsp;: &laquo;&nbsp;l'odieuse clause de publicit&eacute;
-BSD&nbsp;&raquo;, qui conduisait &agrave; une sorte d'embouteillage pour
-promouvoir le logiciel libre. La clause demandait que chaque
-publicit&eacute; mentionnant le logiciel devait inclure une citation
-particuli&egrave;re&nbsp;:</p>
+<p>There are many variants of simple <a
+href="/licenses/license-list.html#GPLCompatibleLicenses">non-copyleft free
+software licenses</a>, such as the Expat license, FreeBSD license, X10
+license, the X11 license, and the two BSD (Berkeley Software Distribution)
+licenses.  Most of them are equivalent except for details of wording, but
+the license used for BSD until 1999 had a special problem: the
+&ldquo;obnoxious BSD advertising clause&rdquo;. It said that every
+advertisement mentioning the software must include a particular sentence:</p>
 
 <pre>
 3. All advertising materials mentioning features or use of this software
@@ -209,7 +205,7 @@
 <!-- timestamp start -->
 Dernière mise à jour&nbsp;:
 
-$Date: 2009/08/02 20:29:34 $
+$Date: 2010/04/09 08:26:23 $
 
 <!-- timestamp end -->
 </p>