Make terminology consistent about audits versus controls

4 files changed, 8 insertions, 8 deletions

diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb
index d5dc936f83..03fd07e9f0 100644
--- a/lib/chef/application/client.rb
+++ b/lib/chef/application/client.rb
@@ -451,9 +451,9 @@ class Chef::Application::Client < Chef::Application
 
   def audit_mode_experimental_message
     msg = if Chef::Config[:audit_mode] == :audit_only
-      "Chef-client has been configured to skip converge and run only audits."
+      "Chef-client has been configured to skip converge and only audit."
     else
-      "Chef-client has been configured to run audits after it converges."
+      "Chef-client has been configured to audit after it converges."
     end
     msg += " Audit mode is an experimental feature currently under development. API changes may occur. Use at your own risk."
     msg += audit_mode_settings_explaination
diff --git a/lib/chef/audit/audit_reporter.rb b/lib/chef/audit/audit_reporter.rb
index a5dd9a6c48..a4f84ed7eb 100644
--- a/lib/chef/audit/audit_reporter.rb
+++ b/lib/chef/audit/audit_reporter.rb
@@ -105,7 +105,7 @@ class Chef
         end
 
         unless run_status
-          Chef::Log.debug("Run failed before audits were initialized, not sending audit report to server")
+          Chef::Log.debug("Run failed before audit mode was initialized, not sending audit report to server")
           return
         end
 
diff --git a/lib/chef/exceptions.rb b/lib/chef/exceptions.rb
index ecd84c5ba5..22f090789f 100644
--- a/lib/chef/exceptions.rb
+++ b/lib/chef/exceptions.rb
@@ -399,18 +399,18 @@ class Chef
 
     class AuditControlGroupDuplicate < RuntimeError
       def initialize(name)
-        super "Audit control group with name '#{name}' has already been defined"
+        super "Control group with name '#{name}' has already been defined"
       end
     end
     class AuditNameMissing < RuntimeError; end
     class NoAuditsProvided < RuntimeError
       def initialize
-        super "You must provide a block with audits"
+        super "You must provide a block with controls"
       end
     end
     class AuditsFailed < RuntimeError
       def initialize(num_failed, num_total)
-        super "Audit phase found failures - #{num_failed}/#{num_total} audits failed"
+        super "Audit phase found failures - #{num_failed}/#{num_total} controls failed"
       end
     end
 
diff --git a/lib/chef/formatters/doc.rb b/lib/chef/formatters/doc.rb
index 489888db8f..7144d00b5d 100644
--- a/lib/chef/formatters/doc.rb
+++ b/lib/chef/formatters/doc.rb
@@ -47,7 +47,7 @@ class Chef
         else
           puts_line "Chef Client finished, #{@updated_resources}/#{total_resources} resources updated in #{elapsed_time} seconds"
           if total_audits > 0
-            puts_line "  #{successful_audits}/#{total_audits} Audits succeeded"
+            puts_line "  #{successful_audits}/#{total_audits} controls succeeded"
           end
         end
       end
@@ -59,7 +59,7 @@ class Chef
         else
           puts_line "Chef Client failed. #{@updated_resources} resources updated in #{elapsed_time} seconds"
           if total_audits > 0
-            puts_line "  #{successful_audits} Audits succeeded"
+            puts_line "  #{successful_audits} controls succeeded"
           end
         end
       end