www/people speakers.html

[Richard M. Stallman]

CVSROOT:        /web/www
Module name:    www
Changes by:     Richard M. Stallman <rms>       22/12/21 09:21:17

Modified files:
        people         : speakers.html 

Log message:
        Update Vero Bonnet's entry.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/people/speakers.html?cvsroot=www&r1=1.138&r2=1.139

Patches:
Index: speakers.html
===================================================================
RCS file: /web/www/www/people/speakers.html,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- speakers.html       20 Oct 2022 10:06:39 -0000      1.138
+++ speakers.html       21 Dec 2022 14:21:14 -0000      1.139
@@ -33,7 +33,7 @@
 <li><a href="#Bonnet">V&eacute;ronique Bonnet</a></li>
 <li><a href="#Dachary">Lo&#239;c Dachary</a></li>
 <li><a href="#GNagarjuna">Nagarjuna G.</a></li>
-<li><a href="#Galli">Richardo Galli</a></li>
+<li><a href="#Galli">Ricardo Galli</a></li>
 <li><a href="#Gay">Joshua Gay</a></li>
 <li><a href="#Greve">Georg C. F. Greve</a></li>
 <li><a href="#Heath">Dr. Peter Heath</a></li>
@@ -48,11 +48,11 @@
 </ul>
 
 <h3><a id="Bonnet">V&eacute;ronique Bonnet</a> <a 
-href="mailto:vbonnet@april.org";>&lt;vbonnet@april.org&gt;</a></h3>
+href="mailto:veronique@gnu.org";>&lt;veronique@gnu.org&gt;</a></h3>
 <dl><dt><strong>Biography</strong></dt><dd>
 <p>
-V&eacute;ronique Bonnet teaches philosophy. She is vice-president of <a
-href="http://april.org";>April</a>.
+V&eacute;ronique Bonnet teaches philosophy. She was president of April
+from 2020 to 2022</a>.
 </p>
 </dd><dt><strong>Topics</strong></dt><dd>
 <p>
@@ -65,7 +65,6 @@
 <li>Threats to free software: DRM, software patents, bundled
 sales/racketware, etc.</li>
 <li>A philosophical lecture about the ethics of free software</li>
-<li>Presentation, role and future of April</li>
 <li>Presentation of GNU philosophy</li>
 </ul>
 </dd><dt><strong>Languages</strong></dt><dd>
@@ -428,6 +427,11 @@
   </dd>
 </dl>
 
+<<<<<<< speakers.html
+
+
+=======
+>>>>>>> 1.138
 <h3><a id="Oliva"
 href="http://www.fsfla.org/~lxoliva/";>Alexandre Oliva</a> <a
 href="mailto:lxoliva@fsfla.org";>&lt;lxoliva@fsfla.org&gt;</a></h3>
@@ -465,6 +469,14 @@
 <dl><dt><strong>Biography</strong></dt><dd>
 
 <p>
+<<<<<<< speakers.html
+<a href="http://www.stallman.org/";>Richard Stallman</a> is the founder
+of the <a href="http://www.gnu.org/gnu/thegnuproject.html";>GNU
+Project</a>, launched in 1984 to develop
+the <a href="http://www.gnu.org/philosophy/free-sw.html";>free</a>
+operating system, GNU.  He is also president of
+the <a href="http://www.fsf.org/";>Free Software Foundation</a>.
+=======
 Javier Sepúlveda is the founder and executive director of <a
 href="https://valenciatech.com";>VALENCIATECH</a>, which runs GNU/Linux
 servers using free software exclusively. He was a professor of
@@ -484,6 +496,7 @@
 </dd><dt><strong>Languages</strong></dt><dd>
 <p>
 Javier can give speeches in Spanish and English.
+>>>>>>> 1.138
 </p>
 </dd></dl>
 
@@ -492,6 +505,11 @@
 
 <dl><dt><strong>Biography</strong></dt><dd>
 <p>
+<<<<<<< speakers.html
+Richard Stallman is the principal author of the <a 
href="http://www.gnu.org/software/gcc/gcc.html";>GNU C Compiler</a>, the <a 
href="http://www.gnu.org/software/gdb/gdb.html";>GNU symbolic debugger
+(GDB)</a>, <a href="http://www.gnu.org/software/emacs/emacs.html";>GNU
+Emacs</a>, and various other GNU programs.
+=======
 <a href="http://www.stallman.org/";>Richard Stallman</a> is the founder 
 of the <a href="/gnu/thegnuproject.html">GNU Project</a>, 
 launched in 1984 to develop the <a 
@@ -509,6 +527,7 @@
 href="/software/gdb/gdb.html">GNU symbolic debugger
 (GDB)</a>, <a href="/software/emacs/emacs.html">GNU
 Emacs</a>, and various other GNU programs.  
+>>>>>>> 1.138
 </p>
 
 </dd><dt><strong>Topics</strong></dt><dd>
@@ -542,8 +561,13 @@
 Software Movement.
 </p>
 </dd><dt><strong>Languages</strong></dt><dd><p>Dr. Stallman speaks
+<<<<<<< speakers.html
+English, French and Spanish fluently, and can deliver
+speeches in any of these languages.</p></dd></dl>
+=======
 English, French, and Spanish fluently, and can deliver speeches in 
 any of those languages.</p></dd></dl>
+>>>>>>> 1.138
 
 <h3><a id="Sullivan">John Sullivan</a> 
 <a href="mailto:johns@gnu.org";>&lt;johns@gnu.org&gt;</a></h3>
@@ -692,7 +716,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2022/10/20 10:06:39 $
+$Date: 2022/12/21 14:21:14 $
 <!-- timestamp end -->
 </p>
 </div>