From d8e558aaed687781fefa5d1c10033fb949872400 Mon Sep 17 00:00:00 2001
From: Robert Zenz <Robert.Zenz@bonsaimind.org>
Date: Sat, 19 Dec 2015 12:13:47 +0100
Subject: [PATCH] Fixed naming collision.

---
 doc/index.html                  | 6 +++---
 mods/spawn_usher/spawnusher.lua | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/index.html b/doc/index.html
index 2c604c3..5821bd1 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -115,7 +115,7 @@
 <h2><a href="#Fields">Fields</a></h2>
 <table class="function_list">
 	<tr>
-	<td class="name" nowrap><a href="#activate">activate</a></td>
+	<td class="name" nowrap><a href="#activate_automatically">activate_automatically</a></td>
 	<td class="summary">If the system should be activated automatically.</td>
 	</tr>
 	<tr>
@@ -428,8 +428,8 @@
     <h2><a name="Fields"></a>Fields</h2>
     <dl class="function">
     <dt>
-    <a name = "activate"></a>
-    <strong>activate</strong>
+    <a name = "activate_automatically"></a>
+    <strong>activate_automatically</strong>
     </dt>
     <dd>
     If the system should be activated automatically.
diff --git a/mods/spawn_usher/spawnusher.lua b/mods/spawn_usher/spawnusher.lua
index 24d9792..dd50001 100644
--- a/mods/spawn_usher/spawnusher.lua
+++ b/mods/spawn_usher/spawnusher.lua
@@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -- The only function that should be called from clients is activate.
 spawnusher = {
 	--- If the system should be activated automatically.
-	activate = settings.get_bool("spawnusher_activate", true),
+	activate_automatically = settings.get_bool("spawnusher_activate", true),
 	
 	--- If the system is active/has been activated.
 	active = false,
@@ -90,7 +90,7 @@ spawnusher = {
 --- Activates the spawn usher system, if it has not been deactivated by
 -- a seeting in the configuration.
 function spawnusher.activate()
-	if spawnusher.activate then
+	if spawnusher.activate_automatically then
 		spawnusher.activate_internal()
 	end
 end