fix: resolved conflicts

Author: satra

CHANGES

@@ -7,6 +7,7 @@ Next release
 	  how to set SGE specific options (smri_ants_build_template_new)
 * ENH: added no_flatten option to Merge
 * ENH: added versioning option and checking to traits
+* ENH: added deprecation metadata to traits
 
 Release 0.6.0 (Jun 30, 2012)
 ============================

doc/devel/interface_specs.rst

@@ -271,6 +271,36 @@ Common
 	    class RealignInputSpec(BaseInterfaceInputSpec):
 	        jobtype = traits.Enum('estwrite', 'estimate', 'write', min_ver=5,
 	                              usedefault=True)
+``deprecated``
+    This is metadata for removing or renaming an input field from a spec.::
+
+        class RealignInputSpec(BaseInterfaceInputSpec):
+            jobtype = traits.Enum('estwrite', 'estimate', 'write',
+                                  deprecated='0.8',
+                                  desc='one of: estimate, write, estwrite',
+                                  usedefault=True)
+
+    In the above example this means that the `jobtype` input is deprecated and
+    will be removed in version 0.8. Deprecation should be set to two versions
+    from current release. Raises `TraitError` after package version crosses the
+    deprecation version.
+
+``new_name``
+    For inputs that are being renamed, one can specify the new name of the
+    field.::
+
+        class RealignInputSpec(BaseInterfaceInputSpec):
+            jobtype = traits.Enum('estwrite', 'estimate', 'write',
+                                  deprecated='0.8', new_name='job_type',
+                                  desc='one of: estimate, write, estwrite',
+                                  usedefault=True)
+            job_type = traits.Enum('estwrite', 'estimate', 'write',
+                                  desc='one of: estimate, write, estwrite',
+                                  usedefault=True)
+
+    In the above example, the `jobtype` field is being renamed to `job_type`.
+    When `new_name` is provided it must exist as a trait, otherwise an exception
+    will be raised.
 
 CommandLine
 ^^^^^^^^^^^

doc/index.rst

@@ -1,10 +1,3 @@
-.. admonition:: Announcement
-
-   Nipype Connectivity Workshop 2012 in Magdeburg, Germany: Sep 8-9, 2012: 
-   `Information and Registration`__
-
-   __ http://nipype.blogspot.com
-
 .. list-table::
 
  * -  .. image:: images/nipype_architecture_overview2.png