www-commits
[Top][All Lists]
Advanced

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

www/philosophy rms-kol.html


From: Pavel Kharitonov
Subject: www/philosophy rms-kol.html
Date: Tue, 18 Jun 2013 04:52:06 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       13/06/18 04:52:06

Modified files:
        philosophy     : rms-kol.html 

Log message:
        Update boilerplate texts to v1.75; s/non-free/nonfree/; add missing "'"
        in "it's".

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/rms-kol.html?cvsroot=www&r1=1.14&r2=1.15

Patches:
Index: rms-kol.html
===================================================================
RCS file: /web/www/www/philosophy/rms-kol.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- rms-kol.html        28 Feb 2013 17:09:43 -0000      1.14
+++ rms-kol.html        18 Jun 2013 04:52:06 -0000      1.15
@@ -1,6 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-
-<title>Richard Stallman's speech in Kolkata (Calcutta), August 2006 - GNU 
Project - Free Software Foundation (FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>Richard Stallman's speech in Kolkata (Calcutta), August 2006
+- GNU Project - Free Software Foundation</title>
 
 <!--#include virtual="/philosophy/po/rms-kol.translist" -->
 <!--#include virtual="/server/banner.html" -->
@@ -29,9 +30,9 @@
 </ul>
 
 <p>With these 4 Freedoms, you can live an upright life with your
-community.  If you use non-free, proprietary software, the developer
+community.  If you use nonfree, proprietary software, the developer
 has the power to decide what you can do. He can use that power over
-you. Like Microsoft. That game is evil. Nobody should play it. So its
+you. Like Microsoft. That game is evil. Nobody should play it. So it's
 not a question of beating Microsoft at its game. I set out to get away
 from that game.</p>
 
@@ -102,7 +103,7 @@
 knowledge, namely software. Through global cooperation like this, you
 get freedom and independence for every region and every country.</p>
 
-<p>Proprietary software is a colonial system. Its electronic
+<p>Proprietary software is a colonial system. It's electronic
 colonialism. And not by a country, but by a corporation. Electronic
 colonial powers keep people divided and helpless. Look at the end-user
 licensing agreement. You don't have the source code, you are
@@ -128,7 +129,7 @@
 schools. Addiction (through using unauthorised software use) only
 helps them. They didn't want to leave anything to choice, so they give
 Windows free to schools. Like injecting a dose. The first dose is
-gratis. Afterwards its not gratis, either for them or their
+gratis. Afterwards it's not gratis, either for them or their
 employers. This is a way to impose their power on the rest of society
 and its future. Schools have a mission to society. This mission
 requires teaching students to live in freedom, teaching skills to make
@@ -136,7 +137,7 @@
 
 <p>Free Software is good for computer science education, to maximise
 the potential of natural programmers. It gives students the
-opportunity to really learn. Its good for the natural programmers. If
+opportunity to really learn. It's good for the natural programmers. If
 you have proprietary software, the teacher says &ldquo;I don't
 know&rdquo;, &ldquo;You are not allowed to know, it's a secret.&rdquo;
 So the alternative is to give him the source codes and let him read it
@@ -150,7 +151,7 @@
 Schools should use 100% Free Software. No proprietary software should
 be used in schools. Public agencies, after a migration period, should
 use Free Software. All software development must run on Free Software
-platforms. And if its released to the public, it must be Free
+platforms. And if it's released to the public, it must be Free
 Software. (Free: as in free speech, not free beer.)</p>
 
 <p>One easy and useful way to put Free Software in schools&mdash;is to
@@ -168,44 +169,65 @@
 businesses! Foreigners should not have political power. In my case, I
 don't.</p>
 
-</div>
-
+</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";><em>address@hidden</em></a>.
+
+<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.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
+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>
-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><!-- 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>
+
+<!-- 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; 2006 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 17:09:43 $
+$Date: 2013/06/18 04:52:06 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>
-



reply via email to

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