diff --git a/Tools/AGSHtml.m b/Tools/AGSHtml.m
index ceec75918..a3fd4dd60 100644
--- a/Tools/AGSHtml.m
+++ b/Tools/AGSHtml.m
@@ -758,7 +758,11 @@ static NSMutableSet	*textNodes = nil;
 	  NSString	*type = [prop objectForKey: @"type"];
 	  NSDictionary	*dict = [localRefs refs];
 
-	  if (projectRefs != nil && [scope isEqual: @"project"] == YES)
+	  if (globalRefs != nil && [scope isEqual: @"global"] == YES)
+	    {
+	      dict = [globalRefs refs];
+	    }
+	  else if (projectRefs != nil && [scope isEqual: @"project"] == YES)
 	    {
 	      dict = [projectRefs refs];
 	    }
diff --git a/Tools/gsdoc-0_6_7.dtd b/Tools/gsdoc-0_6_7.dtd
index b4b758bca..772a849a9 100644
--- a/Tools/gsdoc-0_6_7.dtd
+++ b/Tools/gsdoc-0_6_7.dtd
@@ -487,8 +487,11 @@
 
 <!-- Index  ... generates an index of the specified type of elements.
   'scope' determines whether the index is generated for the current file
-  or for the whole of the current project ... if the document is
-  processed in a standalone manner, the scope if always project.
+  or for the whole of the current project, or for everything the software
+  can find (global) ... if the document is processed in a standalone manner,
+  the scope if always file.  For method or ivariable indexing, if the index
+  is inside a class, protocol, or category, only  indexes for that unit
+  should be generated.
   'type' determines the type of entry listed in the index.  The 'title'
   type really only makes sense for a project scope index as it produces
   a list of the files in the project (by title).
@@ -496,7 +499,7 @@
 <!ELEMENT index EMPTY>
 <!ATTLIST index
   type (class | protocol | method | ivariable | function | type | macro | variable | constant | label | title) "label"
-  scope (file | project) "file"
+  scope (file | project | global) "file"
 >