tag 129315 patch thanks Given GNU's Categories of Free and Non-Free Software[1], it seems best to replace `commercial' with `non-free' rather than `proprietary', as the latter does not include semi-free software (i.e., software which is free for non-profits). The following patch does so. OK to apply?
Matt 1. http://www.gnu.org/philosophy/categories.html Index: english/intro/about.wml =================================================================== RCS file: /cvs/webwml/webwml/english/intro/about.wml,v retrieving revision 1.46 diff -u -p -r1.46 about.wml --- english/intro/about.wml 2001/12/31 23:14:39 1.46 +++ english/intro/about.wml 2002/01/30 21:13:35 @@ -68,7 +68,7 @@ software, carefully package it, and then The answers are as varied as the people who contribute. Some people like to help others. Many write programs to learn more about computers. -More and more people are looking for ways to avoid the inflated price of commercial +More and more people are looking for ways to avoid the inflated price of software. A growing crowd contribute as a thank you for all the great free software they've received from others. @@ -83,8 +83,8 @@ commitment was formalized in a written d <A href="$(HOME)/social_contract">Social Contract</A> was born. <P>Although Debian believes in free software, there are cases where people want or need to -put commercial software on their machine. Whenever possible Debian will support this. -There are even a growing number of packages whose sole job is to install commercial software +put non-free software on their machine. Whenever possible Debian will support this. +There are even a growing number of packages whose sole job is to install non-free software into a Debian system. <H2><a name="CD">You say free, but the CDs/bandwidth cost money!</a></H2> @@ -138,7 +138,7 @@ the <A href="http://www.linuxdoc.org/HOW Compatibility HOWTO</A>. <P>There are a few companies that make support difficult by not releasing specifications -for their hardware. Even if you have a commercial driver, you can run into +for their hardware. Even if you have a non-free driver, you can run into problems if the company later goes out of business or stops support for the hardware you have. We recommend that you only purchase hardware from manufacturers that provide <A href="free">free</A> drivers for their
pgp8aqi70caoy.pgp
Description: PGP signature
