Index: modeshape-common/src/main/java/org/modeshape/common/collection/UnmodifiableProperties.java
===================================================================
--- modeshape-common/src/main/java/org/modeshape/common/collection/UnmodifiableProperties.java	(revision 1889)
+++ modeshape-common/src/main/java/org/modeshape/common/collection/UnmodifiableProperties.java	(working copy)
@@ -177,7 +177,10 @@ public class UnmodifiableProperties extends Properties {
     /**
      * {@inheritDoc}
      * 
-     * @deprecated
+     * @deprecated This method does not throw an IOException if an I/O error occurs while saving the property list. The preferred
+     *             way to save a properties list is via the <code>store(OutputStream out, 
+     * String comments)</code> method or the <code>storeToXML(OutputStream os, String comment)</code> method.
+     * @see java.util.Properties#save(java.io.OutputStream, java.lang.String)
      */
     @Deprecated
     @Override
Index: modeshape-graph/src/main/java/org/modeshape/graph/sequencer/SequencerOutput.java
===================================================================
--- modeshape-graph/src/main/java/org/modeshape/graph/sequencer/SequencerOutput.java	(revision 1889)
+++ modeshape-graph/src/main/java/org/modeshape/graph/sequencer/SequencerOutput.java	(working copy)
@@ -46,9 +46,10 @@ public interface SequencerOutput {
      * @param nodePath the path to the node containing the property; may not be null
      * @param propertyName the name of the property to be set
      * @param values the value(s) for the property; may be empty if any existing property is to be removed
-     * @deprecated this method depends on the namespace mappings for the given URIs in the name components of the nodePath and
-     *             propertyName to be mapped in the NamespaceRegistry of the ModeShapeEngine's (or JcrEngine's) ExecutionContext.
-     *             Use {@link #setProperty(Path, Name, Object...)} instead.
+     * @deprecated As of ModeShape 2.0, the preferred approach is to use {@link #setProperty(Path, Name, Object...)}, which
+     *             properly addresses the session having different namespace mappings. This method depends on the namespace
+     *             mappings for the given URIs in the name components of the nodePath and propertyName to be mapped in the
+     *             NamespaceRegistry of the ModeShapeEngine's (or JcrEngine's) ExecutionContext.
      */
     @Deprecated
     void setProperty( String nodePath,
@@ -66,9 +67,10 @@ public interface SequencerOutput {
      * @param propertyName the name of the property to be set
      * @param paths the paths to the referenced property, which may be absolute paths or relative to the sequencer output node;
      *        may be empty if any existing property is to be removed
-     * @deprecated this method depends on the namespace mappings for the given URIs in the name components of the nodePath and
-     *             propertyName to be mapped in the NamespaceRegistry of the ModeShapeEngine's (or JcrEngine's) ExecutionContext.
-     *             Use {@link #setProperty(Path, Name, Object...)} instead.
+     * @deprecated As of ModeShape 2.0, the preferred approach is to use {@link #setProperty(Path, Name, Object...)}, which
+     *             properly addresses the session having different namespace mappings. This method depends on the namespace
+     *             mappings for the given URIs in the name components of the nodePath and propertyName to be mapped in the
+     *             NamespaceRegistry of the ModeShapeEngine's (or JcrEngine's) ExecutionContext.
      */
     @Deprecated
     void setReference( String nodePath,
Index: modeshape-jcr/src/main/java/org/modeshape/jcr/JcrNodeDefinitionTemplate.java
===================================================================
--- modeshape-jcr/src/main/java/org/modeshape/jcr/JcrNodeDefinitionTemplate.java	(revision 1889)
+++ modeshape-jcr/src/main/java/org/modeshape/jcr/JcrNodeDefinitionTemplate.java	(working copy)
@@ -74,7 +74,7 @@ class JcrNodeDefinitionTemplate extends JcrItemDefinitionTemplate implements Nod
      * {@inheritDoc}
      * 
      * @see org.modeshape.jcr.nodetype.NodeDefinitionTemplate#setRequiredPrimaryTypes(java.lang.String[])
-     * @deprecated Use {@link #setRequiredPrimaryTypeNames(String[])} instead
+     * @deprecated As of ModeShape 2.0, use {@link #setRequiredPrimaryTypeNames(String[])} instead
      */
     @SuppressWarnings( "dep-ann" )
     public void setRequiredPrimaryTypes( String[] requiredPrimaryTypes ) throws ConstraintViolationException {
Index: modeshape-jcr/src/main/java/org/modeshape/jcr/JcrObservationManager.java
===================================================================
--- modeshape-jcr/src/main/java/org/modeshape/jcr/JcrObservationManager.java	(revision 1889)
+++ modeshape-jcr/src/main/java/org/modeshape/jcr/JcrObservationManager.java	(working copy)
@@ -444,6 +444,7 @@ final class JcrObservationManager implements ObservationManager {
             throw new UnsupportedRepositoryOperationException();
         }
 
+        @SuppressWarnings( "unchecked" )
         @Override
         public Map getInfo() throws RepositoryException {
             throw new UnsupportedRepositoryOperationException();
Index: modeshape-jcr/src/main/java/org/modeshape/jcr/nodetype/NodeDefinitionTemplate.java
===================================================================
--- modeshape-jcr/src/main/java/org/modeshape/jcr/nodetype/NodeDefinitionTemplate.java	(revision 1889)
+++ modeshape-jcr/src/main/java/org/modeshape/jcr/nodetype/NodeDefinitionTemplate.java	(working copy)
@@ -43,7 +43,7 @@ public interface NodeDefinitionTemplate extends javax.jcr.nodetype.NodeDefinitio
      *        primary types of the children described by this definition
      * @throws ConstraintViolationException if any of the <code>requiredPrimaryTypes</code> are not a syntactically valid JCR name
      *         in either qualified or expanded form.
-     * @deprecated Use {@link #setRequiredPrimaryTypeNames(String[])} instead
+     * @deprecated As of ModeShape 2.0, use {@link #setRequiredPrimaryTypeNames(String[])} instead
      */
     @Deprecated
     public void setRequiredPrimaryTypes( String[] requiredPrimaryTypes ) throws ConstraintViolationException;
@@ -54,7 +54,7 @@ public interface NodeDefinitionTemplate extends javax.jcr.nodetype.NodeDefinitio
      * @param defaultPrimaryType the name of the primary type that should be used by default, or null if there is none
      * @throws ConstraintViolationException if <code>defaultPrimaryType</code> is not a syntactically valid JCR name in either
      *         qualified or expanded form.
-     * @deprecated Use {@link #setDefaultPrimaryTypeName(String)} instead
+     * @deprecated As of ModeShape 2.0, use {@link #setDefaultPrimaryTypeName(String)} instead
      */
     @Deprecated
     public void setDefaultPrimaryType( String defaultPrimaryType ) throws ConstraintViolationException;
Index: modeshape-jcr/src/main/java/org/modeshape/jcr/nodetype/PropertyDefinitionTemplate.java
===================================================================
--- modeshape-jcr/src/main/java/org/modeshape/jcr/nodetype/PropertyDefinitionTemplate.java	(revision 1889)
+++ modeshape-jcr/src/main/java/org/modeshape/jcr/nodetype/PropertyDefinitionTemplate.java	(working copy)
@@ -42,7 +42,7 @@ public interface PropertyDefinitionTemplate extends javax.jcr.nodetype.PropertyD
      * 
      * @param defaultValues the string representation of the default values, or null or an empty array if there are no default
      *        values
-     * @deprecated Use {@link #setDefaultValues(javax.jcr.Value[])} instead
+     * @deprecated As of ModeShape 2.0, use {@link #setDefaultValues(javax.jcr.Value[])} instead
      */
     @Deprecated
     public void setDefaultValues( String[] defaultValues );
Index: modeshape-repository/src/main/java/org/modeshape/repository/sequencer/SequencerOutputMap.java
===================================================================
--- modeshape-repository/src/main/java/org/modeshape/repository/sequencer/SequencerOutputMap.java	(revision 1889)
+++ modeshape-repository/src/main/java/org/modeshape/repository/sequencer/SequencerOutputMap.java	(working copy)
@@ -90,9 +90,10 @@ public class SequencerOutputMap implements SequencerOutput, Iterable<SequencerOu
     /**
      * {@inheritDoc}
      * 
-     * @deprecated this method depends on the namespace mappings for the given URIs in the name components of the nodePath and
-     *             propertyName to be mapped in the NamespaceRegistry of the ModeShapeEngine's (or JcrEngine's) ExecutionContext.
-     *             Use {@link #setProperty(Path, Name, Object...)} instead.
+     * @deprecated As of ModeShape 2.0, the preferred approach is to use {@link #setProperty(Path, Name, Object...)}, which
+     *             properly addresses the session having different namespace mappings. This method depends on the namespace
+     *             mappings for the given URIs in the name components of the nodePath and propertyName to be mapped in the
+     *             NamespaceRegistry of the ModeShapeEngine's (or JcrEngine's) ExecutionContext.
      */
     @Deprecated
     public void setProperty( String nodePath,
@@ -108,9 +109,10 @@ public class SequencerOutputMap implements SequencerOutput, Iterable<SequencerOu
     /**
      * {@inheritDoc}
      * 
-     * @deprecated this method depends on the namespace mappings for the given URIs in the name components of the nodePath and
-     *             propertyName to be mapped in the NamespaceRegistry of the ModeShapeEngine's (or JcrEngine's) ExecutionContext.
-     *             Use {@link #setProperty(Path, Name, Object...)} instead.
+     * @deprecated As of ModeShape 2.0, the preferred approach is to use {@link #setProperty(Path, Name, Object...)}, which
+     *             properly addresses the session having different namespace mappings. This method depends on the namespace
+     *             mappings for the given URIs in the name components of the nodePath and propertyName to be mapped in the
+     *             NamespaceRegistry of the ModeShapeEngine's (or JcrEngine's) ExecutionContext.
      */
     @Deprecated
     public void setReference( String nodePath,