--- a/content/base/public/nsIDOMFile.idl
+++ b/content/base/public/nsIDOMFile.idl
@@ -63,16 +63,20 @@ interface nsIDOMBlob : nsISupports
 interface nsIDOMFile : nsIDOMBlob
 {
   readonly attribute DOMString name;
   readonly attribute DOMString mozFullPath;
 
   // This performs no security checks!
   [noscript] readonly attribute DOMString mozFullPathInternal;
 
-  // These are all deprecated and not in spec. Will be removed in a future
-  // release
-  readonly attribute DOMString fileName;
-  readonly attribute unsigned long long fileSize;
+  /**
+   * @deprecated
+   */
+  [deprecated] readonly attribute DOMString fileName;
+  /**
+   * @deprecated
+   */
+  [deprecated] readonly attribute unsigned long long fileSize;
   DOMString getAsText(in DOMString encoding); // raises(FileException) on retrieval
   DOMString getAsDataURL();             // raises(FileException) on retrieval
   DOMString getAsBinary();              // raises(FileException) on retrieval
 };

--- a/content/base/public/nsISyncLoadDOMService.idl
+++ b/content/base/public/nsISyncLoadDOMService.idl
@@ -59,19 +59,21 @@ interface nsIChannel;
  *    Don't make me come over there!!                                    *
  *                                                                       *
  *                                                                       *
  ************************************************************************/
 
 /**
  * The nsISyncDOMLoadService interface can be used to synchronously load
  * a document.
+ *
+ * @deprecated use XMLHttpRequest instead
  */
 
-[scriptable, uuid(8095998d-ae1c-4cfa-9b43-0973e5d77eb0)]
+[deprecated, scriptable, uuid(8095998d-ae1c-4cfa-9b43-0973e5d77eb0)]
 interface nsISyncLoadDOMService : nsISupports
 {
     /**
      * Synchronously load the document from the specified channel.
      *
      * @param aChannel   The channel to load the document from.
      * @param aLoaderPrincipal Principal of loading document. For security
      *                         checks null if no securitychecks should be done

--- a/content/base/public/nsIXMLHttpRequest.idl
+++ b/content/base/public/nsIXMLHttpRequest.idl
@@ -386,19 +386,19 @@ interface nsIXMLHttpRequest : nsISupport
 [scriptable, uuid(840d0d00-e83e-4a29-b3c7-67e96e90a499)]
 interface nsIXHRSendable : nsISupports {
   void getSendInfo(out nsIInputStream body,
                    out ACString contentType,
                    out ACString charset);
 };
 
 /**
- * DEPRECATED.
+ * @deprecated
  */
-[scriptable, uuid(423fdd3d-41c9-4149-8fe5-b14a1d3912a0)]
+[deprecated, scriptable, uuid(423fdd3d-41c9-4149-8fe5-b14a1d3912a0)]
 interface nsIJSXMLHttpRequest : nsISupports {
   /**
    * Meant to be a script-only mechanism for setting an upload progress event
    * listener.
    * This attribute should not be used from native code!!
    * This event listener may be called multiple times during the upload..
    *
    * After the initial response, all event listeners will be cleared.

--- a/content/xslt/public/nsIXSLTProcessorObsolete.idl
+++ b/content/xslt/public/nsIXSLTProcessorObsolete.idl
@@ -39,19 +39,19 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsISupports.idl"
 
 interface nsIDOMNode;
 interface nsIDOMDocument;
 
 /**
- * DEPRECATED! Don't use this interface! Use nsIXSLTProcessor instead!!
+ * @deprecated Use nsIXSLTProcessor instead!!
  */
 
-[scriptable, uuid(3fbff728-2d20-11d3-aef3-00108300ff91)]
+[deprecated, scriptable, uuid(3fbff728-2d20-11d3-aef3-00108300ff91)]
 interface nsIXSLTProcessorObsolete : nsISupports
 {
     void transformDocument(in nsIDOMNode aSourceDOM,
                            in nsIDOMNode aStyleDOM,
                            in nsIDOMDocument aOutputDOC,
                            in nsISupports aObserver);
 };

--- a/dom/interfaces/base/nsIDOMJSWindow.idl
+++ b/dom/interfaces/base/nsIDOMJSWindow.idl
@@ -65,21 +65,21 @@ interface nsIDOMJSWindow : nsISupports
    * its implementation is a no-op
    */
   void                      setResizable(in boolean resizable);
 
   /**
    * @deprecated These are old Netscape 4 methods. Do not use,
    *             the implementation is no-op.
    */
-  void                      captureEvents(in long eventFlags);
-  void                      releaseEvents(in long eventFlags);
-  void                      routeEvent(in nsIDOMEvent evt);
-  void                      enableExternalCapture();
-  void                      disableExternalCapture();
+  [deprecated] void         captureEvents(in long eventFlags);
+  [deprecated] void         releaseEvents(in long eventFlags);
+  [deprecated] void         routeEvent(in nsIDOMEvent evt);
+  [deprecated] void         enableExternalCapture();
+  [deprecated] void         disableExternalCapture();
 
   /**
    * This is the scriptable version of nsIDOMWindowInternal::open()
    * that takes 3 optional arguments. Its binary name is OpenJS to
    * avoid colliding with nsIDOMWindowInternal::open(), which has the
    * same signature. The reason we can't have that collision is that
    * the implementation needs to know whether it was called from JS or
    * not.

--- a/dom/interfaces/events/nsIDOMNSEvent.idl
+++ b/dom/interfaces/events/nsIDOMNSEvent.idl
@@ -102,19 +102,19 @@ interface nsIDOMNSEvent : nsISupports
    * This really needs to be in .originalTarget, but this is a less risky way of
    * fixing it.
    */
   [noscript] readonly attribute nsIDOMEventTarget  tmpRealOriginalTarget;
 
   /**
    * @deprecated Use nsIDOMEvent::stopPropagation.
    */
-  void                      preventBubble();
+  [deprecated] void         preventBubble();
 
   /**
    * @deprecated Use nsIDOMEvent::stopPropagation.
    */
-  void                      preventCapture();
+  [deprecated] void         preventCapture();
 
   boolean                   getPreventDefault();
 
   readonly attribute boolean isTrusted;
 };

--- a/dom/interfaces/html/nsIDOMNSHTMLDocument.idl
+++ b/dom/interfaces/html/nsIDOMNSHTMLDocument.idl
@@ -67,19 +67,19 @@ interface nsIDOMNSHTMLDocument : nsISupp
 
   // Scriptable version of clear().
   void                      clear();
 
   /**
    * @deprecated These are old Netscape 4 methods. Do not use,
    *             the implementation is no-op.
    */
-  void                      captureEvents(in long eventFlags);
-  void                      releaseEvents(in long eventFlags);
-  void                      routeEvent(in nsIDOMEvent evt);
+  [deprecated] void         captureEvents(in long eventFlags);
+  [deprecated] void         releaseEvents(in long eventFlags);
+  [deprecated] void         routeEvent(in nsIDOMEvent evt);
 
   // returns "BackCompat" if we're in quirks mode,
   // or "CSS1Compat" if we're in strict mode
   readonly attribute DOMString            compatMode;
 
   // mapped to attribute embeds for NS4 compat
   readonly attribute nsIDOMHTMLCollection plugins;
   

--- a/dom/interfaces/offline/nsIDOMOfflineResourceList.idl
+++ b/dom/interfaces/offline/nsIDOMOfflineResourceList.idl
@@ -53,27 +53,27 @@ interface nsIDOMOfflineResourceList : ns
    *
    * @param uri
    *        The resource to check.
    */
   boolean mozHasItem(in DOMString uri);
 
   /**
    * Get the number of dynamically-managed entries.
-   * @status DEPRECATED
-   *         Clients should use the "items" attribute.
+   *
+   * @deprecated Clients should use the "items" attribute.
    */
-  readonly attribute unsigned long mozLength;
+  [deprecated] readonly attribute unsigned long mozLength;
 
   /**
    * Get the URI of a dynamically-managed entry.
-   * @status DEPRECATED
-   *         Clients should use the "items" attribute.
+   *
+   * @deprecated Clients should use the "items" attribute.
    */
-  DOMString mozItem(in unsigned long index);
+  [deprecated] DOMString mozItem(in unsigned long index);
 
   /**
    * Add an item to the list of dynamically-managed entries.  The resource
    * will be fetched into the application cache.
    *
    * @param uri
    *        The resource to add.
    */