Merge branch 'issue167' into devel

docs/source/detailed_installation.rst

@@ -45,13 +45,6 @@ the path will be ::
 
     $XDG_CONFIG_HOME/glymur/glymurrc 
 
-On windows, the path to the configuration file can be determined
-by starting up Python and typing ::
-
-    import os
-    os.path.join(os.path.expanduser('~'), 'glymur', 'glymurrc')
-        
-
 You may also include a line for the version 1.x openjpeg library if you have it
 installed in a non-standard place, i.e. ::
 
@@ -70,9 +63,8 @@ packages/RPMs/ports/whatever without going through pip.
 
 Mac OS X
 --------
-All the necessary packages are available to use glymur with Python 2.6, 2.7, 
+All the necessary packages are available to use glymur with MacPorts.
-and 3.3 via MacPorts.  For python 3.3, you should install the following set of
+For python 3.3, you should install the following set of ports:
-ports:
 
       * python33
       * py33-numpy
@@ -108,12 +100,8 @@ difficulties:
 
 Windows
 -------
-32-bit WinPython 2.7.5 seemed to work with OpenJPEG 1.X, 2.0, and the
+The 0.6.x series of Glymur is untested on windows and I make no promises here.
-development version, but still required contextlib2 and mock to be
+I suggest that windows users check the 0.5.x series.
-installed via pip.   WinPython 3.3.2, however, seems to have trouble
-with OpenJPEG 2.0, so I would suggest using the development version with
-that configuration.  I no longer have any access to a windows machine,
-so I cannot currently offer much guidance here.
 
 
 '''''''
@@ -145,5 +133,5 @@ OpenJPEG counterparts are already failing, and others which do pass but
 still produce heaps of output on stderr.  Rather than let this swamp
 the signal (that most of those tests are actually passing), they've been
 filtered out for now.  There are also more skipped tests on Python 2.7
-than on Python 3.3.  The important part is whether or not any test
+than on Python3.  The important part is whether or not any test
 errors are reported at the end.

docs/source/introduction.rst

@@ -11,8 +11,8 @@ In regards to metadata, most JP2 boxes are properly interpreted.
 Certain optional JP2 boxes can also be written, including XML boxes and
 XMP UUIDs.  There is some very limited support for reading JPX metadata.
 
-Glymur 0.6 works on Python versions 2.7, 3.3 and 3.4.  If you have 2.6, you should
+Glymur 0.6 works on Python versions 2.7, 3.3 and 3.4.  If you have Python 2.6,
-use the 0.5 series.
+you should use the 0.5 series of Glymur.
 
 OpenJPEG Installation
 =====================
@@ -24,9 +24,7 @@ OpenJPEG, please consult http://www.openjpeg.org.
 
 If you use MacPorts or if you have a sufficiently recent version of
 Linux, your package manager should already provide you with a version of
-OpenJPEG 1.X which glymur can already use.  If your platform is windows,
+OpenJPEG 1.X which glymur can already use.  
-I suggest using the windows installers provided to you by the OpenJPEG
-folks at https://code.google.com/p/openjpeg/downloads/list .
 
 Glymur Installation
 ===================

docs/source/roadmap.rst

@@ -5,6 +5,4 @@ Roadmap
 Here's an incomplete list of what I'd like to focus on in the future.
 
     * continue to monitor upstream changes in the openjp2 library
-    * investigate using CFFI or cython instead of ctypes to wrap openjp2
+    * investigate JPIP (likely to be a big project)
-    * investigate adding write support for UUID/XMP boxes (potentially a big project)
-    * investigate JPIP (likely to be an even bigger project)