Merge branch 'master' of git://git.savannah.nongnu.org/freedoom

README

@@ -10,7 +10,7 @@ in order to play Doom. Freedoom aims to create a Free alternative.
 Combined with the GPL-licensed Doom source code this will result in a
 complete Free Doom-based game.
 
-For more information, see http://freedoom.sourceforge.net/
+For more information, see http://www.nongnu.org/freedoom/.
 
 == What "Free Software" means
 

graphics/titlepic/create_caption

@@ -9,7 +9,7 @@ convert -fill white -font Helvetica-Bold                               \
       -draw "text 0,30 $1"                                             \
   -pointsize 11                                                        \
     -gravity southwest                                                 \
-      -draw "text 5,5 'http://freedoom.sourceforge.net/'"              \
+      -draw "text 5,5 'http://www.nongnu.org/freedoom/'"              \
     -gravity southeast                                                 \
       -draw "text 10,25 'Version: $VERSION'"                           \
       -draw "text 10,5 '$DATE'"                                        \

levels/sargebaldy/hellkeep.txt

@@ -10,7 +10,7 @@ Author                  : Owen "Sarge Baldy" Lloyd
 Email Address           : lloydo@onid.orst.edu
 Other Files By Author   : Waster Treatment Center #911, MooDDoom
 Misc. Author Info       : Student at Oregon State with no life.
-Description             : An E3M1 replacement for Freedoom (http://freedoom.sourceforge.net/)
.
+Description             : An E3M1 replacement for Freedoom (http://www.nongnu.org/freedoom/).
                           Tries to stay somewhat like the original. This map can be played with or 
                           without 
 Freedoom resources.                          
@@ -57,4 +57,4 @@ intact.
 
 * Where to get the file that this text file describes *
 The Usual: ftp://archives.3dgamers.com/pub/idgames/ and mirrors
-Web: http://freedoom.sourceforge.net/
+Web: http://www.nongnu.org/freedoom/