samba-tool: Rename Samba4 to Samba AD

We should stop talking about Samba4 and use the terms Samba AD and
Samba FS.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri May  5 15:51:54 CEST 2017 on sn-devel-144

diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index b001c544fb9a65e429348fbea70dee715b278773..d61f26e1345066d5db6111b8cafbd322044aee90 100644 (file)
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -1,5 +1,5 @@
 # Unix SMB/CIFS implementation.
-# backend code for provisioning a Samba4 server
+# backend code for provisioning a Samba AD server
 
 # Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2012
 # Copyright (C) Andrew Bartlett <abartlet@samba.org> 2008-2009
@@ -474,7 +474,7 @@ class ProvisionResult(object):
     def report_logger(self, logger):
         """Report this provision result to a logger."""
         logger.info(
-            "Once the above files are installed, your Samba4 server will "
+            "Once the above files are installed, your Samba AD server will "
             "be ready to use")
         if self.adminpass_generated:
             logger.info("Admin password:        %s", self.adminpass)

diff --git a/python/samba/tests/provision.py b/python/samba/tests/provision.py
index 91c66d5234634dd4878a724cc8178885ee30e2e7..11b0135f473991233d78de0ff2306e408562b32d 100644 (file)
--- a/python/samba/tests/provision.py
+++ b/python/samba/tests/provision.py
@@ -171,7 +171,7 @@ class ProvisionResultTests(TestCase):
         result = self.base_result()
         entries = self.report_logger(result)
         self.assertEquals(entries, [
-            ('INFO', 'Once the above files are installed, your Samba4 server '
+            ('INFO', 'Once the above files are installed, your Samba AD server '
                 'will be ready to use'),
             ('INFO', 'Server Role:           domain controller'),
             ('INFO', 'Hostname:              hostnaam'),