Merge remote-tracking branch 'upstream/master'

Conflicts:
	mod/page.php

1 files changed, 3 insertions, 24 deletions

diff --git a/doc/html/contact__widgets_8php.html b/doc/html/contact__widgets_8php.html
index 6ee437953..8c7dc4b33 100644
--- a/doc/html/contact__widgets_8php.html
+++ b/doc/html/contact__widgets_8php.html
@@ -28,7 +28,7 @@
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
-  <td id="projectlogo"><img alt="Logo" src="rhash-64.png"/></td>
+  <td id="projectlogo"><img alt="Logo" src="rm-64.png"/></td>
   <td style="padding-left: 0.5em;">
    <div id="projectname">The Red Matrix
    </div>
@@ -112,8 +112,6 @@ $(document).ready(function(){initNavTree('contact__widgets_8php.html','');});
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr class="memitem:af24e693532a045954caab515942cfc6f"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="contact__widgets_8php.html#af24e693532a045954caab515942cfc6f">follow_widget</a> ()</td></tr>
-<tr class="separator:af24e693532a045954caab515942cfc6f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a57e73ebcfd62bb5d8c7a7b9e663726d6"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6">findpeople_widget</a> ()</td></tr>
 <tr class="separator:a57e73ebcfd62bb5d8c7a7b9e663726d6"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a1eda66319d170f60a8d07c7ece95533b"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b">fileas_widget</a> ($baseurl, $selected= '')</td></tr>
@@ -148,7 +146,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="channel_8php.html#aea8e189f2fbabfda779349dd94082e8e">channel_aside()</a>, and <a class="el" href="lastpost_8php.html#a6108289ef2a767495c7c85a24f364983">lastpost_aside()</a>.</p>
+<p>Referenced by <a class="el" href="widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b">widget_categories()</a>.</p>
 
 </div>
 </div>
@@ -166,7 +164,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1">channel_content()</a>, and <a class="el" href="lastpost_8php.html#a82f14cce5d3cfe27f40bdbd2c679d493">lastpost_content()</a>.</p>
+<p>Referenced by <a class="el" href="channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1">channel_content()</a>.</p>
 
 </div>
 </div>
@@ -194,8 +192,6 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec">network_init()</a>.</p>
-
 </div>
 </div>
 <a class="anchor" id="a57e73ebcfd62bb5d8c7a7b9e663726d6"></a>
@@ -215,23 +211,6 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="af24e693532a045954caab515942cfc6f"></a>
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">follow_widget </td>
-          <td>(</td>
-          <td class="paramname"></td><td>)</td>
-          <td></td>
-        </tr>
-      </table>
-</div><div class="memdoc">
-
-<p>Referenced by <a class="el" href="connections_8php.html#af48f7ad20914760ba9874c090384e35a">connections_aside()</a>, <a class="el" href="intro_8php.html#abc3abf25da64f98f215126eb08c7936b">intro_aside()</a>, and <a class="el" href="suggest_8php.html#a4df91c84594d51ba56b5918de414230d">suggest_aside()</a>.</p>
-
-</div>
-</div>
 </div><!-- contents -->
 </div><!-- doc-content -->