merge with stable

doc/_templates/index.html

@@ -81,7 +81,10 @@
     create a customized documentation using Sphinx written by the matplotlib
     developers.{%endtrans%}</p>
 
-  <p>{%trans%}There is a <a href="http://sphinx-users.jp/doc10/">Japanese translation</a>
-    of this documentation, thanks to Yoshiki Shibukawa.{%endtrans%}</p>
+  <p>{%trans%}There is a <a href="http://docs.sphinx-users.jp/">Japanese translation</a>
+    of this documentation, thanks to the Japanese Sphinx user group.{%endtrans%}</p>
+  <p>{%trans%}A Japanese book about Sphinx has been published by O'Reilly:
+    <a href="http://www.oreilly.co.jp/books/9784873116488/">Sphinxをはじめよう /
+      Learning Sphinx</a>.{%endtrans%}</p>
 
 {% endblock %}