diff --git a/install/html/browserconfig.html b/install/html/browserconfig.html
index 9c5cf6821..f1ab764e7 100644
--- a/install/html/browserconfig.html
+++ b/install/html/browserconfig.html
@@ -91,23 +91,23 @@
                 <p id="config-success" style="display:none">Browser successfully configured</p>
                 <p id="config-aborted" style="display:none">Configuration aborted</p>
                 <p id="config-noext" style="display:none">Configuration was not successful, extension isn't installed or is disabled. Please proceed to step 2.</p>
-                <p id="config-error" style="display:none">Configuration was not successful, unknown error uccured.</p>
+                <p id="config-error" style="display:none">Configuration was not successful, unknown error occurred.</p>
             </div>
 
             <div id="step2b" class="step">
                 <h2>Step 2</h2>
                 <ol>
                     <li>
-                        In the address bar of Firefox, type <code>about:config</code> to display the list of current configuration options.
+                        In the address bar of Firefox, type <code>about:config</code> and press enter to display the list of current configuration options.
                     </li>
                     <li>
-                        In the Filter field, type <code>negotiate</code> to restrict the list of options.
+                        In the Filter field, type <code>network.negotiate-auth.trusted-uris</code> to restrict the list of options.
                     </li>
                     <li>
-                        Double-click the <code>network.negotiate-auth.trusted-uris</code> entry to display the Enter string value dialog box.
+                        Double-click the entry to display the "Enter string value" dialog box.
                     </li>
                     <li>
-                        Enter the name of the domain against which you want to authenticate, for example, <code class="example-domain">.example.com.</code>
+                        Enter the name of the domain against which you want to authenticate, <code class="example-domain">.example.com</code> as an example.
                     </li>
                 </ol>
             </div>
diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries
index 4aceee51c..8ad74f2b8 100755
--- a/install/tools/ipa-managed-entries
+++ b/install/tools/ipa-managed-entries
@@ -44,7 +44,7 @@ def parse_options():
                       help="DN for the Managed Entry Definition")
     parser.add_option("-l", "--list", dest="list_managed_entries",
                       action="store_true",
-                      help="DN for the Managed Entry Definition")
+                      help="List available Managed Entries")
     parser.add_option("-p", "--password", dest="dirman_password",
                       help="Directory Manager password")
 
diff --git a/ipaserver/install/adtrust.py b/ipaserver/install/adtrust.py
index 69eae3853..967e744b7 100644
--- a/ipaserver/install/adtrust.py
+++ b/ipaserver/install/adtrust.py
@@ -80,14 +80,14 @@ def retrieve_netbios_name(api):
 
 def set_and_check_netbios_name(netbios_name, unattended, api):
     """
-    Depending if trust in already configured or not a given NetBIOS domain
-    name must be handled differently.
+    Depending on whether trust is already configured or not a given NetBIOS
+    domain name must be handled differently.
 
-    If trust is not configured the given NetBIOS is used or the NetBIOS is
+    If trust is not configured, the given NetBIOS is used. The NetBIOS is
     generated if none was given on the command line.
 
-    If trust is  already configured the given NetBIOS name is used to reset
-    the stored NetBIOS name it it differs from the current one.
+    If trust is already configured, the given NetBIOS name is used to reset
+    the stored NetBIOS name in case it differs from the current one.
     """
 
     cur_netbios_name = None