Merge branch 'master' into v0.9

1 files changed, 4 insertions, 1 deletions

diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html
index 77fc65dd..94f771a2 100644
--- a/tpl/default/page.footer.html
+++ b/tpl/default/page.footer.html
@@ -9,13 +9,16 @@
     {/if}
     ·
     The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community ·
-    <a href="doc/Home.html" rel="nofollow">Documentation</a>
+    <a href="doc/html/index.html" rel="nofollow">Documentation</a>
       {loop="$plugins_footer.text"}
           {$value}
       {/loop}
   </div>
   <div class="pure-u-2-24"></div>
 </div>
+
+<input type="hidden" name="token" value="{$token}" id="token" />
+
 {loop="$plugins_footer.endofpage"}
     {$value}
 {/loop}