diff --git a/nifi-site/src/pages/html/faq.hbs b/nifi-site/src/pages/html/faq.hbs
index d4fd3274a6..eaf0d1b152 100644
--- a/nifi-site/src/pages/html/faq.hbs
+++ b/nifi-site/src/pages/html/faq.hbs
@@ -22,9 +22,9 @@ title: Apache NiFi FAQs
             <li>
                 <p class="description"><b>Where can I find documentation on how to understand and configure NiFi?</b></p>
                 <ul>
-                    <li>Our draft/preview of the User Guide is now available under the docs dropdown.</li>
-                    <li>We're working on completing that and having it fully integrated to the application.</li>
-                    <li>The developer guide is also in the works.</li>
+                    <li>Documentation is available under the <a href="docs.html">NiFi Docs</a> link within the Documentation dropdown.</li>
+                    <li>A <a href="developer-guide.html">Developer Guide</a> is also available under the Development dropdown.</li>
+                    <li>View the <a href="https://cwiki.apache.org/confluence/display/NIFI">Apache NiFi Wiki</a> for additional information related to the project as well as how to contribute.</li>
                     <li>For more information on presently outstanding documentation work <a href="https://issues.apache.org/jira/browse/NIFI-162?jql=project%20%3D%20NIFI%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22Documentation%20%26%20Website%22%20ORDER%20BY%20priority%20DESC">please click here</a>.</li>
                 </ul>
             </li>