Renamed all references to 'ipa_server' to 'ipaserver'

3 files changed, 7 insertions, 7 deletions

diff --git a/ipalib/__init__.py b/ipalib/__init__.py
index e30b7fed6..e1ef09c1d 100644
--- a/ipalib/__init__.py
+++ b/ipalib/__init__.py
@@ -31,7 +31,7 @@ heavily cross-referenced with further documentation that (hopefully) fills
 in the missing details.
 
 In addition to this tutorial, the many built-in plugins in `ipalib.plugins`
-and `ipa_server.plugins` provide real-life examples of how to write good
+and `ipaserver.plugins` provide real-life examples of how to write good
 plugins.
 
 
@@ -227,12 +227,12 @@ There are two types of plugins:
 
     2. *Backend plugins* - These are only loaded in a *server* context and
        only need to be installed on the IPA server.  The built-in backend
-       plugins can be found in `ipa_server.plugins`.
+       plugins can be found in `ipaserver.plugins`.
 
 Backend plugins should provide a set of methods that standardize how IPA
 interacts with some external system or library.  For example, all interaction
 with LDAP is done through the ``ldap`` backend plugin defined in
-`ipa_server.plugins.b_ldap`.  As a good rule of thumb, anytime you need to
+`ipaserver.plugins.b_ldap`.  As a good rule of thumb, anytime you need to
 import some package that is not part of the Python standard library, you
 should probably interact with that package via a corresponding backend
 plugin you implement.
@@ -824,7 +824,7 @@ To learn more about writing freeIPA plugins, you should:
 
     1. Look at some of the built-in plugins, like the frontend plugins in
        `ipalib.plugins.f_user` and the backend plugins in
-       `ipa_server.plugins.b_ldap`.
+       `ipaserver.plugins.b_ldap`.
 
     2. Learn about the base classes for frontend plugins in `ipalib.frontend`.
 
diff --git a/ipalib/cli.py b/ipalib/cli.py
index f4cdbbf57..442e5061a 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -763,8 +763,8 @@ class CLI(object):
 #            try:
 #                import krbV
 #                import ldap
-#                from ipa_server import conn
-#                from ipa_server.servercore import context
+#                from ipaserver import conn
+#                from ipaserver.servercore import context
 #                krbccache =  krbV.default_context().default_ccache().name
 #                context.conn = conn.IPAConn(self.api.env.ldaphost, self.api.env.ldapport, krbccache)
 #            except ImportError:
diff --git a/ipalib/plugable.py b/ipalib/plugable.py
index d4ec8749b..b52db9008 100644
--- a/ipalib/plugable.py
+++ b/ipalib/plugable.py
@@ -639,7 +639,7 @@ class API(DictProxy):
             return
         util.import_plugins_subpackage('ipalib')
         if self.env.in_server:
-            util.import_plugins_subpackage('ipa_server')
+            util.import_plugins_subpackage('ipaserver')
 
     def finalize(self):
         """