Merge branch 'master' into devel

CHANGES.txt

@@ -1,3 +1,6 @@
+Jul 23, 2013 - v0.2.5  Fixed inconsistency in XML handling, now all instances
+    are always ElementTree objects (issue82).
+
 Jul 21, 2013 - v0.2.4  Fixed markdown bug for Fedora 17 information, fixed
     out-of-date windows information (issue79).  Fixed incorrect
     interpretation of Psot parameter (issue78).

docs/source/conf.py

@@ -78,7 +78,7 @@ copyright = u'2013, John Evans'
 # The short X.Y version.
 version = '0.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.4'
+release = '0.2.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/how_do_i.rst

@@ -185,9 +185,8 @@ Work with XMP UUIDs?
 ====================
 The example JP2 file shipped with glymur has an XMP UUID. ::
 
-    >>> from glymur import Jp2k
-    >>> file = glymur.data.nemo()
-    >>> j = Jp2k(file)
+    >>> import glymur
+    >>> j = glymur.Jp2k(glymur.data.nemo())
     >>> print(j.box[4])
     UUID Box (uuid) @ (715, 2412)
         UUID:  be7acfcb-97a9-42e8-9c71-999491e3afac (XMP)
@@ -198,7 +197,7 @@ The example JP2 file shipped with glymur has an XMP UUID. ::
           </rdf:RDF>
         </ns0:xmpmeta>
 
-Since the UUID data in this case is returned as an ElementTree Element, one can
+Since the UUID data in this case is returned as an ElementTree instance, one can
 use ElementTree to access the data.  For example, to extract the 
 **CreatorTool** attribute value, the following would work::
 

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import sys
 
 kwargs = {'name': 'Glymur',
-          'version': '0.2.4',
+          'version': '0.2.5',
           'description': 'Tools for accessing JPEG2000 files',
           'long_description': open('README.md').read(),
           'author': 'John Evans',