CVSROOT: /web/www
Module name: www
Changes by: Jason Self <jxself> 11/10/15 18:01:41
Modified files:
. : .htaccess
philosophy : philosophy-menu.html philosophy.html
Removed files:
philosophy : about-fs.html
Log message:
Removing the 'About Free Software' section and merging it with the
'Introduction' area per RMS request on RT # 711491
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/.htaccess?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/philosophy-menu.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/philosophy.html?cvsroot=www&r1=1.338&r2=1.339
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/about-fs.html?cvsroot=www&r1=1.2&r2=0
Patches:
Index: .htaccess
===================================================================
RCS file: /web/www/www/.htaccess,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- .htaccess 23 Sep 2011 17:45:14 -0000 1.21
+++ .htaccess 15 Oct 2011 18:00:56 -0000 1.22
@@ -21,3 +21,5 @@
RedirectPermanent /philosophy/schools.ru.html
http://www.gnu.org/education/edu-schools.ru.html
RedirectPermanent /philosophy/schools.ta.html
http://www.gnu.org/education/edu-schools.ta.html
RedirectPermanent /philosophy/schools.uz.html
http://www.gnu.org/education/edu-schools.uz.html
+
+RedirectPermanent /philosophy/about-fs.html http://www.gnu.org/philosophy/
Index: philosophy/philosophy-menu.html
===================================================================
RCS file: /web/www/www/philosophy/philosophy-menu.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/philosophy-menu.html 11 Oct 2011 18:02:50 -0000 1.1
+++ philosophy/philosophy-menu.html 15 Oct 2011 18:01:29 -0000 1.2
@@ -3,7 +3,6 @@
<!-- begin edu navigation bar -->
<ul id="edu-navigation">
<li><a href="/philosophy/philosophy.html">Introduction</a></li>
- <li><a href="/philosophy/about-fs.html">About Free Software</a></li>
<li><a href="http://audio-video.gnu.org/";>Audio and video</a></li>
<li><a href="/philosophy/essays-and-articles.html">Essays and
articles</a></li>
<li><a href="/philosophy/speeches-and-interview.html">Speeches and
interviews</a></li>
Index: philosophy/philosophy.html
===================================================================
RCS file: /web/www/www/philosophy/philosophy.html,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -b -r1.338 -r1.339
--- philosophy/philosophy.html 11 Oct 2011 23:27:28 -0000 1.338
+++ philosophy/philosophy.html 15 Oct 2011 18:01:29 -0000 1.339
@@ -14,7 +14,16 @@
<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. For further reading, please select a section
+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—such as chairs, sandwiches, and
+gasoline—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>For further reading, please select a section
from the menu above.</p>
<p>We also maintain a list of <a href="/philosophy/latest-articles.html">most
recently added articles</a>.</p>
@@ -86,7 +95,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2011/10/11 23:27:28 $
+$Date: 2011/10/15 18:01:29 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/about-fs.html
===================================================================
RCS file: philosophy/about-fs.html
diff -N philosophy/about-fs.html
--- philosophy/about-fs.html 11 Oct 2011 19:13:09 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,165 +0,0 @@
-<!--#include virtual="/server/header.html" -->
-
-<title>Philosophy of the GNU Project - About Free Software - GNU Project -
Free Software Foundation (FSF)</title>
-
-<!--#include virtual="/server/banner.html" -->
-
-<div id="education-content">
-<h2>Philosophy of the GNU Project — About Free Software</h2>
-
-<!--#include virtual="/philosophy/philosophy-menu.html" -->
-
-</div> <!-- id="education-content" -->
-
-<h3 id="aboutfs">About Free Software</h3>
-<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—such as chairs, sandwiches, and
-gasoline—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>
-
-<!-- I don't think it's good idea to link specific translation -->
-<!-- (e.g. foo.fr.html) from here. It would be better to link them -->
-<!-- from philosophy.fr.html and the original documents. -mhatta -->
-
-<ul>
- <li><a href="/philosophy/free-sw.html">What is Free Software?</a></li>
- <li><a href="/philosophy/why-free.html">Why
- Software Should Not Have Owners</a></li>
- <li><a href="/philosophy/pragmatic.html">Copyleft: Pragmatic
Idealism</a></li>
- <li><a href="/philosophy/free-doc.html">Why Free Software Needs
- Free Documentation</a></li>
- <li><a href="/philosophy/selling.html">Selling Free Software</a> is OK!</li>
- <li><a href="/philosophy/fs-motives.html">Motives For Writing Free
Software</a></li>
- <li><a href="/philosophy/right-to-read.html">The Right to Read: A
- Dystopian Short Story</a> by <a href="http://www.stallman.org/";>
- Richard Stallman</a></li>
- <li><a href="/philosophy/open-source-misses-the-point.html">Why
- “Open Source” misses the point of Free Software</a></li>
-</ul>
-
-</div>
-
-<!--#include virtual="/server/footer.html" -->
-
-<div id="footer">
-<p>
-Please send FSF & GNU inquiries to
-<a href="mailto:g...@gnu.org";><g...@gnu.org></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:webmast...@gnu.org";><webmast...@gnu.org></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>
-Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.</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>
-
-<p>
-Updated:
-<!-- timestamp start -->
-$Date: 2011/10/11 19:13:09 $
-<!-- timestamp end -->
-</p>
-</div>
-<!-- All pages on the GNU web server should have the section about -->
-<!-- verbatim copying. Please do NOT remove this without talking -->
-<!-- with the webmasters first. -->
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
-
-<!-- <div id="translations"> -->
-<!-- <h4>Translations of this page</h4> -->
-<!-- -->
-<!-- Please keep this list alphabetical by language code. -->
-<!-- Comment what the language is for each type, i.e. de is German. -->
-<!-- Write the language name in its own language (Deutsch) in the text.
-->
-<!-- If you add a new language here, please -->
-<!-- advise web-translat...@gnu.org and add it to -->
-<!-- - /home/www/html/server/standards/README.translations.html -->
-<!-- - one of the lists under the section "Translations Underway" -->
-<!-- - if there is a translation team, you also have to add an alias -->
-<!-- to mail.gnu.org:/com/mailer/aliases -->
-<!-- Please also check you have the language code right; see: -->
-<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
-<!-- If the 2-letter ISO 639-1 code is not available, -->
-<!-- use the 3-letter ISO 639-2. -->
-<!-- Please use W3C normative character entities. -->
-<!-- -->
-<!-- <ul class="translations-list"> -->
-<!-- Arabic -->
-<!-- <li><a
href="/philosophy/philosophy.ar.html">العربية</a> [ar]</li>
-->
-<!-- Bulgarian -->
-<!-- <li><a
href="/philosophy/philosophy.bg.html">български</a> [bg]</li>
-->
-<!-- Bosnian -->
-<!-- <li><a href="/philosophy/philosophy.bs.html">bosanski</a> [bs]</li>
-->
-<!-- Catalan -->
-<!-- <li><a
href="/philosophy/philosophy.ca.html">català</a> [ca]</li> -->
-<!-- Czech -->
-<!-- <li><a
href="/philosophy/philosophy.cs.html">Česky</a> [cs]</li> -->
-<!-- Danish -->
-<!-- <li><a href="/philosophy/philosophy.da.html">dansk</a> [da]</li> -->
-<!-- German -->
-<!-- <li><a href="/philosophy/philosophy.de.html">Deutsch</a> [de]</li>
-->
-<!-- Greek -->
-<!-- <li><a
href="/philosophy/philosophy.el.html">Ελληνικά</a> [el]</li>
-->
-<!-- English -->
-<!-- <li><a href="/philosophy/philosophy.html">English</a> [en]</li> -->
-<!-- Spanish -->
-<!-- <li><a
href="/philosophy/philosophy.es.html">español</a> [es]</li> -->
-<!-- Finnish -->
-<!-- <li><a href="/philosophy/philosophy.fi.html">suomi</a> [fi]</li> -->
-<!-- French -->
-<!-- <li><a
href="/philosophy/philosophy.fr.html">français</a> [fr]</li> -->
-<!-- Galician -->
-<!-- <li><a href="/philosophy/philosophy.gl.html">galego</a> [gl]</li> -->
-<!-- Hebrew -->
-<!-- <li><a
href="/philosophy/philosophy.he.html">עברית</a> [he]</li>
-->
-<!-- Hungarian -->
-<!-- <li><a href="/philosophy/philosophy.hu.html">magyar</a> [hu]</li> -->
-<!-- Indonesian -->
-<!-- <li><a href="/philosophy/philosophy.id.html">Bahasa
Indonesia</a> [id]</li> -->
-<!-- Italian -->
-<!-- <li><a href="/philosophy/philosophy.it.html">italiano</a> [it]</li>
-->
-<!-- Japanese -->
-<!-- <li><a
href="/philosophy/philosophy.ja.html">日本語</a> [ja]</li>
-->
-<!-- Korean -->
-<!-- <li><a
href="/philosophy/philosophy.ko.html">한국어</a> [ko]</li>
-->
-<!-- Macedonian -->
-<!-- <li><a
href="/philosophy/philosophy.mk.html">македонски</a> [mk]</li>
-->
-<!-- Dutch -->
-<!-- <li><a
href="/philosophy/philosophy.nl.html">Nederlands</a> [nl]</li> -->
-<!-- Polish -->
-<!-- <li><a href="/philosophy/philosophy.pl.html">polski</a> [pl]</li> -->
-<!-- Brazilian Portuguese -->
-<!-- <li><a href="/philosophy/philosophy.pt-br.html">português do
Brasil</a> [pt-br]</li> -->
-<!-- Romanian -->
-<!-- <li><a
href="/philosophy/philosophy.ro.html">română</a> [ro]</li>
-->
-<!-- Russian -->
-<!-- <li><a
href="/philosophy/philosophy.ru.html">русский</a> [ru]</li>
-->
-<!-- Serbian -->
-<!-- <li><a
href="/philosophy/philosophy.sr.html">српски</a> [sr]</li>
-->
-<!-- Chinese (Simplified) -->
-<!-- <li><a
href="/philosophy/philosophy.zh-cn.html">简体中文</a> [zh-cn]</li>
-->
-<!-- Chinese (Traditional) -->
-<!-- <li><a
href="/philosophy/philosophy.zh-tw.html">繁體中文</a> [zh-tw]</li>
-->
-<!-- </ul> -->
-<!-- </div> -->
-</div>
-</body>
-</html>
