Index: core/src/org/netbeans/modules/xml/core/DTDDataObject.java
===================================================================
RCS file: /cvs/xml/core/src/org/netbeans/modules/xml/core/DTDDataObject.java,v
retrieving revision 1.9
diff -u -r1.9 DTDDataObject.java
--- core/src/org/netbeans/modules/xml/core/DTDDataObject.java	12 Mar 2002 14:38:50 -0000	1.9
+++ core/src/org/netbeans/modules/xml/core/DTDDataObject.java	21 Mar 2002 16:29:35 -0000
@@ -205,6 +205,10 @@
     }
     
 
+    public HelpCtx getHelpCtx() {
+        return new HelpCtx(DTDDataObject.class);
+    }
+        
 
     //
     // class DTDDataNode
@@ -222,7 +226,7 @@
             setDefaultAction (SystemAction.get (EditAction.class));
             setIconBase ("org/netbeans/modules/xml/core/resources/dtdObject"); // NOI18N
         }
-        
+
         public HelpCtx getHelpCtx() {
             return new HelpCtx(DTDDataObject.class);
         }
Index: core/src/org/netbeans/modules/xml/core/XMLDataObject.java
===================================================================
RCS file: /cvs/xml/core/src/org/netbeans/modules/xml/core/XMLDataObject.java,v
retrieving revision 1.13
diff -u -r1.13 XMLDataObject.java
--- core/src/org/netbeans/modules/xml/core/XMLDataObject.java	12 Mar 2002 14:38:50 -0000	1.13
+++ core/src/org/netbeans/modules/xml/core/XMLDataObject.java	21 Mar 2002 16:29:35 -0000
@@ -366,6 +366,12 @@
             SystemAction system = SystemAction.get (EditAction.class);
             return settings.getDefaultAction(actions, system);
         }
+
+
+        public HelpCtx getHelpCtx() {
+            return new HelpCtx(XMLDataObject.class);
+        }
+    
     } // end of class XMLDataNode
 
 
Index: core/src/org/netbeans/modules/xml/core/resources/mf-layer.xml
===================================================================
RCS file: /cvs/xml/core/src/org/netbeans/modules/xml/core/resources/mf-layer.xml,v
retrieving revision 1.14
diff -u -r1.14 mf-layer.xml
--- core/src/org/netbeans/modules/xml/core/resources/mf-layer.xml	12 Mar 2002 14:38:52 -0000	1.14
+++ core/src/org/netbeans/modules/xml/core/resources/mf-layer.xml	21 Mar 2002 16:29:36 -0000
@@ -127,6 +127,8 @@
             <folder name="Editing">
                 <folder name="XML">
                     <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.core.resources.Bundle"/>
+                    <attr name="helpID" stringvalue="org.netbeans.modules.xml.core.settings"/>
+
                     <file name="org-netbeans-modules-xml-core-settings-CoreSettings.shadow">
 <![CDATA[Services/org-netbeans-modules-xml-core-settings-CoreSettings.settings
 SystemFileSystem
Index: css/src/org/netbeans/modules/css/CSSNode.java
===================================================================
RCS file: /cvs/xml/css/src/org/netbeans/modules/css/CSSNode.java,v
retrieving revision 1.3
diff -u -r1.3 CSSNode.java
--- css/src/org/netbeans/modules/css/CSSNode.java	12 Mar 2002 14:38:55 -0000	1.3
+++ css/src/org/netbeans/modules/css/CSSNode.java	21 Mar 2002 16:29:36 -0000
@@ -36,4 +36,8 @@
         setIconBase ("org/netbeans/modules/css/resources/css"); // NOI18N
     }
 
+    public HelpCtx getHelpCtx() {
+        return new HelpCtx (CSSObject.class);
+    }
+
 }
Index: css/src/org/netbeans/modules/css/CSSObject.java
===================================================================
RCS file: /cvs/xml/css/src/org/netbeans/modules/css/CSSObject.java,v
retrieving revision 1.3
diff -u -r1.3 CSSObject.java
--- css/src/org/netbeans/modules/css/CSSObject.java	12 Mar 2002 14:38:55 -0000	1.3
+++ css/src/org/netbeans/modules/css/CSSObject.java	21 Mar 2002 16:29:36 -0000
@@ -44,11 +44,8 @@
  * @author Petr Kuzel
  */
 public final class CSSObject extends MultiDataObject {
-    public static final String MIME_TYPE = "text/css";
-
-private static final long serialVersionUID = -3041598815183192198L;
-
- // NOI18N
+    private static final long serialVersionUID = -3041598815183192198L;
+    public static final String MIME_TYPE = "text/css"; // NOI18N
 
 
     public CSSObject(final FileObject obj,final UniFileLoader loader) throws DataObjectExistsException {
@@ -74,6 +71,9 @@
         return new CSSNode (this);
     }
 
+    public HelpCtx getHelpCtx() {
+        return new HelpCtx ("editing.editor.java");
+    }
 
     /////////////////////
     // class FileListener
Index: css/src/org/netbeans/modules/css/text/syntax/CSSEditorOptions.java
===================================================================
RCS file: /cvs/xml/css/src/org/netbeans/modules/css/text/syntax/CSSEditorOptions.java,v
retrieving revision 1.3
diff -u -r1.3 CSSEditorOptions.java
--- css/src/org/netbeans/modules/css/text/syntax/CSSEditorOptions.java	12 Mar 2002 14:38:56 -0000	1.3
+++ css/src/org/netbeans/modules/css/text/syntax/CSSEditorOptions.java	21 Mar 2002 16:29:36 -0000
@@ -14,6 +14,8 @@
 
 import java.util.MissingResourceException;
 
+import org.openide.util.HelpCtx;
+
 import org.netbeans.editor.*;
 
 /**
@@ -32,6 +34,12 @@
         super (CSSEditorKit.class, CSS);
         LocaleSupport.addLocalizer(this);
     }
+
+
+    public HelpCtx getHelpCtx() {
+        return new HelpCtx (this.getClass());
+    }
+
 
     /** Replace default option bundle with own.
     * The bundle must contain entry OPTIONS_CSS.
Index: tax/src/org/netbeans/modules/xml/tax/beans/editor/TreeNodeFilterCustomEditor.java
===================================================================
RCS file: /cvs/xml/tax/src/org/netbeans/modules/xml/tax/beans/editor/TreeNodeFilterCustomEditor.java,v
retrieving revision 1.5
diff -u -r1.5 TreeNodeFilterCustomEditor.java
--- tax/src/org/netbeans/modules/xml/tax/beans/editor/TreeNodeFilterCustomEditor.java	12 Mar 2002 14:39:09 -0000	1.5
+++ tax/src/org/netbeans/modules/xml/tax/beans/editor/TreeNodeFilterCustomEditor.java	21 Mar 2002 16:29:36 -0000
@@ -20,6 +20,7 @@
 import javax.swing.event.ListSelectionListener;
 import javax.swing.event.ListSelectionEvent;
 
+import org.openide.util.HelpCtx;
 import org.openide.explorer.propertysheet.editors.EnhancedCustomPropertyEditor;
 
 import org.netbeans.tax.*;
@@ -93,6 +94,8 @@
         initComponents();
         ownInitComponents();
         initAccessibility();
+
+        HelpCtx.setHelpIDString (this, TreeNodeFilterCustomEditor.class.getName());
     }
 
 
Index: text-edit/src/org/netbeans/modules/xml/text/syntax/AbstractBaseOptions.java
===================================================================
RCS file: /cvs/xml/text-edit/src/org/netbeans/modules/xml/text/syntax/AbstractBaseOptions.java,v
retrieving revision 1.2
diff -u -r1.2 AbstractBaseOptions.java
--- text-edit/src/org/netbeans/modules/xml/text/syntax/AbstractBaseOptions.java	12 Mar 2002 14:39:11 -0000	1.2
+++ text-edit/src/org/netbeans/modules/xml/text/syntax/AbstractBaseOptions.java	21 Mar 2002 16:29:36 -0000
@@ -14,6 +14,8 @@
 
 import java.util.MissingResourceException;
 
+import org.openide.util.HelpCtx;
+
 import org.netbeans.modules.editor.options.BaseOptions;
 import org.netbeans.editor.LocaleSupport;
 import org.netbeans.editor.LocaleSupport.Localizer;
@@ -49,6 +51,10 @@
         return XMLIndentEngine.class;
     }
 
+
+    public HelpCtx getHelpCtx() {
+        return new HelpCtx (this.getClass());
+    }
 
     //
     // Localizer
Index: tree-edit/src/org/netbeans/modules/xml/tree/nodes/AbstractDataNode.java
===================================================================
RCS file: /cvs/xml/tree-edit/src/org/netbeans/modules/xml/tree/nodes/AbstractDataNode.java,v
retrieving revision 1.5
diff -u -r1.5 AbstractDataNode.java
--- tree-edit/src/org/netbeans/modules/xml/tree/nodes/AbstractDataNode.java	12 Mar 2002 14:39:19 -0000	1.5
+++ tree-edit/src/org/netbeans/modules/xml/tree/nodes/AbstractDataNode.java	21 Mar 2002 16:29:39 -0000
@@ -27,6 +27,7 @@
 import org.openide.nodes.*;
 import org.openide.explorer.propertysheet.editors.*;
 import org.openide.util.datatransfer.*;
+import org.openide.util.HelpCtx;
 
 import org.netbeans.tax.*;
 import org.netbeans.tax.io.*;
@@ -224,6 +225,11 @@
         Util.THIS.debug (",,, AbstractDataNode [ " + thisClassName + " ] ::getDataNode: this = " + this); // NOI18N
 
         return this;
+    }
+
+
+    public HelpCtx getHelpCtx() {
+        return new HelpCtx (this.getClass());
     }
 
 
Index: tree-edit/src/org/netbeans/modules/xml/tree/nodes/AbstractObjectNode.java
===================================================================
RCS file: /cvs/xml/tree-edit/src/org/netbeans/modules/xml/tree/nodes/AbstractObjectNode.java,v
retrieving revision 1.9
diff -u -r1.9 AbstractObjectNode.java
--- tree-edit/src/org/netbeans/modules/xml/tree/nodes/AbstractObjectNode.java	12 Mar 2002 14:39:19 -0000	1.9
+++ tree-edit/src/org/netbeans/modules/xml/tree/nodes/AbstractObjectNode.java	21 Mar 2002 16:29:40 -0000
@@ -329,7 +329,8 @@
 
     
     public HelpCtx getHelpCtx() {
-        return new HelpCtx("org.netbeans.modules.xml.tree.nodes");  // NOI18N
+//         return new HelpCtx("org.netbeans.modules.xml.tree.nodes");  // NOI18N
+        return new HelpCtx (this.getClass());
     }
 
     //
Index: tree-edit/src/org/netbeans/modules/xml/tree/resources/mf-layer.xml
===================================================================
RCS file: /cvs/xml/tree-edit/src/org/netbeans/modules/xml/tree/resources/mf-layer.xml,v
retrieving revision 1.9
diff -u -r1.9 mf-layer.xml
--- tree-edit/src/org/netbeans/modules/xml/tree/resources/mf-layer.xml	12 Mar 2002 14:39:21 -0000	1.9
+++ tree-edit/src/org/netbeans/modules/xml/tree/resources/mf-layer.xml	21 Mar 2002 16:29:40 -0000
@@ -45,7 +45,7 @@
         <folder name="NodeViewType">
             <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.tree.settings.Bundle"/>
             <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/xml/tree/resources/nodeViewSettings.gif"/>
-            <attr name="helpID" stringvalue="org.netbeans.modules.xml.settings.NodeViewType"/>
+            <attr name="helpID" stringvalue="org.netbeans.modules.xml.tree.settings.NodeViewType"/>
 
             <file name="org-netbeans-modules-xml-tree-settings-GroupedType.settings" url="GroupedType.xml">
                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.tree.settings.Bundle"/>
@@ -94,7 +94,7 @@
         <folder name="NodeViewType">
             <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.tree.settings.Bundle"/>
             <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/xml/tree/resources/nodeViewSettings.gif"/>
-            <attr name="helpID" stringvalue="org.netbeans.modules.xml.settings.NodeViewType"/>
+            <attr name="helpID" stringvalue="org.netbeans.modules.xml.tree.settings.NodeViewType"/>
 
             <file name="org-netbeans-modules-xml-tree-settings-GroupedType.settings" url="GroupedType.xml">
                 <attr name="template" boolvalue="true"/>