ipa/SOURCES/1001-Change-branding-to-IPA-and-Identity-Management.patch

From f40f42dd9b8c5da54a872ef6a7de46e5ae3ba341 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 01/78] client/man/default.conf.5: Change branding to IPA and
 Identity Management

---
 client/man/default.conf.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/man/default.conf.5 b/client/man/default.conf.5
index 728fc0871..6ec8616bc 100644
--- a/client/man/default.conf.5
+++ b/client/man/default.conf.5
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@@redhat.com>
 .\"
-.TH "default.conf" "5" "Feb 21 2011" "FreeIPA" "FreeIPA Manual Pages"
+.TH "default.conf" "5" "Feb 21 2011" "IPA" "IPA Manual Pages"
 .SH "NAME"
 default.conf \- IPA configuration file
 .SH "SYNOPSIS"
-- 
2.21.1

From ddf6ddd9a6b0482d01fce2df102f25d719adfa79 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 02/78] client/man/ipa-certupdate.1: Change branding to IPA and
 Identity Management

---
 client/man/ipa-certupdate.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/man/ipa-certupdate.1 b/client/man/ipa-certupdate.1
index d95790a36..431b395a9 100644
--- a/client/man/ipa-certupdate.1
+++ b/client/man/ipa-certupdate.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Jan Cholasta <jcholast@redhat.com>
 .\"
-.TH "ipa-certupdate" "1" "Jul 2 2014" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-certupdate" "1" "Jul 2 2014" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-certupdate \- Update local IPA certificate databases with certificates from the server
 .SH "SYNOPSIS"
-- 
2.21.1

From 100af01bbb2838c4c43159f4eaa925c57113baec Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 03/78] client/man/ipa-client-automount.1: Change branding to
 IPA and Identity Management

---
 client/man/ipa-client-automount.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/man/ipa-client-automount.1 b/client/man/ipa-client-automount.1
index 4c3caee93..3f6edabd0 100644
--- a/client/man/ipa-client-automount.1
+++ b/client/man/ipa-client-automount.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-client-automount" "1" "May 25 2012" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-client-automount" "1" "May 25 2012" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-client\-automount \- Configure automount and NFS for IPA
 .SH "SYNOPSIS"
-- 
2.21.1

From 497a46243f09fa8d8a295f61710065c675a91800 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 04/78] client/man/ipa-client-install.1: Change branding to IPA
 and Identity Management

---
 client/man/ipa-client-install.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/man/ipa-client-install.1 b/client/man/ipa-client-install.1
index 2d031fb2c..64ab1bff0 100644
--- a/client/man/ipa-client-install.1
+++ b/client/man/ipa-client-install.1
@@ -1,7 +1,7 @@
 .\" A man page for ipa-client-install
 .\" Copyright (C) 2008-2016  FreeIPA Contributors see COPYING for license
 .\"
-.TH "ipa-client-install" "1" "Dec 19 2016" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-client-install" "1" "Dec 19 2016" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-client\-install \- Configure an IPA client
 .SH "SYNOPSIS"
-- 
2.21.1

From 5d13b4528df055dee11ddd07c10a073b8ddd0065 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 05/78] client/man/ipa-getkeytab.1: Change branding to IPA and
 Identity Management

---
 client/man/ipa-getkeytab.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/man/ipa-getkeytab.1 b/client/man/ipa-getkeytab.1
index f06fcd910..01a2618ef 100644
--- a/client/man/ipa-getkeytab.1
+++ b/client/man/ipa-getkeytab.1
@@ -17,7 +17,7 @@
 .\" Author: Karl MacMillan <kmacmill@redhat.com>
 .\" Author: Simo Sorce <ssorce@redhat.com>
 .\"
-.TH "ipa-getkeytab" "1" "Oct 10 2007" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-getkeytab" "1" "Oct 10 2007" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-getkeytab \- Get a keytab for a Kerberos principal
 .SH "SYNOPSIS"
@@ -118,7 +118,7 @@ GSSAPI or EXTERNAL.
 \fB\-r\fR
 Retrieve mode. Retrieve an existing key from the server instead of generating a
 new one. This is incompatible with the \-\-password option, and will work only
-against a FreeIPA server more recent than version 3.3. The user requesting the
+against a IPA server more recent than version 3.3. The user requesting the
 keytab must have access to the keys for this operation to succeed.
 .SH "EXAMPLES"
 Add and retrieve a keytab for the NFS service principal on
-- 
2.21.1

From c89ccf3e9cf8868c19e12716dcff110b0cc040fc Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 06/78] client/man/ipa-join.1: Change branding to IPA and
 Identity Management

---
 client/man/ipa-join.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/man/ipa-join.1 b/client/man/ipa-join.1
index d88160784..30b667558 100644
--- a/client/man/ipa-join.1
+++ b/client/man/ipa-join.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-join" "1" "Oct 8 2009" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-join" "1" "Oct 8 2009" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-join \- Join a machine to an IPA realm and get a keytab for the host service principal
 .SH "SYNOPSIS"
-- 
2.21.1

From e691f8e132a0d7f12049015cf728e6ed1f3ca18b Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 07/78] client/man/ipa-rmkeytab.1: Change branding to IPA and
 Identity Management

---
 client/man/ipa-rmkeytab.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/man/ipa-rmkeytab.1 b/client/man/ipa-rmkeytab.1
index 53f775439..2c8218c94 100644
--- a/client/man/ipa-rmkeytab.1
+++ b/client/man/ipa-rmkeytab.1
@@ -17,7 +17,7 @@
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
 .\"
-.TH "ipa-rmkeytab" "1" "Oct 30 2009" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-rmkeytab" "1" "Oct 30 2009" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-rmkeytab \- Remove a kerberos principal from a keytab
 .SH "SYNOPSIS"
-- 
2.21.1

From 5bfab52a3246268a063d16700bf7063da56f3fa4 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 08/78] client/man/ipa.1: Change branding to IPA and Identity
 Management

---
 client/man/ipa.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/man/ipa.1 b/client/man/ipa.1
index f9fae7c0d..2fb21b52d 100644
--- a/client/man/ipa.1
+++ b/client/man/ipa.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Pavel Zuna <pzuna@redhat.com>
 .\"
-.TH "ipa" "1" "Apr 29 2016" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa" "1" "Apr 29 2016" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa \- IPA command\-line interface
 .SH "SYNOPSIS"
-- 
2.21.1

From e2387735f5a4b37cec1c850ac2725ed8ddf59322 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 09/78] install/html/ssbrowser.html: Change branding to IPA and
 Identity Management

---
 install/html/ssbrowser.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/html/ssbrowser.html b/install/html/ssbrowser.html
index a48a24511..f934dbb40 100644
--- a/install/html/ssbrowser.html
+++ b/install/html/ssbrowser.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-    <title>IPA: Identity Policy Audit</title>
+    <title>Identity Management</title>
     <script type="text/javascript" src="../ui/js/libs/loader.js"></script>
     <script type="text/javascript">
         var dojoConfig = {
@@ -69,7 +69,7 @@
 
     <nav class="navbar navbar-default navbar-pf" role="navigation">
     <div class="navbar-header">
-        <a class="brand" href="../ui/index.html"><img src="../ui/images/header-logo.png" alt="FreeIPA"></a>
+        <a class="brand" href="../ui/index.html"><img src="../ui/images/header-logo.png" alt="Identity Management"></a>
     </div>
     </nav>
 
-- 
2.21.1

From 10b4195ec2820ddbb67bcdb6a74a8f4aa20c12fe Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 10/78] install/html/unauthorized.html: Change branding to IPA
 and Identity Management

---
 install/html/unauthorized.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/html/unauthorized.html b/install/html/unauthorized.html
index 630982da8..b8c64d69d 100644
--- a/install/html/unauthorized.html
+++ b/install/html/unauthorized.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>IPA: Identity Policy Audit</title>
+    <title>Identity Management</title>
     <script type="text/javascript" src="../ui/js/libs/loader.js"></script>
     <script type="text/javascript">
         var dojoConfig = {
@@ -62,7 +62,7 @@
 
     <nav class="navbar navbar-default navbar-pf" role="navigation">
     <div class="navbar-header">
-        <a class="brand" href="../ui/index.html"><img src="../ui/images/header-logo.png" alt="FreeIPA"></a>
+        <a class="brand" href="../ui/index.html"><img src="../ui/images/header-logo.png" alt="Identity Management"></a>
     </div>
     </nav>
 
-- 
2.21.1

From 8293605a01b9b45d4ab87d7fd9342b9e832ba3ce Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 11/78] install/migration/index.html: Change branding to IPA
 and Identity Management

---
 install/migration/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/migration/index.html b/install/migration/index.html
index fca517cdc..b5ac1f6df 100644
--- a/install/migration/index.html
+++ b/install/migration/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-    <title>IPA: Identity Policy Audit</title>
+    <title>Identity Management</title>
 
     <!--[if IE]>
     <meta id="ie-detector">
-- 
2.21.1

From 6a479bab8581f2960a628d309a705d42ef9dfdbf Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 12/78] install/share/schema.d/README: Change branding to IPA
 and Identity Management

---
 install/share/schema.d/README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/share/schema.d/README b/install/share/schema.d/README
index 19e3e6832..2a92ec6ae 100644
--- a/install/share/schema.d/README
+++ b/install/share/schema.d/README
@@ -7,8 +7,8 @@ schema files during the run of ipa-server-upgrade utility. Therefore, they are
 also installed when upgrade happens within the process of ipa-server-install.
 
 The directory is installed as /usr/share/ipa/schema.d and is owned by a
-freeipa-server-common package. Therefore, a 3rd-party plugin would need to
-depend on the freeipa-server-common package if it delivers the schema file(s).
+ipa-server-common package. Therefore, a 3rd-party plugin would need to
+depend on the ipa-server-common package if it delivers the schema file(s).
 
 You may place your schema files in a subdirectory too, the code that loads
 schema files processes recursively all subdirectories of schema.d.
-- 
2.21.1

From c52b451a88bc8d18d1e08f237e5bcf648861c650 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 13/78] install/tools/ipa-adtrust-install.in: Change branding
 to IPA and Identity Management

---
 install/tools/ipa-adtrust-install.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/tools/ipa-adtrust-install.in b/install/tools/ipa-adtrust-install.in
index 7d94b718e..80f5d27a7 100644
--- a/install/tools/ipa-adtrust-install.in
+++ b/install/tools/ipa-adtrust-install.in
@@ -141,11 +141,11 @@ def main():
           "==============")
     print("This program will setup components needed to establish trust to "
           "AD domains for")
-    print("the FreeIPA Server.")
+    print("the IPA Server.")
     print("")
     print("This includes:")
     print("  * Configure Samba")
-    print("  * Add trust related objects to FreeIPA LDAP server")
+    print("  * Add trust related objects to IPA LDAP server")
     # TODO:
     # print "  * Add a SID to all users and Posix groups"
     print("")
-- 
2.21.1

From 7213f732557deb560aede21286abd2404a0e6f9e Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 14/78] install/tools/ipa-replica-conncheck.in: Change branding
 to IPA and Identity Management

---
 install/tools/ipa-replica-conncheck.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/ipa-replica-conncheck.in b/install/tools/ipa-replica-conncheck.in
index b22db1139..b86ce4569 100644
--- a/install/tools/ipa-replica-conncheck.in
+++ b/install/tools/ipa-replica-conncheck.in
@@ -290,7 +290,7 @@ class PortResponder(threading.Thread):
         self._sockets = []
         self._close = False
         self._close_lock = threading.Lock()
-        self.responder_data = b'FreeIPA'
+        self.responder_data = b'IPA'
         self.ports_opened = False
         self.ports_open_cond = threading.Condition()
 
-- 
2.21.1

From 1f2a34a5fcb88b3ca94949a513523eb3862e99c1 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 15/78] install/tools/man/ipa-adtrust-install.1: Change
 branding to IPA and Identity Management

---
 install/tools/man/ipa-adtrust-install.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/tools/man/ipa-adtrust-install.1 b/install/tools/man/ipa-adtrust-install.1
index b11065806..f70f316f6 100644
--- a/install/tools/man/ipa-adtrust-install.1
+++ b/install/tools/man/ipa-adtrust-install.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Sumit Bose <sbose@redhat.com>
 .\"
-.TH "ipa-adtrust-install" "1" "April 11 2017" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-adtrust-install" "1" "April 11 2017" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-adtrust\-install \- Prepare an IPA server to be able to establish trust relationships with AD domains
 .SH "SYNOPSIS"
@@ -87,7 +87,7 @@ ldapmodify command info the directory server.
 .TP
 \fB\-\-add\-agents\fR
 Add IPA masters to the list that allows to serve information about
-users from trusted forests. Starting with FreeIPA 4.2, a regular IPA master
+users from trusted forests. Starting with IPA 4.2, a regular IPA master
 can provide this information to SSSD clients. IPA masters aren't added
 to the list automatically as restart of the LDAP service on each of them
 is required. The host where ipa\-adtrust\-install is being run is added
-- 
2.21.1

From 5742d0b0fa19dc744f81aeed6727c472d2e5505f Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
Subject: [PATCH 16/78] install/tools/man/ipa-advise.1: Change branding to IPA
 and Identity Management

---
 install/tools/man/ipa-advise.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/tools/man/ipa-advise.1 b/install/tools/man/ipa-advise.1
index 4c494aab9..515bbddbe 100644
--- a/install/tools/man/ipa-advise.1
+++ b/install/tools/man/ipa-advise.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Tomas Babej <tbabej@redhat.com>
 .\"
-.TH "ipa-advise" "1" "Jun 10 2013" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-advise" "1" "Jun 10 2013" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-advise \- Provide configurations advice for various use cases.
 .SH "SYNOPSIS"
@@ -41,4 +41,4 @@ Log to the given file
 .SH "EXIT STATUS"
 0 if the command was successful
 
-1 if an error occurred
\ No newline at end of file
+1 if an error occurred
-- 
2.21.1

From 650e5f89bb097c559b52a961866296380f3f94d5 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 17/78] install/tools/man/ipa-backup.1: Change branding to IPA
 and Identity Management

---
 install/tools/man/ipa-backup.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-backup.1 b/install/tools/man/ipa-backup.1
index 2f0bc9e6a..77d5d7caa 100644
--- a/install/tools/man/ipa-backup.1
+++ b/install/tools/man/ipa-backup.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-backup" "1" "Mar 22 2013" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-backup" "1" "Mar 22 2013" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-backup \- Back up an IPA master
 .SH "SYNOPSIS"
-- 
2.21.1

From f8849ddf92e83d23b0c317b1c5f59ad9af1e3e1c Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 18/78] install/tools/man/ipa-ca-install.1: Change branding to
 IPA and Identity Management

---
 install/tools/man/ipa-ca-install.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-ca-install.1 b/install/tools/man/ipa-ca-install.1
index 3ebe32c0a..8e57c0092 100644
--- a/install/tools/man/ipa-ca-install.1
+++ b/install/tools/man/ipa-ca-install.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-ca-install" "1" "Mar 30 2017" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-ca-install" "1" "Mar 30 2017" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-ca\-install \- Install a CA on a server
 .SH "SYNOPSIS"
-- 
2.21.1

From 625ae452bc457003c9f4559884abb9afa2bb41ca Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 19/78] install/tools/man/ipa-cacert-manage.1: Change branding
 to IPA and Identity Management

---
 install/tools/man/ipa-cacert-manage.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-cacert-manage.1 b/install/tools/man/ipa-cacert-manage.1
index b76ee1816..4359b12e3 100644
--- a/install/tools/man/ipa-cacert-manage.1
+++ b/install/tools/man/ipa-cacert-manage.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Jan Cholasta <jcholast@redhat.com>
 .\"
-.TH "ipa-cacert-manage" "1" "Aug 12 2013" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-cacert-manage" "1" "Aug 12 2013" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-cacert\-manage \- Manage CA certificates in IPA
 .SH "SYNOPSIS"
-- 
2.21.1

From 13ebf098b64a5aefd39aac7a1eef1367170bc284 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 20/78] install/tools/man/ipa-compat-manage.1: Change branding
 to IPA and Identity Management

---
 install/tools/man/ipa-compat-manage.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-compat-manage.1 b/install/tools/man/ipa-compat-manage.1
index f22b1743e..26470331a 100644
--- a/install/tools/man/ipa-compat-manage.1
+++ b/install/tools/man/ipa-compat-manage.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Simo Sorce <ssorce@redhat.com>
 .\"
-.TH "ipa-compat-manage" "1" "Dec 2 2008" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-compat-manage" "1" "Dec 2 2008" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-compat\-manage \- Enables or disables the schema compatibility plugin
 .SH "SYNOPSIS"
-- 
2.21.1

From 2dfc9079680b04f286eeed4f65ce4f02914c55b7 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 21/78] install/tools/man/ipa-csreplica-manage.1: Change
 branding to IPA and Identity Management

---
 install/tools/man/ipa-csreplica-manage.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-csreplica-manage.1 b/install/tools/man/ipa-csreplica-manage.1
index ab5bfddd8..6d039751e 100644
--- a/install/tools/man/ipa-csreplica-manage.1
+++ b/install/tools/man/ipa-csreplica-manage.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-csreplica-manage" "1" "Jul 14 2011" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-csreplica-manage" "1" "Jul 14 2011" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-csreplica\-manage \- Manage an IPA CS replica
 .SH "SYNOPSIS"
-- 
2.21.1

From 4858e90ba2b7aca2af1e2375b2442b3fa5c30f9c Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 22/78] install/tools/man/ipa-dns-install.1: Change branding to
 IPA and Identity Management

---
 install/tools/man/ipa-dns-install.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/tools/man/ipa-dns-install.1 b/install/tools/man/ipa-dns-install.1
index 14e4cd51f..029001eca 100644
--- a/install/tools/man/ipa-dns-install.1
+++ b/install/tools/man/ipa-dns-install.1
@@ -1,7 +1,7 @@
 .\" A man page for ipa-dns-install
 .\" Copyright (C) 2010-2016  FreeIPA Contributors see COPYING for license
 .\"
-.TH "ipa-dns-install" "1" "Jun 28, 2012" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-dns-install" "1" "Jun 28, 2012" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-dns\-install \- Add DNS as a service to an IPA server
 .SH "SYNOPSIS"
@@ -12,7 +12,7 @@ In cases where the IPA server name does not belong to the primary DNS domain and
 
 IPA provides an integrated DNS server which can be used to simplify IPA deployment. If you decide to use it, IPA will automatically maintain SRV and other service records when you change your topology.
 
-The DNS component in FreeIPA is optional and you may choose to manage all your DNS records manually on another third party DNS server. IPA DNS is not a general-purpose DNS server. If you need advanced features like DNS views, do not deploy IPA DNS.
+The DNS component in IPA is optional and you may choose to manage all your DNS records manually on another third party DNS server. IPA DNS is not a general-purpose DNS server. If you need advanced features like DNS views, do not deploy IPA DNS.
 
 This command requires that an IPA server is already installed and configured.
 
-- 
2.21.1

From aeb6e9ae2e4ebf5d627e80f0a495a45589c0455f Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 23/78] install/tools/man/ipa-kra-install.1: Change branding to
 IPA and Identity Management

---
 install/tools/man/ipa-kra-install.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-kra-install.1 b/install/tools/man/ipa-kra-install.1
index 6c8523aa0..5476a4e71 100644
--- a/install/tools/man/ipa-kra-install.1
+++ b/install/tools/man/ipa-kra-install.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Ade Lee <alee@redhat.com>
 .\"
-.TH "ipa-kra-install" "1" "May 10 2017" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-kra-install" "1" "May 10 2017" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-kra\-install \- Install a KRA on a server
 .SH "SYNOPSIS"
-- 
2.21.1

From d71a89b2b1ebe588672e76f04c7edd6d7a287837 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 24/78] install/tools/man/ipa-ldap-updater.1: Change branding
 to IPA and Identity Management

---
 install/tools/man/ipa-ldap-updater.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-ldap-updater.1 b/install/tools/man/ipa-ldap-updater.1
index 4893802c2..7ead55bd9 100644
--- a/install/tools/man/ipa-ldap-updater.1
+++ b/install/tools/man/ipa-ldap-updater.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-ldap-updater" "1" "Sep 12 2008" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-ldap-updater" "1" "Sep 12 2008" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-ldap\-updater \- Update the IPA LDAP configuration
 .SH "SYNOPSIS"
-- 
2.21.1

From acdf99fd7afbfd614b2db75bddf647ad12d2767f Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 25/78] install/tools/man/ipa-managed-entries.1: Change
 branding to IPA and Identity Management

---
 install/tools/man/ipa-managed-entries.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-managed-entries.1 b/install/tools/man/ipa-managed-entries.1
index 3d5ca22b8..edaa0a90d 100644
--- a/install/tools/man/ipa-managed-entries.1
+++ b/install/tools/man/ipa-managed-entries.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Jr Aquino <jr.aquino@citrix.com>
 .\"
-.TH "ipa-managed-entries" "1" "Feb 06 2012" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-managed-entries" "1" "Feb 06 2012" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-managed\-entries \- Enables or disables the schema Managed Entry plugins
 .SH "SYNOPSIS"
-- 
2.21.1

From 2cbdc087d8f18733d36e60788faddef5a914821a Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 26/78] install/tools/man/ipa-nis-manage.1: Change branding to
 IPA and Identity Management

---
 install/tools/man/ipa-nis-manage.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-nis-manage.1 b/install/tools/man/ipa-nis-manage.1
index 93278487c..1107b7790 100644
--- a/install/tools/man/ipa-nis-manage.1
+++ b/install/tools/man/ipa-nis-manage.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-nis-manage" "1" "April 25 2016" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-nis-manage" "1" "April 25 2016" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-nis\-manage \- Enables or disables the NIS listener plugin
 .SH "SYNOPSIS"
-- 
2.21.1

From 3af61d4b26532726492bc7d121ec8b39bb68dce6 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 27/78] install/tools/man/ipa-otptoken-import.1: Change
 branding to IPA and Identity Management

---
 install/tools/man/ipa-otptoken-import.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-otptoken-import.1 b/install/tools/man/ipa-otptoken-import.1
index 920a08ca2..fe91040fa 100644
--- a/install/tools/man/ipa-otptoken-import.1
+++ b/install/tools/man/ipa-otptoken-import.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Nathaniel McCallum <npmccallum@redhat.com>
 .\"
-.TH "ipa-otptoken-import" "1" "Jun 12 2014" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-otptoken-import" "1" "Jun 12 2014" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-otptoken\-import \- Imports OTP tokens from RFC 6030 XML file
 .SH "SYNOPSIS"
-- 
2.21.1

From 426c1370d990dcd44612427abc75f8b21178f279 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 28/78] install/tools/man/ipa-pkinit-manage.1: Change branding
 to IPA and Identity Management

---
 install/tools/man/ipa-pkinit-manage.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-pkinit-manage.1 b/install/tools/man/ipa-pkinit-manage.1
index 5018ce8aa..50d63e921 100644
--- a/install/tools/man/ipa-pkinit-manage.1
+++ b/install/tools/man/ipa-pkinit-manage.1
@@ -1,7 +1,7 @@
 .\"
 .\" Copyright (C) 2017  FreeIPA Contributors see COPYING for license
 .\"
-.TH "ipa-pkinit-manage" "1" "Jun 05 2017" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-pkinit-manage" "1" "Jun 05 2017" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-pkinit\-manage \- Enables or disables PKINIT
 .SH "SYNOPSIS"
-- 
2.21.1

From 7553161cbb48d42e76babe540ae878d328cb462b Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 29/78] install/tools/man/ipa-replica-conncheck.1: Change
 branding to IPA and Identity Management

---
 install/tools/man/ipa-replica-conncheck.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-replica-conncheck.1 b/install/tools/man/ipa-replica-conncheck.1
index 6451f3545..ed441e3be 100644
--- a/install/tools/man/ipa-replica-conncheck.1
+++ b/install/tools/man/ipa-replica-conncheck.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Martin Kosek <mkosek@redhat.com>
 .\"
-.TH "ipa-replica-conncheck" "1" "Jun 2 2011" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-replica-conncheck" "1" "Jun 2 2011" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-replica\-conncheck \- Check a replica\-master network connection before installation
 .SH "SYNOPSIS"
-- 
2.21.1

From 3676e1a1040aa6ae858134828cfcd7b35e74d4f5 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 30/78] install/tools/man/ipa-replica-install.1: Change
 branding to IPA and Identity Management

---
 install/tools/man/ipa-replica-install.1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/tools/man/ipa-replica-install.1 b/install/tools/man/ipa-replica-install.1
index 19d1d9110..44fce10ba 100644
--- a/install/tools/man/ipa-replica-install.1
+++ b/install/tools/man/ipa-replica-install.1
@@ -1,7 +1,7 @@
 .\" A man page for ipa-replica-install
 .\" Copyright (C) 2008-2016  FreeIPA Contributors see COPYING for license
 .\"
-.TH "ipa-replica-install" "1" "Dec 19 2016" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-replica-install" "1" "Dec 19 2016" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-replica\-install \- Create an IPA replica
 .SH "SYNOPSIS"
@@ -12,7 +12,7 @@ Configures a new IPA server that is a replica of the server. Once it has been cr
 
 Domain level 0 is not supported anymore.
 
-To create a replica, the machine only needs to be enrolled in the FreeIPA domain first. This process of turning the IPA client into a replica is also referred to as replica promotion.
+To create a replica, the machine only needs to be enrolled in the IPA domain first. This process of turning the IPA client into a replica is also referred to as replica promotion.
 
 If you're starting with an existing IPA client, simply run ipa\-replica\-install to have it promoted into a replica. The NTP configuration cannot be updated during client promotion. 
 
@@ -229,7 +229,7 @@ ldapmodify command info the directory server.
 .TP
 \fB\-\-add\-agents\fR
 Add IPA masters to the list that allows to serve information about
-users from trusted forests. Starting with FreeIPA 4.2, a regular IPA master
+users from trusted forests. Starting with IPA 4.2, a regular IPA master
 can provide this information to SSSD clients. IPA masters aren't added
 to the list automatically as restart of the LDAP service on each of them
 is required. The host where ipa\-adtrust\-install is being run is added
-- 
2.21.1

From 139ddf89255aa4423499208d5b4191dbc7b829dd Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 31/78] install/tools/man/ipa-replica-manage.1: Change branding
 to IPA and Identity Management

---
 install/tools/man/ipa-replica-manage.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-replica-manage.1 b/install/tools/man/ipa-replica-manage.1
index 239f1591c..2c94278ca 100644
--- a/install/tools/man/ipa-replica-manage.1
+++ b/install/tools/man/ipa-replica-manage.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-replica-manage" "1" "Jul 12 2016" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-replica-manage" "1" "Jul 12 2016" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-replica\-manage \- Manage an IPA replica
 .SH "SYNOPSIS"
-- 
2.21.1

From 773bf31555e662f24f807e4b69b8dcf1f88e3f83 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 32/78] install/tools/man/ipa-restore.1: Change branding to IPA
 and Identity Management

---
 install/tools/man/ipa-restore.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-restore.1 b/install/tools/man/ipa-restore.1
index 5843d5546..bc0755baa 100644
--- a/install/tools/man/ipa-restore.1
+++ b/install/tools/man/ipa-restore.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-restore" "1" "Mar 22 2013" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-restore" "1" "Mar 22 2013" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-restore \- Restore an IPA master
 .SH "SYNOPSIS"
-- 
2.21.1

From c00d47be96e91102bf3eeecf0a2363cf21f260eb Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 33/78] install/tools/man/ipa-server-certinstall.1: Change
 branding to IPA and Identity Management

---
 install/tools/man/ipa-server-certinstall.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-server-certinstall.1 b/install/tools/man/ipa-server-certinstall.1
index 79bd7c885..3f12a5af2 100644
--- a/install/tools/man/ipa-server-certinstall.1
+++ b/install/tools/man/ipa-server-certinstall.1
@@ -16,7 +16,7 @@
 .\" 
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\" 
-.TH "ipa-server-certinstall" "1" "Mar 14 2008" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-server-certinstall" "1" "Mar 14 2008" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-server\-certinstall \- Install new SSL server certificates
 .SH "SYNOPSIS"
-- 
2.21.1

From b95e2315685e4142b7f0d5ea1fdaa7b4a1b2a9d7 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 34/78] install/tools/man/ipa-server-install.1: Change branding
 to IPA and Identity Management

---
 install/tools/man/ipa-server-install.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1
index 1a4d2f658..fdb0f4cb3 100644
--- a/install/tools/man/ipa-server-install.1
+++ b/install/tools/man/ipa-server-install.1
@@ -1,7 +1,7 @@
 .\" A man page for ipa-server-install
 .\" Copyright (C) 2008-2017  FreeIPA Contributors see COPYING for license
 .\"
-.TH "ipa-server-install" "1" "Feb 17 2017" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-server-install" "1" "Feb 17 2017" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-server\-install \- Configure an IPA server
 .SH "SYNOPSIS"
@@ -172,7 +172,7 @@ Install and configure a KRA on this server.
 .SS "DNS OPTIONS"
 IPA provides an integrated DNS server which can be used to simplify IPA deployment. If you decide to use it, IPA will automatically maintain SRV and other service records when you change your topology.
 
-The DNS component in FreeIPA is optional and you may choose to manage all your DNS records manually on another third party DNS server. IPA DNS is not a general-purpose DNS server. If you need advanced features like DNS views, do not deploy IPA DNS.
+The DNS component in IPA is optional and you may choose to manage all your DNS records manually on another third party DNS server. IPA DNS is not a general-purpose DNS server. If you need advanced features like DNS views, do not deploy IPA DNS.
 
 .TP
 \fB\-\-setup\-dns\fR
-- 
2.21.1

From e63c333515020e37c3be9a9e2a3f67304badad2e Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 35/78] install/tools/man/ipa-server-upgrade.1: Change branding
 to IPA and Identity Management

---
 install/tools/man/ipa-server-upgrade.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-server-upgrade.1 b/install/tools/man/ipa-server-upgrade.1
index cbbdc5901..3db19b0f1 100644
--- a/install/tools/man/ipa-server-upgrade.1
+++ b/install/tools/man/ipa-server-upgrade.1
@@ -2,7 +2,7 @@
 .\" Copyright (C) 2015  FreeIPA Contributors see COPYING for license
 .\"
 
-.TH "ipa-server-upgrade" "1" "April 02 2015" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-server-upgrade" "1" "April 02 2015" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-server\-upgrade \- upgrade IPA server
 .SH "SYNOPSIS"
-- 
2.21.1

From 7dfbdf73de322616cc6235db57bd8f3fd0805ac5 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 36/78] install/tools/man/ipa-winsync-migrate.1: Change
 branding to IPA and Identity Management

---
 install/tools/man/ipa-winsync-migrate.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipa-winsync-migrate.1 b/install/tools/man/ipa-winsync-migrate.1
index 88702bad6..1812f6348 100644
--- a/install/tools/man/ipa-winsync-migrate.1
+++ b/install/tools/man/ipa-winsync-migrate.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Tomas Babej <tbabej@redhat.com>
 .\"
-.TH "ipa-winsync-migrate" "1" "Mar 10 2015" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-winsync-migrate" "1" "Mar 10 2015" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-winsync\-migrate \- Seamless migration of AD users created by winsync to native AD users.
 .SH "SYNOPSIS"
-- 
2.21.1

From 79d8cc19a6a65a00006ded393bc7b1716522bca1 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 37/78] install/tools/man/ipactl.8: Change branding to IPA and
 Identity Management

---
 install/tools/man/ipactl.8 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/man/ipactl.8 b/install/tools/man/ipactl.8
index fb533aae2..d7aaaf8ed 100644
--- a/install/tools/man/ipactl.8
+++ b/install/tools/man/ipactl.8
@@ -16,7 +16,7 @@
 .\" 
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\" 
-.TH "ipactl" "8" "Mar 14 2008" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipactl" "8" "Mar 14 2008" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipactl \- IPA Server Control Interface
 .SH "SYNOPSIS"
-- 
2.21.1

From a4ee86f8c53ebb9dbec7ffd75a40f06c8104ad9a Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 38/78] install/ui/css/patternfly.css: Change branding to IPA
 and Identity Management

---
 install/ui/css/patternfly.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/ui/css/patternfly.css b/install/ui/css/patternfly.css
index ee920530b..de574a84c 100644
--- a/install/ui/css/patternfly.css
+++ b/install/ui/css/patternfly.css
@@ -4,4 +4,4 @@
  *
  * Copyright 2013 bootstrap-select
  * Licensed under the MIT license
- */.bootstrap-select.btn-group,.bootstrap-select.btn-group[class*=span]{float:none;display:inline-block;margin-bottom:10px;margin-left:0}.form-horizontal .bootstrap-select.btn-group,.form-inline .bootstrap-select.btn-group,.form-search .bootstrap-select.btn-group{margin-bottom:0}.bootstrap-select.form-control{margin-bottom:0;padding:0;border:none}.bootstrap-select.btn-group.pull-right,.bootstrap-select.btn-group[class*=span].pull-right,.row-fluid .bootstrap-select.btn-group[class*=span].pull-right{float:right}.input-append .bootstrap-select.btn-group{margin-left:-1px}.input-prepend .bootstrap-select.btn-group{margin-right:-1px}.bootstrap-select:not([class*=span]):not([class*=col-]):not([class*=form-control]){width:220px}.bootstrap-select{width:220px\9}.bootstrap-select.form-control:not([class*=span]){width:100%}.bootstrap-select>.btn{width:100%}.error .bootstrap-select .btn{border:1px solid #b94a48}.dropdown-menu{z-index:2000}.bootstrap-select.show-menu-arrow.open>.btn{z-index:2051}.bootstrap-select .btn:focus{outline:thin dotted #333!important;outline:5px auto -webkit-focus-ring-color!important;outline-offset:-2px}.bootstrap-select.btn-group .btn .filter-option{overflow:hidden;position:absolute;left:12px;right:25px;text-align:left}.bootstrap-select.btn-group .btn .caret{position:absolute;top:50%;right:12px;margin-top:-2px;vertical-align:middle}.bootstrap-select.btn-group .dropdown-menu li.disabled>a,.bootstrap-select.btn-group>.disabled{cursor:not-allowed}.bootstrap-select.btn-group>.disabled:focus{outline:0!important}.bootstrap-select.btn-group[class*=span] .btn{width:100%}.bootstrap-select.btn-group .dropdown-menu{min-width:100%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.bootstrap-select.btn-group .dropdown-menu.inner{position:static;border:0;padding:0;margin:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.bootstrap-select.btn-group .dropdown-menu dt{display:block;padding:3px 20px;cursor:default}.bootstrap-select.btn-group .div-contain{overflow:hidden}.bootstrap-select.btn-group .dropdown-menu li{position:relative}.bootstrap-select.btn-group .dropdown-menu li>a.opt{position:relative;padding-left:35px}.bootstrap-select.btn-group .dropdown-menu li>a{cursor:pointer}.bootstrap-select.btn-group .dropdown-menu li>dt small{font-weight:400}.bootstrap-select.btn-group.show-tick .dropdown-menu li.selected a i.check-mark{display:inline-block;position:absolute;right:15px;margin-top:2.5px}.bootstrap-select.btn-group .dropdown-menu li a i.check-mark{display:none}.bootstrap-select.btn-group.show-tick .dropdown-menu li a span.text{margin-right:34px}.bootstrap-select.btn-group .dropdown-menu li small{padding-left:.5em}.bootstrap-select.btn-group .dropdown-menu li.active:not(.disabled)>a small,.bootstrap-select.btn-group .dropdown-menu li:not(.disabled)>a:focus small,.bootstrap-select.btn-group .dropdown-menu li:not(.disabled)>a:hover small{color:#64b1d8;color:rgba(255,255,255,.4)}.bootstrap-select.btn-group .dropdown-menu li>dt small{font-weight:400}.bootstrap-select.show-menu-arrow .dropdown-toggle:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #CCC;border-bottom-color:rgba(0,0,0,.2);position:absolute;bottom:-4px;left:9px;display:none}.bootstrap-select.show-menu-arrow .dropdown-toggle:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;bottom:-4px;left:10px;display:none}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:before{bottom:auto;top:-3px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,.2)}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:after{bottom:auto;top:-3px;border-top:6px solid #fff;border-bottom:0}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:before{right:12px;left:auto}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:after{right:13px;left:auto}.bootstra
\ No newline at end of file
+ */.bootstrap-select.btn-group,.bootstrap-select.btn-group[class*=span]{float:none;display:inline-block;margin-bottom:10px;margin-left:0}.form-horizontal .bootstrap-select.btn-group,.form-inline .bootstrap-select.btn-group,.form-search .bootstrap-select.btn-group{margin-bottom:0}.bootstrap-select.form-control{margin-bottom:0;padding:0;border:none}.bootstrap-select.btn-group.pull-right,.bootstrap-select.btn-group[class*=span].pull-right,.row-fluid .bootstrap-select.btn-group[class*=span].pull-right{float:right}.input-append .bootstrap-select.btn-group{margin-left:-1px}.input-prepend .bootstrap-select.btn-group{margin-right:-1px}.bootstrap-select:not([class*=span]):not([class*=col-]):not([class*=form-control]){width:220px}.bootstrap-select{width:220px\9}.bootstrap-select.form-control:not([class*=span]){width:100%}.bootstrap-select>.btn{width:100%}.error .bootstrap-select .btn{border:1px solid #b94a48}.dropdown-menu{z-index:2000}.bootstrap-select.show-menu-arrow.open>.btn{z-index:2051}.bootstrap-select .btn:focus{outline:thin dotted #333!important;outline:5px auto -webkit-focus-ring-color!important;outline-offset:-2px}.bootstrap-select.btn-group .btn .filter-option{overflow:hidden;position:absolute;left:12px;right:25px;text-align:left}.bootstrap-select.btn-group .btn .caret{position:absolute;top:50%;right:12px;margin-top:-2px;vertical-align:middle}.bootstrap-select.btn-group .dropdown-menu li.disabled>a,.bootstrap-select.btn-group>.disabled{cursor:not-allowed}.bootstrap-select.btn-group>.disabled:focus{outline:0!important}.bootstrap-select.btn-group[class*=span] .btn{width:100%}.bootstrap-select.btn-group .dropdown-menu{min-width:100%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.bootstrap-select.btn-group .dropdown-menu.inner{position:static;border:0;padding:0;margin:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.bootstrap-select.btn-group .dropdown-menu dt{display:block;padding:3px 20px;cursor:default}.bootstrap-select.btn-group .div-contain{overflow:hidden}.bootstrap-select.btn-group .dropdown-menu li{position:relative}.bootstrap-select.btn-group .dropdown-menu li>a.opt{position:relative;padding-left:35px}.bootstrap-select.btn-group .dropdown-menu li>a{cursor:pointer}.bootstrap-select.btn-group .dropdown-menu li>dt small{font-weight:400}.bootstrap-select.btn-group.show-tick .dropdown-menu li.selected a i.check-mark{display:inline-block;position:absolute;right:15px;margin-top:2.5px}.bootstrap-select.btn-group .dropdown-menu li a i.check-mark{display:none}.bootstrap-select.btn-group.show-tick .dropdown-menu li a span.text{margin-right:34px}.bootstrap-select.btn-group .dropdown-menu li small{padding-left:.5em}.bootstrap-select.btn-group .dropdown-menu li.active:not(.disabled)>a small,.bootstrap-select.btn-group .dropdown-menu li:not(.disabled)>a:focus small,.bootstrap-select.btn-group .dropdown-menu li:not(.disabled)>a:hover small{color:#64b1d8;color:rgba(255,255,255,.4)}.bootstrap-select.btn-group .dropdown-menu li>dt small{font-weight:400}.bootstrap-select.show-menu-arrow .dropdown-toggle:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #CCC;border-bottom-color:rgba(0,0,0,.2);position:absolute;bottom:-4px;left:9px;display:none}.bootstrap-select.show-menu-arrow .dropdown-toggle:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;bottom:-4px;left:10px;display:none}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:before{bottom:auto;top:-3px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,.2)}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:after{bottom:auto;top:-3px;border-top:6px solid #fff;border-bottom:0}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:before{right:12px;left:auto}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:after{right:13px;left:auto}.bootstra
\ No newline at end of file
-- 
2.21.1

From 751cb8d5cb432bcb9d5c7ada7c365a12ca6a95ee Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 39/78] install/ui/index.html: Change branding to IPA and
 Identity Management

---
 install/ui/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/ui/index.html b/install/ui/index.html
index bc0f0cd1e..d1eacaf53 100644
--- a/install/ui/index.html
+++ b/install/ui/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>IPA: Identity Policy Audit</title>
+    <title>Identity Management</title>
 
     <!--[if IE]>
     <meta id="ie-detector">
-- 
2.21.1

From 8a4169a5d81b3c2376081d61a3beaf6601e318cf Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 40/78] install/ui/less/brand.less: Change branding to IPA and
 Identity Management

---
 install/ui/less/brand.less | 103 ++++++++++++++++++-------------------
 1 file changed, 50 insertions(+), 53 deletions(-)

diff --git a/install/ui/less/brand.less b/install/ui/less/brand.less
index c9030bb0b..7488eaf91 100644
--- a/install/ui/less/brand.less
+++ b/install/ui/less/brand.less
@@ -20,58 +20,55 @@
 
 // this file should be overridden with brand/platform specific content
 
-@login-details-border: #777777;
+@img-badge-ie8-height:                                              44px;
+@img-badge-ie8-width:                                               137px;
+// @img-bg-login:                                                      "bg-login.png";
+// @img-bg-login-2:                                                    "bg-login-2.png";
+@login-bg-color:                                                    #1a1a1a;
+@login-container-bg-color:                                          transparent;
+@login-container-bg-color-rgba:                                     transparent;
+@navbar-pf-bg-color:                                                #393F45;
+@navbar-pf-border-color:                                            #cc0000;
+@navbar-pf-active-color:                                            #fff;
+@navbar-pf-color:                                                   #dbdada;
+@navbar-pf-icon-bar-bg-color:                                       #fff;
+@navbar-pf-navbar-header-border-color:                              #53565b;
+@navbar-pf-navbar-nav-active-bg-color:                              #454C53;
+@navbar-pf-navbar-nav-active-active-bg-color:                       #3c434a;
+@navbar-pf-navbar-nav-active-active-open-bg-color:                  #424950;
+@navbar-pf-navbar-navbar-brand-min-width:                           300px;
+@navbar-pf-navbar-navbar-brand-padding:                             7px 0 8px;
+@navbar-pf-navbar-navbar-persistent-bg-color:                       #f6f6f6;
+@navbar-pf-navbar-navbar-persistent-border-color:                   #cecdcd;
+@navbar-pf-navbar-primary-active-bg-color-start:                    #72757a;
+@navbar-pf-navbar-primary-active-bg-color-stop:                     #64686c;
+@navbar-pf-navbar-primary-active-border-color:                      #949699;
+@navbar-pf-navbar-primary-bg-color-start:                           #474c50;
+@navbar-pf-navbar-primary-bg-color-stop:                            #383f43;
+@navbar-pf-navbar-primary-hover-bg-color-start:                     #5c6165;
+@navbar-pf-navbar-primary-hover-bg-color-stop:                      #4b5053;
+@navbar-pf-navbar-primary-hover-border-color:                       #949699;
+@navbar-pf-navbar-primary-context-active-bg-color-start:            #6b7175;
+@navbar-pf-navbar-primary-context-active-bg-color-stop:             #65696d;
+@navbar-pf-navbar-primary-context-active-border-color:              #6e7276;
+@navbar-pf-navbar-primary-context-active-border-right-color:        #777a7e;
+@navbar-pf-navbar-primary-context-active-border-top-color:          #767a7e;
+@navbar-pf-navbar-primary-context-bg-color-start:                   #585d61;
+@navbar-pf-navbar-primary-context-bg-color-stop:                    #505458;
+@navbar-pf-navbar-primary-context-border-color:                     #65696d;
+@navbar-pf-navbar-primary-context-border-top-color:                 #64696d;
+@navbar-pf-navbar-primary-context-hover-bg-color-start:             #62676b;
+@navbar-pf-navbar-primary-context-hover-bg-color-stop:              #5a5e62;
+@navbar-pf-navbar-primary-context-hover-border-color:               #6e7276;
+@navbar-pf-navbar-primary-context-hover-border-top-color:           #6c7276;
+@navbar-pf-navbar-utility-border-color:                             #53565b;
+@navbar-pf-navbar-utility-color:                                    #fff;
+@navbar-pf-navbar-utility-hover-bg-color:                           #4a5053;
+@navbar-pf-navbar-utility-hover-border-color:                       #636466;
+@navbar-pf-navbar-utility-open-bg-color:                            #5b6165;
+@navbar-pf-navbar-utility-open-border-color:                        #6c6e70;
 
-.login-pf {
-
-    .login-pf-body {
-        padding-top: 50px;
-    }
-
-    #badge img {
-        display: none;
-    }
-
-    #brand {
-        position: absolute;
-        top: -135px;
-        img {
-            height: auto;
-        }
-    }
-
-    .container {
-        padding-top: 40px;
-
-        .details p:first-child {
-            border-top: 1px solid @login-details-border;
-        }
-    }
-}
-
-// 768px == @screen-sm-min
-@media (min-width: 768px) {
-    .navbar-pf .navbar-brand {
-        padding: 2px 0 3px;
-    }
-
-    .login-pf .container .details {
-        p:first-child {
-            border-top: 0;
-        }
-        border-left: 1px solid @login-details-border;
-    }
-}
-
-@media (max-height: 520px) {
-    .reset-login-pf-height;
-    .login-pf {
-        .login-pf-body {
-            padding-top: 0;
-        }
-        #badge {
-            margin-top: 0;
-            height: 70px;
-        }
-    }
+.info-page .navbar-header {
+    line-height: inherit;
+    margin-left: 20px;
 }
\ No newline at end of file
-- 
2.21.1

From 2946405ea45ea7163c520c367f764808f112d7f2 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 41/78] install/ui/less/patternfly.less: Change branding to IPA
 and Identity Management

---
 install/ui/less/patternfly.less | 48 +++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/install/ui/less/patternfly.less b/install/ui/less/patternfly.less
index a2e30c85b..97a8d5c26 100644
--- a/install/ui/less/patternfly.less
+++ b/install/ui/less/patternfly.less
@@ -129,3 +129,51 @@
 
 // our overrides
 @fa-font-path:        "../fonts/fontawesome";
+
+@img-badge-ie8-height:                                              44px;
+@img-badge-ie8-width:                                               137px;
+// @img-bg-login:                                                      "bg-login.png";
+// @img-bg-login-2:                                                    "bg-login-2.png";
+@login-bg-color:                                                    #1a1a1a;
+@login-container-bg-color:                                          transparent;
+@login-container-bg-color-rgba:                                     transparent;
+@navbar-pf-bg-color:                                                #393F45;
+@navbar-pf-border-color:                                            #cc0000;
+@navbar-pf-active-color:                                            #fff;
+@navbar-pf-color:                                                   #dbdada;
+@navbar-pf-icon-bar-bg-color:                                       #fff;
+@navbar-pf-navbar-header-border-color:                              #53565b;
+@navbar-pf-navbar-nav-active-bg-color:                              #454C53;
+@navbar-pf-navbar-nav-active-active-bg-color:                       #3c434a;
+@navbar-pf-navbar-nav-active-active-open-bg-color:                  #424950;
+@navbar-pf-navbar-navbar-brand-min-width:                           300px;
+@navbar-pf-navbar-navbar-brand-padding:                             7px 0 8px;
+@navbar-pf-navbar-navbar-persistent-bg-color:                       #f6f6f6;
+@navbar-pf-navbar-navbar-persistent-border-color:                   #cecdcd;
+@navbar-pf-navbar-primary-active-bg-color-start:                    #72757a;
+@navbar-pf-navbar-primary-active-bg-color-stop:                     #64686c;
+@navbar-pf-navbar-primary-active-border-color:                      #949699;
+@navbar-pf-navbar-primary-bg-color-start:                           #474c50;
+@navbar-pf-navbar-primary-bg-color-stop:                            #383f43;
+@navbar-pf-navbar-primary-hover-bg-color-start:                     #5c6165;
+@navbar-pf-navbar-primary-hover-bg-color-stop:                      #4b5053;
+@navbar-pf-navbar-primary-hover-border-color:                       #949699;
+@navbar-pf-navbar-primary-context-active-bg-color-start:            #6b7175;
+@navbar-pf-navbar-primary-context-active-bg-color-stop:             #65696d;
+@navbar-pf-navbar-primary-context-active-border-color:              #6e7276;
+@navbar-pf-navbar-primary-context-active-border-right-color:        #777a7e;
+@navbar-pf-navbar-primary-context-active-border-top-color:          #767a7e;
+@navbar-pf-navbar-primary-context-bg-color-start:                   #585d61;
+@navbar-pf-navbar-primary-context-bg-color-stop:                    #505458;
+@navbar-pf-navbar-primary-context-border-color:                     #65696d;
+@navbar-pf-navbar-primary-context-border-top-color:                 #64696d;
+@navbar-pf-navbar-primary-context-hover-bg-color-start:             #62676b;
+@navbar-pf-navbar-primary-context-hover-bg-color-stop:              #5a5e62;
+@navbar-pf-navbar-primary-context-hover-border-color:               #6e7276;
+@navbar-pf-navbar-primary-context-hover-border-top-color:           #6c7276;
+@navbar-pf-navbar-utility-border-color:                             #53565b;
+@navbar-pf-navbar-utility-color:                                    #fff;
+@navbar-pf-navbar-utility-hover-bg-color:                           #4a5053;
+@navbar-pf-navbar-utility-hover-border-color:                       #636466;
+@navbar-pf-navbar-utility-open-bg-color:                            #5b6165;
+@navbar-pf-navbar-utility-open-border-color:                        #6c6e70;
-- 
2.21.1

From beb52f0f27401d439755107be31e74210343e784 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 42/78] install/ui/reset_password.html: Change branding to IPA
 and Identity Management

---
 install/ui/reset_password.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/ui/reset_password.html b/install/ui/reset_password.html
index e5700c964..a4ea1ce0e 100644
--- a/install/ui/reset_password.html
+++ b/install/ui/reset_password.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>IPA: Identity Policy Audit</title>
+    <title>Identity Management</title>
 
     <!--[if IE]>
     <meta id="ie-detector">
-- 
2.21.1

From 288607c7080be4f35a00b853f3de9fdd0752376d Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 43/78] install/ui/src/freeipa/widgets/App.js: Change branding
 to IPA and Identity Management

---
 install/ui/src/freeipa/widgets/App.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/ui/src/freeipa/widgets/App.js b/install/ui/src/freeipa/widgets/App.js
index 3a139555a..b0f75885d 100644
--- a/install/ui/src/freeipa/widgets/App.js
+++ b/install/ui/src/freeipa/widgets/App.js
@@ -187,7 +187,7 @@ define(['dojo/_base/declare',
 
             construct.create('img', {
                 src: 'images/header-logo.png',
-                alt: 'FreeIPA' // TODO: replace with configuration value
+                alt: 'Identity Management' // TODO: replace with configuration value
             }, this.brand_node);
 
             return this.brand_node;
-- 
2.21.1

From 5573b887c32228f2c404413fd58560da95ef954d Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 44/78] install/ui/sync_otp.html: Change branding to IPA and
 Identity Management

---
 install/ui/sync_otp.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/ui/sync_otp.html b/install/ui/sync_otp.html
index 5814b6c57..36a51ca62 100644
--- a/install/ui/sync_otp.html
+++ b/install/ui/sync_otp.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>IPA: Identity Policy Audit</title>
+    <title>Identity Management</title>
 
     <!--[if IE]>
     <meta id="ie-detector">
-- 
2.21.1

From 86d40a59a18f9b1439387bf8d5794437be0fb8b9 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 45/78] install/ui/test/data/ipa_init_commands.json: Change
 branding to IPA and Identity Management

---
 install/ui/test/data/ipa_init_commands.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/ui/test/data/ipa_init_commands.json b/install/ui/test/data/ipa_init_commands.json
index c35946b34..6d3667473 100644
--- a/install/ui/test/data/ipa_init_commands.json
+++ b/install/ui/test/data/ipa_init_commands.json
@@ -8689,7 +8689,7 @@
                   "label" : "Clock offset",
                   "confirm" : true,
                   "alwaysask" : false,
-                  "doc" : "TOTP token / FreeIPA server time difference",
+                  "doc" : "TOTP token / IPA server time difference",
                   "deprecated" : false,
                   "flags" : [
                      "no_update"
@@ -29875,7 +29875,7 @@
                   "primary_key" : false,
                   "alwaysask" : false,
                   "deprecated" : false,
-                  "doc" : "TOTP token / FreeIPA server time difference",
+                  "doc" : "TOTP token / IPA server time difference",
                   "flags" : [
                      "no_update"
                   ],
-- 
2.21.1

From 7e027d4836251b4f824b5e420e8ef6cfa8bb4505 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 46/78] install/ui/test/data/ipa_init_objects.json: Change
 branding to IPA and Identity Management

---
 install/ui/test/data/ipa_init_objects.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/ui/test/data/ipa_init_objects.json b/install/ui/test/data/ipa_init_objects.json
index 6f9b13e92..08aaafd61 100644
--- a/install/ui/test/data/ipa_init_objects.json
+++ b/install/ui/test/data/ipa_init_objects.json
@@ -21190,7 +21190,7 @@
                   "autofill" : true,
                   "multivalue" : false,
                   "deprecated" : false,
-                  "doc" : "TOTP token / FreeIPA server time difference",
+                  "doc" : "TOTP token / IPA server time difference",
                   "primary_key" : false,
                   "cli_metavar" : "INT",
                   "default" : 0,
-- 
2.21.1

From 799fc53a7d6503d76452617998da0a936527116c Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 47/78] ipaclient/install/client.py: Change branding to IPA and
 Identity Management

---
 ipaclient/install/client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaclient/install/client.py b/ipaclient/install/client.py
index 34b2d1a6e..d3bffb05f 100644
--- a/ipaclient/install/client.py
+++ b/ipaclient/install/client.py
@@ -2033,7 +2033,7 @@ def install_check(options):
     global client_domain
     global cli_basedn
 
-    print("This program will set up FreeIPA client.")
+    print("This program will set up IPA client.")
     print("Version {}".format(version.VERSION))
     print("")
 
-- 
2.21.1

From 2c5f5f196ec959eed754b0966fc80daa1d1b6ff7 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
Subject: [PATCH 48/78] ipaclient/remote_plugins/2_114/otptoken.py: Change
 branding to IPA and Identity Management

---
 ipaclient/remote_plugins/2_114/otptoken.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipaclient/remote_plugins/2_114/otptoken.py b/ipaclient/remote_plugins/2_114/otptoken.py
index 632c97ea2..d3edb589d 100644
--- a/ipaclient/remote_plugins/2_114/otptoken.py
+++ b/ipaclient/remote_plugins/2_114/otptoken.py
@@ -132,7 +132,7 @@ class otptoken(Object):
             'ipatokentotpclockoffset',
             required=False,
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
         ),
         parameters.Int(
             'ipatokentotptimestep',
@@ -263,7 +263,7 @@ class otptoken_add(Method):
             required=False,
             cli_name='offset',
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
             default=0,
             autofill=True,
         ),
@@ -553,7 +553,7 @@ class otptoken_find(Method):
             required=False,
             cli_name='offset',
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
             default=0,
         ),
         parameters.Int(
-- 
2.21.1

From 521d5c9ebee2fe4df8650ebdc53b91d25232d631 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 49/78] ipaclient/remote_plugins/2_156/otptoken.py: Change
 branding to IPA and Identity Management

---
 ipaclient/remote_plugins/2_156/otptoken.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipaclient/remote_plugins/2_156/otptoken.py b/ipaclient/remote_plugins/2_156/otptoken.py
index 0b2b54c6e..e674d465d 100644
--- a/ipaclient/remote_plugins/2_156/otptoken.py
+++ b/ipaclient/remote_plugins/2_156/otptoken.py
@@ -132,7 +132,7 @@ class otptoken(Object):
             'ipatokentotpclockoffset',
             required=False,
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
         ),
         parameters.Int(
             'ipatokentotptimestep',
@@ -263,7 +263,7 @@ class otptoken_add(Method):
             required=False,
             cli_name='offset',
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
             default=0,
             autofill=True,
         ),
@@ -553,7 +553,7 @@ class otptoken_find(Method):
             required=False,
             cli_name='offset',
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
             default=0,
         ),
         parameters.Int(
-- 
2.21.1

From 0a29cb7c05dfc8a75afdbdadcb9c7a67e9e90b50 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 50/78] ipaclient/remote_plugins/2_164/otptoken.py: Change
 branding to IPA and Identity Management

---
 ipaclient/remote_plugins/2_164/otptoken.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipaclient/remote_plugins/2_164/otptoken.py b/ipaclient/remote_plugins/2_164/otptoken.py
index 0b2b54c6e..e674d465d 100644
--- a/ipaclient/remote_plugins/2_164/otptoken.py
+++ b/ipaclient/remote_plugins/2_164/otptoken.py
@@ -132,7 +132,7 @@ class otptoken(Object):
             'ipatokentotpclockoffset',
             required=False,
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
         ),
         parameters.Int(
             'ipatokentotptimestep',
@@ -263,7 +263,7 @@ class otptoken_add(Method):
             required=False,
             cli_name='offset',
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
             default=0,
             autofill=True,
         ),
@@ -553,7 +553,7 @@ class otptoken_find(Method):
             required=False,
             cli_name='offset',
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
             default=0,
         ),
         parameters.Int(
-- 
2.21.1

From fec6eff7f15ff4ae4bf28d816ca4b231f77b15ca Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 51/78] ipalib/pkcs10.py: Change branding to IPA and Identity
 Management

---
 ipalib/pkcs10.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipalib/pkcs10.py b/ipalib/pkcs10.py
index 2756c8568..590ce0757 100644
--- a/ipalib/pkcs10.py
+++ b/ipalib/pkcs10.py
@@ -2,7 +2,7 @@ from __future__ import print_function
 import sys
 
 print(
-    "ipalib.pkcs10 module is deprecated and will be removed in FreeIPA 4.6. "
+    "ipalib.pkcs10 module is deprecated and will be removed in IPA 4.6. "
     "To load CSRs, please, use python-cryptography instead.",
     file=sys.stderr
 )
-- 
2.21.1

From e364a5187b1a49ea81653f5282825485a58827df Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 52/78] ipalib/rpc.py: Change branding to IPA and Identity
 Management

---
 ipalib/rpc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipalib/rpc.py b/ipalib/rpc.py
index 1ef0f5e95..f1be90522 100644
--- a/ipalib/rpc.py
+++ b/ipalib/rpc.py
@@ -284,7 +284,7 @@ class _JSONPrimer(dict):
 
     Prepare a data structure for JSON serialization. In an ideal world, priming
     could be handled by the default hook of json.dumps(). Unfortunately the
-    hook treats Python 2 str as text while FreeIPA considers str as bytes.
+    hook treats Python 2 str as text while IPA considers str as bytes.
 
     The primer uses a couple of tricks to archive maximum performance:
 
-- 
2.21.1

From e1367d8a71cd5d1aa0f57793238577fa69324594 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 53/78] ipalib/util.py: Change branding to IPA and Identity
 Management

---
 ipalib/util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipalib/util.py b/ipalib/util.py
index e0c658c51..3378db043 100644
--- a/ipalib/util.py
+++ b/ipalib/util.py
@@ -236,7 +236,7 @@ def normalize_zone(zone):
 def get_proper_tls_version_span(tls_version_min, tls_version_max):
     """
     This function checks whether the given TLS versions are known in
-    FreeIPA and that these versions fulfill the requirements for minimal
+    IPA and that these versions fulfill the requirements for minimal
     TLS version (see
     `ipalib.constants: TLS_VERSIONS, TLS_VERSION_MINIMAL`).
 
-- 
2.21.1

From e980e233c6c48fe2ebc8d10f5bd18db5dea6ff94 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 54/78] ipalib/x509.py: Change branding to IPA and Identity
 Management

---
 ipalib/x509.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipalib/x509.py b/ipalib/x509.py
index 1f612a379..dfe66e1b4 100644
--- a/ipalib/x509.py
+++ b/ipalib/x509.py
@@ -88,7 +88,7 @@ SAN_KRB5PRINCIPALNAME = '1.3.6.1.5.2.2'
 class IPACertificate:
     """
     A proxy class wrapping a python-cryptography certificate representation for
-    FreeIPA purposes
+    IPA purposes
     """
     def __init__(self, cert, backend=None):
         """
-- 
2.21.1

From 38ca6711b3cb6c24c9ae16e172339a680613f2af Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 55/78] ipaserver/advise/plugins/legacy_clients.py: Change
 branding to IPA and Identity Management

---
 ipaserver/advise/plugins/legacy_clients.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ipaserver/advise/plugins/legacy_clients.py b/ipaserver/advise/plugins/legacy_clients.py
index 2a56922b8..0e322fe96 100644
--- a/ipaserver/advise/plugins/legacy_clients.py
+++ b/ipaserver/advise/plugins/legacy_clients.py
@@ -94,7 +94,7 @@ class config_redhat_sssd_before_1_9(config_base_legacy_client):
     Legacy client configuration for Red Hat based systems, using SSSD.
     """
     description = ('Instructions for configuring a system with an old version '
-                   'of SSSD (1.5-1.8) as a FreeIPA client. This set of '
+                   'of SSSD (1.5-1.8) as a IPA client. This set of '
                    'instructions is targeted for platforms that include '
                    'the authconfig utility, which are all Red Hat based '
                    'platforms.')
@@ -129,7 +129,7 @@ class config_generic_linux_sssd_before_1_9(config_base_legacy_client):
     using SSSD.
     """
     description = ('Instructions for configuring a system with an old version '
-                   'of SSSD (1.5-1.8) as a FreeIPA client. This set of '
+                   'of SSSD (1.5-1.8) as a IPA client. This set of '
                    'instructions is targeted for linux systems that do not '
                    'include the authconfig utility.')
 
@@ -184,7 +184,7 @@ class config_redhat_nss_pam_ldapd(config_base_legacy_client):
     using nss-pam-ldapd.
     """
     description = ('Instructions for configuring a system with nss-pam-ldapd '
-                   'as a FreeIPA client. This set of instructions is targeted '
+                   'as a IPA client. This set of instructions is targeted '
                    'for platforms that include the authconfig utility, which '
                    'are all Red Hat based platforms.')
 
@@ -352,7 +352,7 @@ class config_redhat_nss_ldap(config_base_legacy_client):
     using nss-ldap.
     """
     description = ('Instructions for configuring a system with nss-ldap '
-                   'as a FreeIPA client. This set of instructions is targeted '
+                   'as a IPA client. This set of instructions is targeted '
                    'for platforms that include the authconfig utility, which '
                    'are all Red Hat based platforms.')
 
-- 
2.21.1

From f6fa8b8edd7a4123cf3f409c169e4eee12a3ed3c Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 56/78] ipaserver/advise/plugins/smart_card_auth.py: Change
 branding to IPA and Identity Management

---
 ipaserver/advise/plugins/smart_card_auth.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipaserver/advise/plugins/smart_card_auth.py b/ipaserver/advise/plugins/smart_card_auth.py
index c43c74e5b..ce50cec83 100644
--- a/ipaserver/advise/plugins/smart_card_auth.py
+++ b/ipaserver/advise/plugins/smart_card_auth.py
@@ -97,7 +97,7 @@ class config_server_for_smart_card_auth(common_smart_card_auth_config):
     """
 
     description = ("Instructions for enabling Smart Card authentication on "
-                   " a single FreeIPA server. Includes Apache configuration, "
+                   " a single IPA server. Includes Apache configuration, "
                    "enabling PKINIT on KDC and configuring WebUI to accept "
                    "Smart Card auth requests. To enable the feature in the "
                    "whole topology you have to run the script on each master")
@@ -244,11 +244,11 @@ class config_server_for_smart_card_auth(common_smart_card_auth_config):
 @register()
 class config_client_for_smart_card_auth(common_smart_card_auth_config):
     """
-    Configures smart card authentication on FreeIPA client
+    Configures smart card authentication on IPA client
     """
 
     description = ("Instructions for enabling Smart Card authentication on "
-                   " a single FreeIPA client. Configures Smart Card daemon, "
+                   " a single IPA client. Configures Smart Card daemon, "
                    "set the system-wide trust store and configures SSSD to "
                    "allow smart card logins to desktop")
 
-- 
2.21.1

From 4b528a73ed9d914997f8e7ed44076211e6fef239 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 57/78] ipaserver/install/dns.py: Change branding to IPA and
 Identity Management

---
 ipaserver/install/dns.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py
index 9f08e86f9..7d6d7fe7c 100644
--- a/ipaserver/install/dns.py
+++ b/ipaserver/install/dns.py
@@ -151,7 +151,7 @@ def install_check(standalone, api, replica, options, hostname):
 
     if standalone:
         print("==============================================================================")
-        print("This program will setup DNS for the FreeIPA Server.")
+        print("This program will setup DNS for the IPA Server.")
         print("")
         print("This includes:")
         print("  * Configure DNS (bind)")
-- 
2.21.1

From b4bf196e8f7eb5193d5be111820b9b9d13b7c25c Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 58/78] ipaserver/install/ipa_kra_install.py: Change branding
 to IPA and Identity Management

---
 ipaserver/install/ipa_kra_install.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ipaserver/install/ipa_kra_install.py b/ipaserver/install/ipa_kra_install.py
index 2d6e4bf09..076c20666 100644
--- a/ipaserver/install/ipa_kra_install.py
+++ b/ipaserver/install/ipa_kra_install.py
@@ -93,7 +93,7 @@ class KRAInstall(admintool.AdminTool):
         if options.uninstall:
             sys.exit(
                 'ERROR: Standalone KRA uninstallation was removed in '
-                'FreeIPA 4.5 as it had never worked properly and only caused '
+                'IPA 4.5 as it had never worked properly and only caused '
                 'issues.')
         else:
             return KRAInstaller
@@ -104,7 +104,7 @@ class KRAInstaller(KRAInstall):
 
     INSTALLER_START_MESSAGE = '''
         ===================================================================
-        This program will setup Dogtag KRA for the FreeIPA Server.
+        This program will setup Dogtag KRA for the IPA Server.
 
     '''
 
-- 
2.21.1

From 2831a3d84888547b38803681019f9f5bdfb34b2e Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 59/78] ipaserver/install/plugins/dns.py: Change branding to
 IPA and Identity Management

---
 ipaserver/install/plugins/dns.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ipaserver/install/plugins/dns.py b/ipaserver/install/plugins/dns.py
index baa19c38e..a7a1748d9 100644
--- a/ipaserver/install/plugins/dns.py
+++ b/ipaserver/install/plugins/dns.py
@@ -161,11 +161,11 @@ class update_ipaconfigstring_dnsversion_to_ipadnsversion(Updater):
 @register()
 class update_dnszones(Updater):
     """
-    Update all zones to meet requirements in the new FreeIPA versions
+    Update all zones to meet requirements in the new IPA versions
 
     1) AllowQuery and AllowTransfer
     Set AllowQuery and AllowTransfer ACLs in all zones that may be configured
-    in an upgraded FreeIPA instance.
+    in an upgraded IPA instance.
 
     Upgrading to new version of bind-dyndb-ldap and having these ACLs empty
     would result in a leak of potentially sensitive DNS information as
@@ -173,7 +173,7 @@ class update_dnszones(Updater):
     or LDAP.
 
     This plugin disables the zone transfer by default so that it needs to be
-    explicitly enabled by FreeIPA Administrator.
+    explicitly enabled by IPA Administrator.
 
     2) Update policy
     SSH public key support includes a feature to automatically add/update
@@ -272,7 +272,7 @@ class update_dns_limits(Updater):
 @register()
 class update_master_to_dnsforwardzones(DNSUpdater):
     """
-    Update all zones to meet requirements in the new FreeIPA versions
+    Update all zones to meet requirements in the new IPA versions
 
     All masters zones with specified forwarders, and forward-policy different
     than none, will be tranformed to forward zones.
@@ -420,7 +420,7 @@ class update_dnsforward_emptyzones(DNSUpdater):
 
     BIND ignores conflicting forwarding configuration
     when forwarding policy != only.
-    bind-dyndb-ldap 9.0+ will do the same so we have to adjust FreeIPA zones
+    bind-dyndb-ldap 9.0+ will do the same so we have to adjust IPA zones
     accordingly.
     """
     backup_filename = u'dns-forwarding-empty-zones-%Y-%m-%d-%H-%M-%S.ldif'
-- 
2.21.1

From 76ae883950cbe20c50f456ddc7d24d209d78232e Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 60/78] ipaserver/install/replication.py: Change branding to
 IPA and Identity Management

---
 ipaserver/install/replication.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index 1fefe3ebf..87794b7f4 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -1760,7 +1760,7 @@ class ReplicationManager:
         Ensure that the 'cn=replication managers,cn=sysaccounts' group exists
         and contains the principals for master and remote replica
 
-        On FreeIPA 3.x masters lacking support for nsds5ReplicaBinddnGroup
+        On IPA 3.x masters lacking support for nsds5ReplicaBinddnGroup
         attribute, add replica bind DN directly into the replica entry.
         """
         my_dn = DN(
-- 
2.21.1

From 4324a4f3653d3322ef75406b0b9b2cd68fb17995 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 61/78] ipaserver/install/server/install.py: Change branding to
 IPA and Identity Management

---
 ipaserver/install/server/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py
index afce0d73a..b62c08baa 100644
--- a/ipaserver/install/server/install.py
+++ b/ipaserver/install/server/install.py
@@ -414,7 +414,7 @@ def install_check(installer):
 
     print("======================================="
           "=======================================")
-    print("This program will set up the FreeIPA Server.")
+    print("This program will set up the IPA Server.")
     print("Version {}".format(version.VERSION))
     print("")
     print("This includes:")
-- 
2.21.1

From 55b2630e53494d831fb65a0c520aabe1c895b13d Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 62/78] ipaserver/install/server/replicainstall.py: Change
 branding to IPA and Identity Management

---
 ipaserver/install/server/replicainstall.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
index 71ea091a3..0ea48f18e 100644
--- a/ipaserver/install/server/replicainstall.py
+++ b/ipaserver/install/server/replicainstall.py
@@ -619,7 +619,7 @@ def check_domain_level_is_supported(current):
     above_upper_bound = current > constants.MAX_DOMAIN_LEVEL
 
     if under_lower_bound or above_upper_bound:
-        message = ("This version of FreeIPA does not support "
+        message = ("This version of IPA does not support "
                    "the Domain Level which is currently set for "
                    "this domain. The Domain Level needs to be "
                    "raised before installing a replica with "
-- 
2.21.1

From 649e159570278e417922a68e23c2fc44ef6eeb44 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 63/78] ipaserver/plugins/certmap.py: Change branding to IPA
 and Identity Management

---
 ipaserver/plugins/certmap.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/plugins/certmap.py b/ipaserver/plugins/certmap.py
index ee8f0c15f..cdbc38f70 100644
--- a/ipaserver/plugins/certmap.py
+++ b/ipaserver/plugins/certmap.py
@@ -614,7 +614,7 @@ class certmap_match(Search):
         The search is performed using SSSD's DBus interface
         Users.ListByCertificate.
         SSSD does the lookup based on certificate mapping rules, using
-        FreeIPA domain and trusted domains.
+        IPA domain and trusted domains.
         :raise RemoteRetrieveError: if DBus returns an exception
         """
         sssd = _sssd()
-- 
2.21.1

From 926ce56e094b8b54c10d867d9c1150d73af088f5 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 64/78] ipaserver/plugins/otptoken.py: Change branding to IPA
 and Identity Management

---
 ipaserver/plugins/otptoken.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/plugins/otptoken.py b/ipaserver/plugins/otptoken.py
index 72ed5393d..46e4d5e8d 100644
--- a/ipaserver/plugins/otptoken.py
+++ b/ipaserver/plugins/otptoken.py
@@ -245,7 +245,7 @@ class otptoken(LDAPObject):
         Int('ipatokentotpclockoffset?',
             cli_name='offset',
             label=_('Clock offset'),
-            doc=_('TOTP token / FreeIPA server time difference'),
+            doc=_('TOTP token / IPA server time difference'),
             default=0,
             autofill=True,
             flags=('no_update'),
-- 
2.21.1

From aaa3824fd7e96be447529183033aa37cad016264 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 65/78] ipaserver/plugins/sudorule.py: Change branding to IPA
 and Identity Management

---
 ipaserver/plugins/sudorule.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ipaserver/plugins/sudorule.py b/ipaserver/plugins/sudorule.py
index 643215985..68baa0174 100644
--- a/ipaserver/plugins/sudorule.py
+++ b/ipaserver/plugins/sudorule.py
@@ -47,7 +47,7 @@ give certain users (or groups of users) the ability to run some (or all)
 commands as root or another user while providing an audit trail of the
 commands and their arguments.
 """) + _("""
-FreeIPA provides a means to configure the various aspects of Sudo:
+IPA provides a means to configure the various aspects of Sudo:
    Users: The user(s)/group(s) allowed to invoke Sudo.
    Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke Sudo.
    Allow Command: The specific command(s) permitted to be run via Sudo.
@@ -60,7 +60,7 @@ An order can be added to a sudorule to control the order in which they
 are evaluated (if the client supports it). This order is an integer and
 must be unique.
 """) + _("""
-FreeIPA provides a designated binddn to use with Sudo located at:
+IPA provides a designated binddn to use with Sudo located at:
 uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com
 """) + _("""
 To enable the binddn run the following command to set the password:
-- 
2.21.1

From 4285adc257bfdf7eb836c4bfdb61a8e34aa0e87d Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 66/78] po/de.po: Change branding to IPA and Identity
 Management

---
 po/de.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/de.po b/po/de.po
index 8f9c2209b..95626fc68 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3668,7 +3668,7 @@ msgstr "TOTP Sychnronisierungsfenster"
 msgid "TOTP authentication Window"
 msgstr "TOTP Authentifizierungsfenster"
 
-msgid "TOTP token / FreeIPA server time difference"
+msgid "TOTP token / IPA server time difference"
 msgstr "Differenz zwischen Token und Serverzeit"
 
 msgid "Target"
-- 
2.21.1

From 68b461d299352e515457ff2ef8a40d82afc35bc0 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 67/78] po/es.po: Change branding to IPA and Identity
 Management

---
 po/es.po | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/po/es.po b/po/es.po
index b9e9fc126..6970d31f5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3101,7 +3101,7 @@ msgid ""
 "The profile configuration format is the raw property-list format\n"
 "used by Dogtag Certificate System.  The XML format is not supported.\n"
 "\n"
-"The following restrictions apply to profiles managed by FreeIPA:\n"
+"The following restrictions apply to profiles managed by IPA:\n"
 "\n"
 "- When importing a profile the \"profileId\" field, if present, must\n"
 "  match the ID given on the command line.\n"
@@ -3159,7 +3159,7 @@ msgstr ""
 "propiedad\n"
 "usado por Dogtag Certificate System.  No está soportado el formato XML.\n"
 "\n"
-"A los perfiles manejados por FreeIPA se les aplican las siguientes "
+"A los perfiles manejados por IPA se les aplican las siguientes "
 "restricciones:\n"
 "\n"
 "- Cuando se importa un perfil el campo \"profileId\", si está presente, debe "
@@ -4948,7 +4948,7 @@ msgid ""
 "commands as root or another user while providing an audit trail of the\n"
 "commands and their arguments.\n"
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -4963,7 +4963,7 @@ msgid ""
 "are evaluated (if the client supports it). This order is an integer and\n"
 "must be unique.\n"
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
 "To enable the binddn run the following command to set the password:\n"
@@ -4971,7 +4971,7 @@ msgid ""
 "ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
 "dc=com\n"
 "\n"
-"For more information, see the FreeIPA Documentation to Sudo.\n"
+"For more information, see the IPA Documentation to Sudo.\n"
 msgstr ""
 "\n"
 "Reglas Sudo\n"
@@ -4984,7 +4984,7 @@ msgstr ""
 "auditoria de\n"
 " los comandos y sus argumentos.\n"
 "\n"
-"FreeIPA proporciona un medio para configurar diversos aspectos de Sudo:\n"
+"IPA proporciona un medio para configurar diversos aspectos de Sudo:\n"
 "   Users: Los usuario(s)/grupos(s) que tienen permitido llamar a Sudo.\n"
 "   Hosts: Loshost(s)/grupo(s) de host a los que el usuario permite llamar a "
 "Sudo.\n"
@@ -5002,7 +5002,7 @@ msgstr ""
 "será evaluada\n"
 "(si el cliente lo soporta). Este orden es un entero y debe ser único.\n"
 "\n"
-"FreeIPA suministra un binddn designado para usar con Sudo situado en :\n"
+"IPA suministra un binddn designado para usar con Sudo situado en :\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
 "Para habilitar el binddn ejecute el siguiente comando para fijar la "
@@ -5011,7 +5011,7 @@ msgstr ""
 "ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
 "dc=com\n"
 "\n"
-"Para más información, vea la Documentación FreeIPA para Sudo.\n"
+"Para más información, vea la Documentación IPA para Sudo.\n"
 
 msgid ""
 "\n"
@@ -12742,8 +12742,8 @@ msgstr "Variación del tiempo de autenticación TOTP (segundos)"
 msgid "TOTP synchronization time variance (seconds)"
 msgstr "Variación del tiempo de sincronización TOTP (segundos)"
 
-msgid "TOTP token / FreeIPA server time difference"
-msgstr "Ficha TOTP / Diferencia de hora del servidor FreeIPA"
+msgid "TOTP token / IPA server time difference"
+msgstr "Ficha TOTP / Diferencia de hora del servidor IPA"
 
 msgid "Take a revoked certificate off hold."
 msgstr "Tomar un certificado revocado de espera."
-- 
2.21.1

From 1d49558b613ae9f1c763e3108166b47a59b743be Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 68/78] po/fr.po: Change branding to IPA and Identity
 Management

---
 po/fr.po | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 88253e172..23a4ba3ea 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2575,17 +2575,17 @@ msgstr ""
 
 msgid ""
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 msgstr ""
 "\n"
-"FreeIPA permet la désignation d'un « binddn » à utiliser avec sudo situé "
+"IPA permet la désignation d'un « binddn » à utiliser avec sudo situé "
 "à :\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 
 msgid ""
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -2597,7 +2597,7 @@ msgid ""
 "   Options: The various Sudoers Options that can modify Sudo's behavior.\n"
 msgstr ""
 "\n"
-"FreeIPA offre les moyens de configurer les divers aspects de sudo :\n"
+"IPA offre les moyens de configurer les divers aspects de sudo :\n"
 "   Users : utilisateur/groupe autorisés à invoquer sudo.\n"
 "   Hosts : hôte/groupe d'hôte dont l'utilisateur peut invoquer sudo.\n"
 "   Allow Command : commande donnée pouvant être exécutée via sudo.\n"
@@ -3708,7 +3708,7 @@ msgid ""
 "The profile configuration format is the raw property-list format\n"
 "used by Dogtag Certificate System.  The XML format is not supported.\n"
 "\n"
-"The following restrictions apply to profiles managed by FreeIPA:\n"
+"The following restrictions apply to profiles managed by IPA:\n"
 "\n"
 "- When importing a profile the \"profileId\" field, if present, must\n"
 "  match the ID given on the command line.\n"
@@ -3770,7 +3770,7 @@ msgstr ""
 "propriété utilisé par Dogtag Certificate System.  Le format  XML n'est\n"
 "pas pris en charge.\n"
 "\n"
-"Les restrictions suivantes s'appliquent aux profils gérés par FreeIPA :\n"
+"Les restrictions suivantes s'appliquent aux profils gérés par IPA :\n"
 "\n"
 "- Lors de l'import d'un profil, le champ « profileId » s'il est présent "
 "doit\n"
@@ -15658,8 +15658,8 @@ msgstr "Durée de la fenêtre d'authentification TOTP (secondes)"
 msgid "TOTP synchronization time variance (seconds)"
 msgstr "Variance temporelle de synchronisation TOTP (secondes)"
 
-msgid "TOTP token / FreeIPA server time difference"
-msgstr "Différence entre le jeton TOTP et le serveur FreeIPA"
+msgid "TOTP token / IPA server time difference"
+msgstr "Différence entre le jeton TOTP et le serveur IPA"
 
 msgid "TSIG record"
 msgstr "Enregistrement TSIG"
-- 
2.21.1

From 28d5217ccc838e037f60dbdfce72ae0eaa1fbdd8 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 69/78] po/ru.po: Change branding to IPA and Identity
 Management

---
 po/ru.po | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 7d663a7a8..699979b74 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5308,17 +5308,17 @@ msgstr ""
 
 msgid ""
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 msgstr ""
 "\n"
-"FreeIPA предусматривает специальную привязку DN (binddn) для использования с "
+"IPA предусматривает специальную привязку DN (binddn) для использования с "
 "Sudo:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 
 msgid ""
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -5330,7 +5330,7 @@ msgid ""
 "   Options: The various Sudoers Options that can modify Sudo's behavior.\n"
 msgstr ""
 "\n"
-"FreeIPA предоставляет возможности настройки различных аспектов Sudo:\n"
+"IPA предоставляет возможности настройки различных аспектов Sudo:\n"
 "   Users: пользователь (пользователи) или группа (группы), которые могут "
 "вызывать Sudo.\n"
 "   Hosts: узел (узлы) или группа (группы) узлов, пользователи которых могут "
@@ -7826,7 +7826,7 @@ msgid ""
 "The profile configuration format is the raw property-list format\n"
 "used by Dogtag Certificate System.  The XML format is not supported.\n"
 "\n"
-"The following restrictions apply to profiles managed by FreeIPA:\n"
+"The following restrictions apply to profiles managed by IPA:\n"
 "\n"
 "- When importing a profile the \"profileId\" field, if present, must\n"
 "  match the ID given on the command line.\n"
@@ -7880,7 +7880,7 @@ msgstr ""
 "свойств, который используется системой сертификации Dogtag Certificate "
 "System.  Поддержка формата XML не предусмотрена.\n"
 "\n"
-"К профилям под управлением  FreeIPA применяются следующие ограничения:\n"
+"К профилям под управлением  IPA применяются следующие ограничения:\n"
 "\n"
 "- При импорте профиля значение поля \"profileId\", если это поле имеется, "
 "должно совпадать с идентификатором, указанным в командной строке.\n"
@@ -7936,7 +7936,7 @@ msgid ""
 "The profile configuration format is the raw property-list format\n"
 "used by Dogtag Certificate System.  The XML format is not supported.\n"
 "\n"
-"The following restrictions apply to profiles managed by FreeIPA:\n"
+"The following restrictions apply to profiles managed by IPA:\n"
 "\n"
 "- When importing a profile the \"profileId\" field, if present, must\n"
 "  match the ID given on the command line.\n"
@@ -7992,7 +7992,7 @@ msgstr ""
 "свойств, который используется системой сертификации Dogtag Certificate "
 "System.  Поддержка формата XML не предусмотрена.\n"
 "\n"
-"К профилям под управлением  FreeIPA применяются следующие ограничения:\n"
+"К профилям под управлением  IPA применяются следующие ограничения:\n"
 "\n"
 "- При импорте профиля значение поля \"profileId\", если это поле имеется, "
 "должно совпадать с идентификатором, указанным в командной строке.\n"
@@ -13772,7 +13772,7 @@ msgid ""
 "commands as root or another user while providing an audit trail of the\n"
 "commands and their arguments.\n"
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -13787,7 +13787,7 @@ msgid ""
 "are evaluated (if the client supports it). This order is an integer and\n"
 "must be unique.\n"
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
 "To enable the binddn run the following command to set the password:\n"
@@ -13825,7 +13825,7 @@ msgstr ""
 "пользователя \"root\" или другого пользователя, вместе с тем предоставляя "
 "журнал аудита команд и их аргументов.\n"
 "\n"
-"FreeIPA предоставляет возможности настройки различных аспектов Sudo:\n"
+"IPA предоставляет возможности настройки различных аспектов Sudo:\n"
 "   Users: пользователь (пользователи) или группа (группы), которые могут "
 "вызывать Sudo.\n"
 "   Hosts: узел (узлы) или группа (группы) узлов, пользователи которых могут "
@@ -13846,7 +13846,7 @@ msgstr ""
 "Порядок определяется числовым индексом (целое число), который не должен "
 "повторяться.\n"
 "\n"
-"FreeIPA предусматривает специальную привязку DN (binddn) для использования с "
+"IPA предусматривает специальную привязку DN (binddn) для использования с "
 "Sudo:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
@@ -13887,7 +13887,7 @@ msgid ""
 "commands as root or another user while providing an audit trail of the\n"
 "commands and their arguments.\n"
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -13902,7 +13902,7 @@ msgid ""
 "are evaluated (if the client supports it). This order is an integer and\n"
 "must be unique.\n"
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
 "To enable the binddn run the following command to set the password:\n"
@@ -13910,7 +13910,7 @@ msgid ""
 "ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
 "dc=com\n"
 "\n"
-"For more information, see the FreeIPA Documentation to Sudo.\n"
+"For more information, see the IPA Documentation to Sudo.\n"
 msgstr ""
 "\n"
 "Правила Sudo\n"
@@ -13921,7 +13921,7 @@ msgstr ""
 "пользователя \"root\" или другого пользователя, вместе с тем предоставляя "
 "журнал аудита команд и их аргументов.\n"
 "\n"
-"FreeIPA предоставляет возможности настройки различных аспектов Sudo:\n"
+"IPA предоставляет возможности настройки различных аспектов Sudo:\n"
 "   Users: пользователь (пользователи) или группа (группы), которые могут "
 "вызывать Sudo.\n"
 "   Hosts: узел (узлы) или группа (группы) узлов, пользователи которых могут "
@@ -13942,7 +13942,7 @@ msgstr ""
 "Порядок определяется числовым индексом (целое число), который не должен "
 "повторяться.\n"
 "\n"
-"FreeIPA предусматривает специальную привязку DN (binddn) для использования с "
+"IPA предусматривает специальную привязку DN (binddn) для использования с "
 "Sudo:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
@@ -13951,7 +13951,7 @@ msgstr ""
 "ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
 "dc=com\n"
 "\n"
-"Дополнительные сведения приведены в документации FreeIPA по Sudo.\n"
+"Дополнительные сведения приведены в документации IPA по Sudo.\n"
 
 msgid ""
 "\n"
@@ -27252,8 +27252,8 @@ msgstr "Отклонение по времени TOTP-аутентификаци
 msgid "TOTP synchronization time variance (seconds)"
 msgstr "Отклонение по времени TOTP-синхронизации (в секундах)"
 
-msgid "TOTP token / FreeIPA server time difference"
-msgstr "Разница времени между токеном TOTP и сервером FreeIPA"
+msgid "TOTP token / IPA server time difference"
+msgstr "Разница времени между токеном TOTP и сервером IPA"
 
 msgid "TSIG record"
 msgstr "Запись TSIG"
-- 
2.21.1

From 41e8beb8aa6bcaf48de38b48939fdf40cf8819b5 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 70/78] po/uk.po: Change branding to IPA and Identity
 Management

---
 po/uk.po | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index a17396796..ca864c8a4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5403,17 +5403,17 @@ msgstr ""
 
 msgid ""
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 msgstr ""
 "\n"
-"У FreeIPA передбачено визначений binddn для використання з sudo, який "
+"У IPA передбачено визначений binddn для використання з sudo, який "
 "розташовано у\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 
 msgid ""
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -5425,7 +5425,7 @@ msgid ""
 "   Options: The various Sudoers Options that can modify Sudo's behavior.\n"
 msgstr ""
 "\n"
-"У FreeIPA передбачено декілька параметрів налаштовування роботи sudo:\n"
+"У IPA передбачено декілька параметрів налаштовування роботи sudo:\n"
 "   Users: користувачі або групи, які можуть викликати sudo.\n"
 "   Hosts: вузли або групи вузлів, користувачі якого можуть викликати sudo.\n"
 "   Allow Command: специфічні команди, які можна виконувати за допомогою "
@@ -7948,7 +7948,7 @@ msgid ""
 "The profile configuration format is the raw property-list format\n"
 "used by Dogtag Certificate System.  The XML format is not supported.\n"
 "\n"
-"The following restrictions apply to profiles managed by FreeIPA:\n"
+"The following restrictions apply to profiles managed by IPA:\n"
 "\n"
 "- When importing a profile the \"profileId\" field, if present, must\n"
 "  match the ID given on the command line.\n"
@@ -8002,7 +8002,7 @@ msgstr ""
 "властивостей, що використовується системою сертифікації Dogtag.\n"
 "Підтримки формату XML не передбачено.\n"
 "\n"
-"Профілів, які керуються FreeIPA, стосуються такі обмеження:\n"
+"Профілів, які керуються IPA, стосуються такі обмеження:\n"
 "\n"
 "- Під час імпортування профілю поле «profileId», якщо таке є, має\n"
 "  містити значення, що збігається з ідентифікатором, вказаним у рядку "
@@ -8059,7 +8059,7 @@ msgid ""
 "The profile configuration format is the raw property-list format\n"
 "used by Dogtag Certificate System.  The XML format is not supported.\n"
 "\n"
-"The following restrictions apply to profiles managed by FreeIPA:\n"
+"The following restrictions apply to profiles managed by IPA:\n"
 "\n"
 "- When importing a profile the \"profileId\" field, if present, must\n"
 "  match the ID given on the command line.\n"
@@ -8114,7 +8114,7 @@ msgstr ""
 "властивостей, що використовується системою сертифікації Dogtag.\n"
 "Підтримки формату XML не передбачено.\n"
 "\n"
-"Профілів, які керуються FreeIPA, стосуються такі обмеження:\n"
+"Профілів, які керуються IPA, стосуються такі обмеження:\n"
 "\n"
 "- Під час імпортування профілю поле «profileId», якщо таке є, має\n"
 "  містити значення, що збігається з ідентифікатором, вказаним у рядку "
@@ -13887,7 +13887,7 @@ msgid ""
 "commands as root or another user while providing an audit trail of the\n"
 "commands and their arguments.\n"
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -13902,7 +13902,7 @@ msgid ""
 "are evaluated (if the client supports it). This order is an integer and\n"
 "must be unique.\n"
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
 "To enable the binddn run the following command to set the password:\n"
@@ -13940,7 +13940,7 @@ msgstr ""
 "користувача, зберігаючи водночас журнал виконання команд та\n"
 "аргументів.\n"
 "\n"
-"У FreeIPA передбачено декілька параметрів налаштовування роботи sudo:\n"
+"У IPA передбачено декілька параметрів налаштовування роботи sudo:\n"
 "   Users: користувачі або групи, які можуть викликати sudo.\n"
 "   Hosts: вузли або групи вузлів, користувачі якого можуть викликати sudo.\n"
 "   Allow Command: специфічні команди, які можна виконувати за допомогою "
@@ -13958,7 +13958,7 @@ msgstr ""
 "обробки записів (якщо такий порядок передбачено на клієнтському боці).\n"
 "Порядок визначається числовим індексом, який не повинен повторюватися.\n"
 "\n"
-"У FreeIPA передбачено визначений binddn для використання з sudo, який "
+"У IPA передбачено визначений binddn для використання з sudo, який "
 "розташовано у\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
@@ -13998,7 +13998,7 @@ msgid ""
 "commands as root or another user while providing an audit trail of the\n"
 "commands and their arguments.\n"
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -14013,7 +14013,7 @@ msgid ""
 "are evaluated (if the client supports it). This order is an integer and\n"
 "must be unique.\n"
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
 "To enable the binddn run the following command to set the password:\n"
@@ -14021,7 +14021,7 @@ msgid ""
 "ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
 "dc=com\n"
 "\n"
-"For more information, see the FreeIPA Documentation to Sudo.\n"
+"For more information, see the IPA Documentation to Sudo.\n"
 msgstr ""
 "\n"
 "Правила sudo\n"
@@ -14032,7 +14032,7 @@ msgstr ""
 "користувача, зберігаючи водночас журнал виконання команд та\n"
 "аргументів.\n"
 "\n"
-"У FreeIPA передбачено декілька параметрів налаштовування роботи sudo:\n"
+"У IPA передбачено декілька параметрів налаштовування роботи sudo:\n"
 "   Users: користувачі або групи, які можуть викликати sudo.\n"
 "   Hosts: вузли або групи вузлів, користувачі якого можуть викликати sudo.\n"
 "   Allow Command: специфічні команди, які можна виконувати за допомогою "
@@ -14050,7 +14050,7 @@ msgstr ""
 "обробки записів (якщо такий порядок передбачено на клієнтському боці).\n"
 "Порядок визначається числовим індексом, який не повинен повторюватися.\n"
 "\n"
-"У FreeIPA передбачено визначений binddn для використання з sudo, який "
+"У IPA передбачено визначений binddn для використання з sudo, який "
 "розташовано у\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
@@ -14059,7 +14059,7 @@ msgstr ""
 "ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
 "dc=com\n"
 "\n"
-"Докладніші відомості наведено у документації з FreeIPA щодо sudo.\n"
+"Докладніші відомості наведено у документації з IPA щодо sudo.\n"
 
 msgid ""
 "\n"
@@ -27264,8 +27264,8 @@ msgstr "Відхилення часу розпізнавання TOTP (у сек
 msgid "TOTP synchronization time variance (seconds)"
 msgstr "Відхилення часу синхронізації TOTP (у секундах)"
 
-msgid "TOTP token / FreeIPA server time difference"
-msgstr "Часова розбіжність між ключем TOTP  і сервером FreeIPA"
+msgid "TOTP token / IPA server time difference"
+msgstr "Часова розбіжність між ключем TOTP  і сервером IPA"
 
 msgid "TSIG record"
 msgstr "Запис TSIG"
-- 
2.21.1

From 703f4aa1ba942db3f614190de1dc291216d20e86 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
Subject: [PATCH 71/78] po/zh_CN.po: Change branding to IPA and Identity
 Management

---
 po/zh_CN.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index dec79967d..bc2269701 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -298,7 +298,7 @@ msgstr ""
 
 msgid ""
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -310,7 +310,7 @@ msgid ""
 "   Options: The various Sudoers Options that can modify Sudo's behavior.\n"
 msgstr ""
 "\n"
-"FreeIPA提供了一种方法来配置Sudo的各个方面：\n"
+"IPA提供了一种方法来配置Sudo的各个方面：\n"
 "   用户：用户/用户组允许调用Sudo。\n"
 "   主机：主机/主机组上的用户允许调用Sudo。\n"
 "   允许的命令：指定命令允许通过Sudo来运行。\n"
@@ -9923,8 +9923,8 @@ msgstr "TOTP认证时间差异（秒）"
 msgid "TOTP synchronization time variance (seconds)"
 msgstr "TOTP同步时间差异（秒）"
 
-msgid "TOTP token / FreeIPA server time difference"
-msgstr "TOTP令牌/FreeIPA服务器时差"
+msgid "TOTP token / IPA server time difference"
+msgstr "TOTP令牌/IPA服务器时差"
 
 msgid "TSIG record"
 msgstr "TSIG记录"
-- 
2.21.1

From 51756934d7214104a0da2a5a57d74194ecb054c9 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Fri, 3 Apr 2020 14:27:35 +0200
Subject: [PATCH 72/78] client/man/ipa-client-samba.1: Change branding to IPA
 and Identity Management

---
 client/man/ipa-client-samba.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/man/ipa-client-samba.1 b/client/man/ipa-client-samba.1
index ea83715ff..5ed6c7150 100644
--- a/client/man/ipa-client-samba.1
+++ b/client/man/ipa-client-samba.1
@@ -1,7 +1,7 @@
 .\" A man page for ipa-client-samba
 .\" Copyright (C) 2008-2016  FreeIPA Contributors see COPYING for license
 .\"
-.TH "ipa-client-samba" "1" "Jun 10 2019" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-client-samba" "1" "Jun 10 2019" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-client\-samba \- Configure Samba file server on an IPA client
 .SH "SYNOPSIS"
@@ -39,7 +39,7 @@ The ipa\-client\-samba script assumes that the machine has alreaby been enrolled
 .SS "IPA Master Requirements"
 At least one IPA master must hold a \fBTrust Controller\fR role. This can be achieved by running ipa\-adtrust\-install on the IPA master. The utility will configure IPA master to be a domain controller for IPA domain.
 
-IPA master holding a \fBTrust Controller\fR role has also to have support for a special service command to create SMB service, \fBipa service-add-smb\fR. This command is available with FreeIPA 4.8.0 or later release.
+IPA master holding a \fBTrust Controller\fR role has also to have support for a special service command to create SMB service, \fBipa service-add-smb\fR. This command is available with IPA 4.8.0 or later release.
 
 .SH "OPTIONS"
 .SS "BASIC OPTIONS"
-- 
2.21.1

From 9cb31fd0f81511252170f539b354a67b2bd1e96a Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Fri, 3 Apr 2020 14:28:22 +0200
Subject: [PATCH 73/78] contrib/lite-server.py: Change branding to IPA and
 Identity Management

---
 contrib/lite-server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/lite-server.py b/contrib/lite-server.py
index bd73b0763..9feffdada 100755
--- a/contrib/lite-server.py
+++ b/contrib/lite-server.py
@@ -139,7 +139,7 @@ class StaticFilesMiddleware(SharedDataMiddleware):
 
 
 def init_api(ccname):
-    """Initialize FreeIPA API from command line
+    """Initialize IPA API from command line
     """
     from ipalib import __file__ as ipalib_file
     from ipalib import api
-- 
2.21.1

From a8bc392551a963cb33e3e9748a771fd0f1201541 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Fri, 3 Apr 2020 14:28:56 +0200
Subject: [PATCH 74/78] ipaserver/dcerpc.py: Change branding to IPA and
 Identity Management

---
 ipaserver/dcerpc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
index 27d075425..8d3384f12 100644
--- a/ipaserver/dcerpc.py
+++ b/ipaserver/dcerpc.py
@@ -1483,7 +1483,7 @@ def fetch_domains(api, mydomain, trustdomain, creds=None, server=None):
     def communicate(td):
         td.init_lsa_pipe(td.info['dc'])
         netr_pipe = netlogon.netlogon(td.binding, td.parm, td.creds)
-        # Older FreeIPA versions used netr_DsrEnumerateDomainTrusts call
+        # Older IPA versions used netr_DsrEnumerateDomainTrusts call
         # but it doesn't provide information about non-domain UPNs associated
         # with the forest, thus we have to use netr_DsRGetForestTrustInformation
         domains = netr_pipe.netr_DsRGetForestTrustInformation(td.info['dc'], None, 0)
-- 
2.21.1

From 8bcae9d325453cae61cbc18b9114e9ba8b716993 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Fri, 3 Apr 2020 14:29:21 +0200
Subject: [PATCH 75/78] ipaserver/install/ipa_cert_fix.py: Change branding to
 IPA and Identity Management

---
 ipaserver/install/ipa_cert_fix.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/install/ipa_cert_fix.py b/ipaserver/install/ipa_cert_fix.py
index 6b952d34f..e79d7ddc4 100644
--- a/ipaserver/install/ipa_cert_fix.py
+++ b/ipaserver/install/ipa_cert_fix.py
@@ -45,7 +45,7 @@ msg = """
                           WARNING
 
 ipa-cert-fix is intended for recovery when expired certificates
-prevent the normal operation of FreeIPA.  It should ONLY be used
+prevent the normal operation of IPA.  It should ONLY be used
 in such scenarios, and backup of the system, especially certificates
 and keys, is STRONGLY RECOMMENDED.
 
-- 
2.21.1

From 8e3fb91139f51439164b38003cf0917af137158d Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Fri, 3 Apr 2020 14:29:43 +0200
Subject: [PATCH 76/78] ipaserver/plugins/config.py: Change branding to IPA and
 Identity Management

---
 ipaserver/plugins/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/plugins/config.py b/ipaserver/plugins/config.py
index e96e51971..ace66e589 100644
--- a/ipaserver/plugins/config.py
+++ b/ipaserver/plugins/config.py
@@ -462,7 +462,7 @@ class config(LDAPObject):
 
         known_domains = self.gather_trusted_domains()
 
-        # add FreeIPA domain to the list of domains. This one is always enabled
+        # add IPA domain to the list of domains. This one is always enabled
         known_domains.update({self.api.env.domain: True})
 
         for domain in submitted_domains:
-- 
2.21.1

From 65a663bd7fb5559316f1a8e5f04e0d4827bfb0b6 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Fri, 3 Apr 2020 14:30:01 +0200
Subject: [PATCH 77/78] ipaserver/plugins/certprofile.py: Change branding to
 IPA and Identity Management

---
 ipaserver/plugins/certprofile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/plugins/certprofile.py b/ipaserver/plugins/certprofile.py
index 6e2e91dc6..03fbe4d3e 100644
--- a/ipaserver/plugins/certprofile.py
+++ b/ipaserver/plugins/certprofile.py
@@ -57,7 +57,7 @@ PROFILE CONFIGURATION FORMAT:
 The profile configuration format is the raw property-list format
 used by Dogtag Certificate System.  The XML format is not supported.
 
-The following restrictions apply to profiles managed by FreeIPA:
+The following restrictions apply to profiles managed by IPA:
 
 - When importing a profile the "profileId" field, if present, must
   match the ID given on the command line.
-- 
2.21.1

From 0801d5ad45d4fa9b64e0bfb4152af658ead0e514 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Fri, 3 Apr 2020 14:30:20 +0200
Subject: [PATCH 78/78] doc/designs/adtrust/samba-domain-member.md: Change
 branding to IPA and Identity Management

---
 doc/designs/adtrust/samba-domain-member.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/designs/adtrust/samba-domain-member.md b/doc/designs/adtrust/samba-domain-member.md
index 95e3c014c..83e84ddb8 100644
--- a/doc/designs/adtrust/samba-domain-member.md
+++ b/doc/designs/adtrust/samba-domain-member.md
@@ -46,11 +46,11 @@ performing a remote authentication using Kerberos, a remote system has to
 present a Kerberos ticket to the domain member's SMB service, like with any
 other Kerberos services.
 
-To operate as a domain member in a FreeIPA domain, thus, Samba needs a FreeIPA
-master to be configured as a domain controller and a FreeIPA client needs to be
+To operate as a domain member in a IPA domain, thus, Samba needs a IPA
+master to be configured as a domain controller and a IPA client needs to be
 configured in a specific way to allow Samba to talk to a domain controller.
 This document overviews a set of implementation tasks to achieve the domain
-member operation. Most of these tasks are related to FreeIPA components but
+member operation. Most of these tasks are related to IPA components but
 some of changes required do belong to Samba itself.
 
 ## Domain member configuration overview
@@ -102,16 +102,16 @@ password rotation.
 
 The knowledge of the machine account password is recorded in a special
 database, `secrets.tdb`, during the process of a machine join to the domain.
-For FreeIPA client the join process is different from the one Samba uses for
+For IPA client the join process is different from the one Samba uses for
 Active Directory, thus we need to seed the machine account password separately
-to enrolling FreeIPA client. Note that FreeIPA machine enrollment does not
+to enrolling IPA client. Note that IPA machine enrollment does not
 allow to share clear text machine account password as it is not recorded
 anywhere.
 
 ## Domain controller side configuration overview
 
 See [samba-domain-controller] for the details of how Samba domain controller is
-set up and configured in FreeIPA.
+set up and configured in IPA.
 
 ## Changes required on domain member
 
-- 
2.21.1