summaryrefslogtreecommitdiffstats
path: root/Doc/library/plistlib.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-09-13 17:46:05 (GMT)
committerGeorg Brandl <georg@python.org>2008-09-13 17:46:05 (GMT)
commitc575c9064769d37ac9555b7cd2907c25ab030810 (patch)
tree8b15a940b50eba4b66a62a2610904efe88d94d18 /Doc/library/plistlib.rst
parenta6fc212d2a2254ea2c3a6890bbb9b17cf0878529 (diff)
downloadcpython-c575c9064769d37ac9555b7cd2907c25ab030810.zip
cpython-c575c9064769d37ac9555b7cd2907c25ab030810.tar.gz
cpython-c575c9064769d37ac9555b7cd2907c25ab030810.tar.bz2
Merged revisions 66452 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r66452 | georg.brandl | 2008-09-13 19:41:16 +0200 (Sat, 13 Sep 2008) | 2 lines Remove things specific to the old Macintosh, and spell "Mac OS X" consistently. ........
Diffstat (limited to 'Doc/library/plistlib.rst')
-rw-r--r--Doc/library/plistlib.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/plistlib.rst b/Doc/library/plistlib.rst
index a71376e..cf3dd82 100644
--- a/Doc/library/plistlib.rst
+++ b/Doc/library/plistlib.rst
@@ -1,8 +1,8 @@
-:mod:`plistlib` --- Generate and parse MacOS X ``.plist`` files
-===============================================================
+:mod:`plistlib` --- Generate and parse Mac OS X ``.plist`` files
+================================================================
.. module:: plistlib
- :synopsis: Generate and parse MacOS X plist files.
+ :synopsis: Generate and parse Mac OS X plist files.
.. moduleauthor:: Jack Jansen
.. sectionauthor:: Georg Brandl <georg@python.org>
.. (harvested from docstrings in the original file)
@@ -12,7 +12,7 @@
single: property list
This module provides an interface for reading and writing the "property list"
-XML files used mainly by MacOS X.
+XML files used mainly by Mac OS X.
The property list (``.plist``) file format is a simple XML pickle supporting
basic object types, like dictionaries, lists, numbers and strings. Usually the