Merge branch '1.0.0'

pandaproject · Aug 3, 2012 · e364624 · e364624
2 parents fe8efc0 + 69a5da3
commit e364624
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/docs/production.rst b/docs/production.rst
@@ -6,6 +6,8 @@ We provide documentation for two different ways of installing PANDA for producti
 
 Those who are concerned about the security of storing their data in the cloud or who have access to dedicated hardware may choose to install PANDA on their own server. Although we make every effort to support this, we can not offer any guarantee of compatibility. 
 
+Have more questions about hosting? See the `Hosting questions <http://panda.readthedocs.org/en/latest/faq.html#hosting-questions>`_ of our `FAQ <http://panda.readthedocs.org/en/latest/faq.html>`_.
+
 I am...
 
 .. toctree::