Bug 6977 - 404 for autogenerated database documentation in docs/database.txt ; The...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e537820..5beb3a5 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -84,6 +84,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 7636) Fix typo in Firefox 2 check (tested by Werdna)
 * (bug 7663) Include language variant switcher links on Nostalgia skin
 * (bug 6531) Fix PHP fatal error on installation page with bad username input.
+* (bug 6977) Remove 404 link for autogenerated database documentation.
 
 
 == Languages updated ==

diff --git a/docs/database.txt b/docs/database.txt
index 679492a..25dce8b 100644 (file)
--- a/docs/database.txt
+++ b/docs/database.txt
@@ -2,13 +2,18 @@ Some information about database access in MediaWiki.
 By Tim Starling, January 2006.
 
 ------------------------------------------------------------------------
-    API
+    Database layout
 ------------------------------------------------------------------------
 
-For a database API reference, please see the auto-generated
-documentation:
+For information about the MediaWiki database layout, such as a 
+description of the tables and their contents, please see:
+  http://meta.wikimedia.org/wiki/Help:Database_layout
+  http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/maintenance/tables.sql?view=markup
+
 
-http://wikipedia.sourceforge.net/doc/MediaWiki/Database.html
+------------------------------------------------------------------------
+    API
+------------------------------------------------------------------------
 
 To make a read query, something like this usually suffices: