Changeset 391 for python/trunk/Doc/library/carbon.rst

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Doc/library/carbon.rst (modified) (4 diffs)

python/trunk/Doc/library/carbon.rst

@@ -6 +6 @@
 **********************
 
-There are a set of modules that provide interfaces to various Mac OS toolboxes.
+These are a set of modules that provide interfaces to various legacy Mac OS toolboxes.
 If applicable the module will define a number of Python objects for the various
 structures declared by the toolbox, and operations will be implemented as
@@ -15 +15 @@
 have a :attr:`__doc__` string describing their arguments and return values, and
 for additional description you are referred to `Inside Macintosh
-<http://developer.apple.com/documentation/macos8/mac8.html>`_ or similar works.
+<http://developer.apple.com/legacy/mac/library/#documentation/macos8/mac8.html>`_ or similar works.
 
 These modules all live in a package called :mod:`Carbon`. Despite that name they
@@ -25 +25 @@
 .. note::
 
-   The Carbon modules have been removed in Python 3.0.
+   Most of the OS X APIs that these modules use are deprecated or removed
+   in recent versions of OS X.  Many are not available when Python is
+   executing in 64-bit mode.  The Carbon modules have been removed in
+   Python 3.  You should avoid using them in Python 2.
 
 
@@ -516 +519 @@
 .. seealso::
 
-   `Scrap Manager <http://developer.apple.com/documentation/mac/MoreToolbox/MoreToolbox-109.html>`_
+   `Scrap Manager <http://developer.apple.com/legacy/mac/library/documentation/mac/MoreToolbox/MoreToolbox-109.html>`_
       Apple's documentation for the Scrap Manager gives a lot of useful information
       about using the Scrap Manager in applications.