Merge "resourceloader: Add $context to static functions in ResourceLoader"

[lhc/web/wiklou.git] / docs / globals.txt

diff --git a/docs/globals.txt b/docs/globals.txt
index 5bdb31c..847fbed 100644 (file)
--- a/docs/globals.txt
+++ b/docs/globals.txt
@@ -40,8 +40,6 @@ documentation for the remaining 114 globals, however some of the most important
 ones are listed below. They are typically initialised either in index.php or in
 Setup.php.
 
 ones are listed below. They are typically initialised either in index.php or in
 Setup.php.
 

-For a description of the classes, see design.txt.
-

 $wgTitle
        Title object created from the request URL.
 
 $wgTitle
        Title object created from the request URL.
 


@@ -63,5 +61,5 @@ $wgParser
 $wgRequest
        WebRequest object, to get request data
 
 $wgRequest
        WebRequest object, to get request data
 

-$wgMemc, $messageMemc, $parserMemc
+$wgMemc, $messageMemc

        Object caches
        Object caches