trans-coord/gnun philosophy/free-sw.html philos...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   12/02/27 19:10:20

Modified files:
        gnun/philosophy: free-sw.html philosophy.html 
        gnun/server/gnun: ChangeLog 

Log message:
        Automatic sync from the master www repository.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/free-sw.html?cvsroot=trans-coord&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/philosophy.html?cvsroot=trans-coord&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.252&r2=1.253

Patches:
Index: philosophy/free-sw.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/free-sw.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- philosophy/free-sw.html     21 Feb 2012 19:10:22 -0000      1.36
+++ philosophy/free-sw.html     27 Feb 2012 19:10:19 -0000      1.37
@@ -27,8 +27,8 @@
 
 <p>
 &ldquo;Free software&rdquo; means software that respects users'
-freedom and community.  Roughly, the users have the freedom to run,
-copy, distribute, study, change and improve the software.  With these
+freedom and community.  Roughly, <b>the users have the freedom to run,
+copy, distribute, study, change and improve the software</b>.  With these
 freedoms, the users (both individually and collectively) control the
 program and what it does for them.
 </p>
@@ -465,7 +465,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/02/21 19:10:22 $
+$Date: 2012/02/27 19:10:19 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/philosophy.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/philosophy.html,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- philosophy/philosophy.html  20 Dec 2011 19:10:18 -0000      1.70
+++ philosophy/philosophy.html  27 Feb 2012 19:10:19 -0000      1.71
@@ -12,16 +12,22 @@
 
 </div> <!-- id="education-content" -->
 
-<p>Our development of the GNU free software operating system is motivated
-by the philosophy of the free software movement.  This page provides an
-introduction to that philosophy.</p>
-
-<p>Free software is a matter of freedom: people should be free to use
-software in all the ways that are socially useful.  Software differs
-from material objects&mdash;such as chairs, sandwiches, and
-gasoline&mdash;in that it can be copied and changed much more easily.
-These possibilities make software as useful as it is; we believe
-software users should be able to make use of them.</p>
+<p><em>Free software</em> means that the software's users have
+freedom.  (The issue is not about price.)  We developed the GNU
+operating system so that users can have freedom in their
+computing.</p>
+
+<p>Specifically, free software means users have
+the <a href="/philosophy/free-sw.html">four essential freedoms</a>:
+(0) to run the program, (1) to study and change the program in source
+code form, (2) to redistribute exact copies, and (3) to distribute
+modified versions.</p>
+
+<p>Software differs from material objects&mdash;such as chairs,
+sandwiches, and gasoline&mdash;in that it can be copied and changed
+much more easily.  These facilities are why software is useful; we
+believe a program's users should be free to take advantage of them,
+not solely its developer.</p>
 
 <p>For further reading, please select a section
 from the menu above.</p>
@@ -100,7 +106,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2011/12/20 19:10:18 $
+$Date: 2012/02/27 19:10:19 $
 <!-- timestamp end -->
 </p>
 </div>

Index: server/gnun/ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -b -r1.252 -r1.253
--- server/gnun/ChangeLog       27 Feb 2012 14:42:46 -0000      1.252
+++ server/gnun/ChangeLog       27 Feb 2012 19:10:19 -0000      1.253
@@ -1,3 +1,13 @@
+<<<<<<< ChangeLog
+2012-01-24  Pavel Kharitonov  <address@hidden>
+
+       * GNUMakefile (generate-html, home-rules, template-rules)
+       (extra-template-lang-rules, article-rules): Invoke update-po and
+       substitute-localized-includes in generate-html.  Without
+       update-po, the Outdated-Since field was not updated in the
+       templates, and ADD-FUZZY-DIFF didn't apply to them.
+
+=======
 2012-02-27  Pavel Kharitonov  <address@hidden>
 
        * GNUMakefile (update-po): Fix the previous commit.
@@ -10,6 +20,7 @@
        update-po, the Outdated-Since field was not updated in the
        templates, and ADD-FUZZY-DIFF didn't apply to them.
 
+>>>>>>> 1.252
 2012-02-21  Rafael Beraldo <address@hidden> (tiny change)
 
        * doc/gnun.texi (PO Files): Update URL for vim plugin