merge with 3.3

.hgeol

@@ -10,6 +10,8 @@
 **.vsprops = BIN
 
 **.aif  = BIN
+**.aifc = BIN
+**.aiff = BIN
 **.au   = BIN
 **.bmp  = BIN
 **.db   = BIN
@@ -23,6 +25,7 @@
 **.png  = BIN
 **.psd  = BIN
 **.tar  = BIN
+**.wav  = BIN
 **.xar  = BIN
 **.zip  = BIN
 

Doc/tools/sphinxext/c_annotations.py

@@ -73,10 +73,10 @@ class Annotations(dict):
             par = node.parent
             if par['domain'] != 'c':
                 continue
-            if par['notlimited']:
-                node.insert(0, nodes.emphasis(' Not part of the stable API.',
-                                              ' Not part of the stable API.',
-                                              classes=['notlimited']))
+            if par['stableabi']:
+                node.insert(0, nodes.emphasis(' Part of the stable ABI.',
+                                              ' Part of the stable ABI.',
+                                              classes=['stableabi']))
             if par['objtype'] != 'function':
                 continue
             if not par[0].has_key('names') or not par[0]['names']:
@@ -108,10 +108,10 @@ def setup(app):
     # monkey-patch C object...
     CObject.option_spec = {
         'noindex': directives.flag,
-        'notlimited': directives.flag,
+        'stableabi': directives.flag,
     }
     old_handle_signature = CObject.handle_signature
     def new_handle_signature(self, sig, signode):
-        signode.parent['notlimited'] = 'notlimited' in self.options
+        signode.parent['stableabi'] = 'stableabi' in self.options
         return old_handle_signature(self, sig, signode)
     CObject.handle_signature = new_handle_signature

Doc/tools/sphinxext/pydoctheme/static/pydoctheme.css

@@ -173,6 +173,6 @@ div.footer a:hover {
     color: #060;
 }
 
-.notlimited {
-    color: #922;
+.stableabi {
+    color: #229;
 }