Automatic Py3k merge for testing

materialsproject · Jun 26, 2016 · 4f64fb0 · 4f64fb0
2 parents 1d27bc8 + 459a037
commit 4f64fb0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/docs/index.rst b/docs/index.rst
@@ -35,7 +35,7 @@ Matgenie & Examples
 ===================
 
 The `Materials Virtual Lab`_ has developed a
-`matgenie web app <http://www.materialsvirtuallab.org/matgenie>`_ which
+`matgenie web app <http://matgenie.materialsvirtuallab.org>`_ which
 demonstrates some of the basic functionality of pymatgen.
 
 Another good way to explore the functionality of pymatgen is to look at the

diff --git a/docs/pymatgen.io.rst b/docs/pymatgen.io.rst
@@ -207,6 +207,14 @@ pymatgen.io.xcrysden module
     :undoc-members:
     :show-inheritance:
 
+pymatgen.io.xr module
+---------------------
+
+.. automodule:: pymatgen.io.xr
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 pymatgen.io.xyz module
 ----------------------