www/gnu gnu-linux-faq.html

[Rafael Fontenelle]

CVSROOT:        /web/www
Module name:    www
Changes by:     Rafael Fontenelle <rafaelff1>   18/01/24 07:00:35

Modified files:
        gnu            : gnu-linux-faq.html 

Log message:
        Fix typo.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.html?cvsroot=www&r1=1.152&r2=1.153

Patches:
Index: gnu-linux-faq.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.html,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -b -r1.152 -r1.153
--- gnu-linux-faq.html  24 Jan 2018 08:32:13 -0000      1.152
+++ gnu-linux-faq.html  24 Jan 2018 12:00:35 -0000      1.153
@@ -44,7 +44,7 @@
     any name that individual chooses?</a></li>
 
 <li><a href="#everyoneknows">Since everyone
-    knows the role of GNU in developing the system, doesn't the
+    knows GNU's role in developing the system, doesn't the
     &ldquo;GNU/&rdquo; in the name go without saying?</a></li>
 
 <li><a href="#everyoneknows2">Since I know the role of
@@ -167,7 +167,11 @@
 <li><a href="#wait">Why did you wait so long before
     asking people to use the name GNU/Linux?</a></li>
 
-<li><a href="#allgpled">Should the GNU/<i>name<i> convention
+<<<<<<< gnu-linux-faq.html
+<li><a href="#allgpled">Should the GNU/<i>name</i> convention
+=======
+<li><a href="#allgpled">Should the GNU/<i>name</i> convention
+>>>>>>> 1.152
     be applied to all programs that are GPL'ed?</a></li>
 
 <li><a href="#unix">Since much of GNU comes from Unix,
@@ -1558,7 +1562,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/01/24 08:32:13 $
+$Date: 2018/01/24 12:00:35 $
 <!-- timestamp end -->
 </p>
 </div>