r47265 - merge deprecation-docs-8082 and fix conflict
adiroiban-TA+aISz0psMTMxyoc4vAAJOcrHinNvQL0E9HWUfgJXw@public.gmane.org Sat, 16 Apr 2016 12:04:00 -0600 (MDT)
| Newsgroups | gmane.comp.python.twisted.commits |
|---|---|
| Message-ID | <[email protected]> |
Author: adiroiban
Date: Sat Apr 16 12:03:56 2016
New Revision: 47265
Added:
branches/deprecation-docs-8082-2/docs/core/development/policy/compatibility-policy.rst
branches/deprecation-docs-8082-2/twisted/topfiles/8082.doc
Modified:
branches/deprecation-docs-8082-2/docs/core/development/policy/index.rst
Log:
merge deprecation-docs-8082 and fix conflict
Modified: branches/deprecation-docs-8082-2/docs/core/development/policy/index.rst
==============================================================================
--- branches/deprecation-docs-8082-2/docs/core/development/policy/index.rst (original)
+++ branches/deprecation-docs-8082-2/docs/core/development/policy/index.rst Sat Apr 16 12:03:56 2016
@@ -12,6 +12,7 @@
coding-standard
writing-standard
test-standard
+ compatibility-policy
svn-dev
release-process
@@ -20,5 +21,6 @@
- :doc:`Coding standard <coding-standard>`
- :doc:`Documentation writing standard <writing-standard>`
- :doc:`Testing standard <test-standard>`
+- :doc:`Compatibility Policy <compatibility-policy>`
- :doc:`Working from Twisted's Subversion repository <svn-dev>`
- :doc:`Releasing Twisted <release-process>`