From 19f70b93a06ca1f7be4097e1e0673ce6a0afe872 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Fri, 17 Dec 2010 21:19:57 +0000
Subject: [PATCH] tidy up the [Groups] section in OpenSim.ini.example

---
 bin/OpenSim.ini.example | 22 +++++++++++-----------
 bin/OpenSimDefaults.ini |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 988831fd4a..7245bee2e3 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -622,16 +622,21 @@
     ;; or from the SimianGrid project at http://code.google.com/p/openmetaverse
     ; Module = Default
 
+    ;# {MessagingEnabled} {Module:GroupsModule} {Is groups messaging enabled?} {true false} true
+    ; MessagingEnabled = true
 
-    ;; Service connectors to the Groups Service.  Select one depending on
+    ;# {MessagingModule} {MessagingEnabled:true} {Module to use for groups messaging} {GroupsMessagingModule} GroupsMessagingModule
+    ; MessagingModule = GroupsMessagingModule
+
+    ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector
+    ;; Service connectors to the Groups Service as used in the GroupsModule.  Select one depending on
     ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
-
-    ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups?} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector
-    ;; The service connector to use for the GroupsModule
     ; ServicesConnectorModule = SimianGroupsServicesConnector
 
-    ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI?} {}
+    ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI} {}
     ;; URI for the groups services
+    ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc
+    ;; or http://mygridserver.com:82/Grid/ for SimianGrid
     ; GroupsServerURI = ""
 
     ;# {NoticesEnabled} {Module:GroupsModule} {Enable group notices?} {true false} true
@@ -641,13 +646,8 @@
     ;; This makes the Groups modules very chatty on the console.
     ; DebugEnabled = false
 
-    ;; Specify which messaging module to use for groups messaging and if it's
-    ;; enabled
-    ; MessagingModule = GroupsMessagingModule
-    ; MessagingEnabled = true
-
     ;; XmlRpc Security settings.  These must match those set on your backend
-    ;; groups service.
+    ;; groups service if the service is using these keys
     ; XmlRpcServiceReadKey    = 1234
     ; XmlRpcServiceWriteKey   = 1234
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 9cfac98eeb..36e0b7b023 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1208,7 +1208,7 @@
     ;ServicesConnectorModule = XmlRpcGroupsServicesConnector
     ;GroupsServerURI        = http://yourxmlrpcserver.com/xmlrpc.php
 
-    ; XmlRpc Security settings.  These must match those set on your backend groups service.
+    ; XmlRpc Security settings.  These must match those set on your backend groups service if the service is using these keys
     ;XmlRpcServiceReadKey    = 1234 
     ;XmlRpcServiceWriteKey   = 1234