www/philosophy categories.html

[Pavel Kharitonov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       17/05/08 08:03:59

Modified files:
        philosophy     : categories.html 

Log message:
        Update internal URLs; remove unneeded space.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.html?cvsroot=www&r1=1.94&r2=1.95

Patches:
Index: categories.html
===================================================================
RCS file: /web/www/www/philosophy/categories.html,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- categories.html     18 Nov 2016 06:31:39 -0000      1.94
+++ categories.html     8 May 2017 12:03:59 -0000       1.95
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.83 -->
 <title>Categories of Free and Nonfree Software
 - GNU Project - Free Software Foundation</title>
 <style type="text/css" media="screen">
@@ -92,8 +92,8 @@
        accepted. However, the differences in extension of the
        category are small: nearly all free software is open source,
        and nearly all open source software is free.</p>
-       <p>We prefer the term &ldquo;<a href=
-       "/philosophy/open-source-misses-the-point.html">free
+       <p>We prefer the term &ldquo;<a
+        href="/philosophy/open-source-misses-the-point.html">free
        software</a>&rdquo; because it refers to
        freedom&mdash;something that the term &ldquo;open
        source&ldquo; does not do.</p>
@@ -145,12 +145,12 @@
 
         <p>Some copyleft licenses, such as GPL version&nbsp;3, block
        other means of turning software proprietary, such as <a
-    href="http://www.gnu.org/licenses/rms-why-gplv3.html";>tivoization</a>.</p> 
+    href="/licenses/rms-why-gplv3.html">tivoization</a>.</p> 
 
        <p>In the GNU Project, we copyleft almost all the software we
        write, because our goal is to give <em>every</em> user the freedoms
-       implied by the term &ldquo;free software.&rdquo; See our <a href=
-       "/copyleft/copyleft.html">copyleft article</a> for more explanation of
+       implied by the term &ldquo;free software.&rdquo; See our <a
+        href="/licenses/copyleft.html">copyleft article</a> for more 
explanation of
        how copyleft works and why we use it.</p>
 
        <p>Copyleft is a general concept; to copyleft an actual program,
@@ -158,7 +158,7 @@
        many possible ways to write copyleft distribution terms, so in
        principle there can be many copyleft free software licenses.
        However, in actual practice nearly all copylefted software uses the
-       <a href="/copyleft/gpl.html">GNU General Public
+       <a href="/licenses/gpl.html">GNU General Public
        License</a>. Two different copyleft licenses are usually
        &ldquo;incompatible&rdquo;, which means it is illegal to merge
        the code using one license with the code using the other
@@ -196,13 +196,13 @@
 <h3 id="LaxPermissiveLicensedSoftware">Lax permissive licensed software</h3>
 
        <p>Lax permissive licenses include the X11 license and the
-       <a href="bsd.html">two BSD licenses</a>.  These licenses permit
+       <a href="/licenses/bsd.html">two BSD licenses</a>.  These licenses 
permit
        almost any use of the code, including distributing proprietary
        binaries with or without changing the source code.</p>
 
 <h3 id="GPL-CoveredSoftware">GPL-covered software</h3>
 
-       <p>The <a href="/copyleft/gpl.html">GNU GPL (General Public
+       <p>The <a href="/licenses/gpl.html">GNU GPL (General Public
        License)</a> is one specific set of distribution terms for
        copylefting a program. The GNU Project uses it as the distribution
        terms for most GNU software.</p>
@@ -258,7 +258,7 @@
        Directory</a> identifies all GNU packages.</p>
 
        <p>Most GNU software is <a href=
-       "/copyleft/copyleft.html">copylefted</a>, but not all; however,
+       "/licenses/copyleft.html">copylefted</a>, but not all; however,
        all GNU software must be <a href="/philosophy/free-sw.html">free
        software</a>.</p>
 
@@ -297,7 +297,7 @@
        <p>Proprietary software is another name for nonfree software.
        In the past we subdivided nonfree software into
        &ldquo;semifree software&rdquo;, which could be modified and
-       redistributed noncommercially, and &ldquo; proprietary
+       redistributed noncommercially, and &ldquo;proprietary
        software&rdquo;, which could not be.  But we have dropped that
        distinction and now use &ldquo;proprietary software&rdquo; as
        synonymous with nonfree software.</p>
@@ -447,7 +447,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/11/18 06:31:39 $
+$Date: 2017/05/08 12:03:59 $
 <!-- timestamp end -->
 </p>
 </div>