Some more changes, additions.

git-svn-id: svn://svn.icculus.org/quake3/trunk@641 edf5b092-35ff-0310-97b2-ce42778d08ea

4 files changed, 25 insertions, 9 deletions

diff --git a/web/include/discuss.php b/web/include/discuss.php
index c0c85ae..15381ea 100644
--- a/web/include/discuss.php
+++ b/web/include/discuss.php
@@ -36,5 +36,17 @@ e-mail addresses to <tt>quake3-commits</tt>.</p>
 <h2 title="Internet Relay Chat">IRC</h2>
 <p>To join the <acronym title="Internet Relay Chat">IRC</acronym> channel, aim
 your client at <tt>#icculus.org/quake3</tt> on <tt>irc.freenode.net</tt>
+Please make sure you've read the <a href="?page=help">Help</a> page before
+you start wasting your time bugging people!
 </p>
 
+<h2>Will you guys remove the CD-key check?</h2>
+<p>
+This is literally the only frequenty asked question we get, and it's starting to
+wear on us. <strong>No,</strong> we will not be removing the CD-key check. The
+Quake III: Arena data is <em>not</em> free, and you <strong>must</strong> purchase
+a CD to play it! Don't let this confuse you, the engine is open source, and is absolutely
+100% free. If someone makes a new game based on the source code that does not use
+the pay-for game data, they of course don't need to and should not require a CD
+key in their game.
+</p>
diff --git a/web/include/downloads.php b/web/include/downloads.php
index fc34a04..016772a 100644
--- a/web/include/downloads.php
+++ b/web/include/downloads.php
@@ -4,13 +4,13 @@ $downloads = array(
  				<p>Provides latest patch <tt>pk3</tt> data from
  				id. You need to copy your <tt>pak0.pk3</tt> from the CD-ROM
  				when the installation process is completed.</p>
- 				<p><a href="http://www.timedoctor.org/~zakk/ioquake3_setup.exe">
+ 				<p><a href="http://icculus.org/~zakk/ioquake3_setup.exe">
  				Download for Windows x86</a>, 26MB.</p><p><em> Thanks to
  				<a href="mailto:phatfil@optusnet.com.au">Philip Nelson</a>.</em></p>',
  				
  "linux"		=>	'<h3 class="linux">Linux (x86, x86_64, PowerPC)</h3>
 				<p>Does not provide latest patch <tt>pk3</tt> data. You must
-				<a href="?page=getadata">download it seperately</a>. When the
+				<a href="?page=getdata">download it seperately</a>. When the
 				installation is complete, you need to copy your <tt>pak0.pk3</tt>
 				from the CD-ROM. Execute the <tt>.run</tt> file as root with
 				something like <tt>sh <em>ioquake3-version_etc.run</em></tt></p>
@@ -21,10 +21,10 @@ $downloads = array(
 				<p><a href="http://icculus.org/~zakk/q3run/ioquake3-1.33_SVN629-0.1.ippc.run">
 				Download for PowerPC</a>, 2.7MB.</p>
 				<p>( Built from Subversion revision 629. )<br />
-				<em>Thanks to <a href="http://angst.cynapses.org/">Lugwig
+				<em>Thanks to <a href="http://angst.cynapses.org/">Ludwig
 				Nussel</a>.</em></p>',
 
- "mac"		=>	'<h3 class="apple">Mac OS X (Intel &amp; Power)</h3>
+ "mac"		=>	'<h3 class="apple">Mac OS X (Intel, PowerPC)</h3>
 				<p>Coming soon.</p>'
 );
 ?>
diff --git a/web/include/get.php b/web/include/get.php
index 3165286..79bc32d 100644
--- a/web/include/get.php
+++ b/web/include/get.php
@@ -3,7 +3,7 @@
 mean that Quake 3 Arena the game is free. You must purchase the game to use the data!</p>
 <h2>Get icculus.org/quake3</h2>
 <p>There are three methods of installation. The preffered way is to use an official
-isntaller.</p>
+installer.</p>
 <ul>
 	<li><a href="?page=get&amp;method=official">Offical Installers</a></li>
 	<li><a href="?page=get&amp;method=unofficial">Unofficial installers and packages</a></li>
@@ -32,8 +32,8 @@ guilty.</p>
 <ul>
 	<li>
 		<h3>Debian &amp; Ubuntu</h3>
-		<p>Firstly, we have packages for the i386 and amd64 versions of
-		Ubuntu and Debian Linux, thanks	to <a href="http://wwwcip.informatik.uni-erlangen.de/~sibrklei/">
+		<p>There are packages for the i386 and amd64 versions of
+		Ubuntu and Debian Linux, thanks to <a href="http://wwwcip.informatik.uni-erlangen.de/~sibrklei/">
 		Bruno "Fuddl" Kleinert</a>.</p>
 			<ul>
 				<li><a href="http://wwwcip.informatik.uni-erlangen.de/~sibrklei/debian/unstable/">
diff --git a/web/include/help.php b/web/include/help.php
index 83ae456..ede8e20 100644
--- a/web/include/help.php
+++ b/web/include/help.php
@@ -1,5 +1,6 @@
 <h2>Something isn't working right. Heeeeeeeelp!</h2>
-<p>You have four choices for help: documentation, the mailing list, the IRC channel,
+<p>You have four choices for help: documentation, You can try asking on th
+<a href="?page=discuss"> the mailing list, the IRC channel,</a>
 and Bugzilla. There is some great documentation for Linux users at the
 <a href="http://www.icculus.org/lgfaq/">Linux Gamers' FAQ</a>, and also at
 id's <a href="http://zerowing.idsoftware.com/linux/q3a/">original page</a> (though you
@@ -7,7 +8,10 @@ should no-longer contact them for support). Windows users and Mac users should j
 <a href="http://www.google.com/">Google</a> their errors to check for preexisting solutions.
 You can try asking on the <a href="?page=discuss">mailing list and
 <acronym title="Internet Relay Chat">IRC</acronym> channel.</a>. To file a bug report
-with Bugzilla, check out our <a href="http://bugzilla.icculus.org/">Bugzilla website</a>.</p>
+with Bugzilla, check out our <a href="http://bugzilla.icculus.org/">Bugzilla website</a>.
+Make sure that you check documentation, and read the
+<a href="http://www.icculus.org/lgfaq/">Linux Gamers' FAQ</a> before asking for 
+help! Most questions people have are not unique!</p>
 
 <h2>Pay your dues, contribute!</h2>
 <p>If you've come up with an improvement or fixed something, we'd love to hear about it!