Fixed up merge conflict, normalized docstring format.

Author: AMorporkian

plugins/admin_commands_plugin/admin_command_plugin.py

@@ -43,7 +43,7 @@ def who(self, data):
         return False
 
     def planet(self, data):
-        """Displays who is on your current planet"""
+        """Displays who is on your current planet."""
         who = [w.colored_name(self.config.colors) for w in self.player_manager.who() if w.planet == self.protocol.player.planet and not w.on_ship]
         self.protocol.send_chat_message("Players on your current planet: %s" % " ".join(who))
 
@@ -117,7 +117,7 @@ def make_admin(self, player):
 
     @permissions(UserLevels.MODERATOR)
     def kick(self, data):
-        """Kicks a user from the server. Syntax: /kick [username] [reason]"""
+        """Kicks a user from the server. Usage: /kick [username] [reason]"""
         name, reason = self.extract_name(data)
         if reason is None:
             reason = "no reason given"

plugins/planet_protect/planet_protect_plugin.py

@@ -4,6 +4,10 @@
 
 
 class PlanetProtectPlugin(SimpleCommandPlugin):
+    """
+    Allows planets to be either protector or unprotected. On protected planets,
+    only admins can build. Planets are unprotected by default.
+    """
     name = "planet_protect"
     description = "Protects planets."
     commands = ["protect", "unprotect"]
@@ -40,6 +44,7 @@ def planet_check(self):
 
     @permissions(UserLevels.ADMIN)
     def protect(self, data):
+        """Protects the current planet. Only admins can build on protected planets. Syntax: /protect"""
         planet = self.protocol.player.planet
         on_ship = self.protocol.player.on_ship
         if on_ship:
@@ -55,6 +60,7 @@ def protect(self, data):
 
     @permissions(UserLevels.ADMIN)
     def unprotect(self, data):
+        """Removes the protection from the current planet. Syntax: /unprotect"""
         planet = self.protocol.player.planet
         on_ship = self.protocol.player.on_ship
         if on_ship:

plugins/plugin_manager_plugin/plugin_manager_plugin.py

@@ -4,6 +4,7 @@
 
 
 class PluginManagerPlugin(SimpleCommandPlugin):
+    """ Provides a simple chat interface to the PluginManager"""
     name = "plugin_manager"
     commands = ["list_plugins", "enable_plugin", "disable_plugin", "help", "reload_plugins"]
     auto_activate = True