From f09ac4e5972a77dfe73338ee207e40ec463355e9 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sat, 3 Aug 2013 00:18:14 +0200
Subject: Revert "Revert "merge""

This reverts commit 9294f72adb3c076932558b6f29a4c570e7962764.
---
 doc/html/globals_0x73.html | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'doc/html/globals_0x73.html')

diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html
index 2607ec664..ae6e39d5b 100644
--- a/doc/html/globals_0x73.html
+++ b/doc/html/globals_0x73.html
@@ -144,9 +144,6 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
 <div class="textblock">Here is a list of all file members with links to the files they belong to:</div>
 
 <h3><a class="anchor" id="index_s"></a>- s -</h3><ul>
-<li>salmon_key()
-: <a class="el" href="crypto_8php.html#a9191447cc46f0b4eaba3273e313994d5">crypto.php</a>
-</li>
 <li>sanitise_acl()
 : <a class="el" href="text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c">text.php</a>
 </li>
@@ -208,13 +205,13 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
 : <a class="el" href="include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e">config.php</a>
 </li>
 <li>settings_aside()
-: <a class="el" href="mod_2settings_8php.html#ae5aebccb006bee1300078576baaf5582">settings.php</a>
+: <a class="el" href="settings_8php.html#ae5aebccb006bee1300078576baaf5582">settings.php</a>
 </li>
 <li>settings_init()
-: <a class="el" href="mod_2settings_8php.html#a3a4cde287482fced008583f54ba2a722">settings.php</a>
+: <a class="el" href="settings_8php.html#a3a4cde287482fced008583f54ba2a722">settings.php</a>
 </li>
 <li>settings_post()
-: <a class="el" href="mod_2settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586">settings.php</a>
+: <a class="el" href="settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586">settings.php</a>
 </li>
 <li>setup_content()
 : <a class="el" href="setup_8php.html#a88247384a96e14516f474d7af6a465c1">setup.php</a>
-- 
cgit v1.2.3