Commits based on PR

microsoft · Sep 20, 2018 · 455d265 · 455d265
1 parent 6acc80c
commit 455d265
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,8 @@
   * Microsoft PowerPoint 2013 Stig V1R6
   * Microsoft Excel 2013 STIG V1R7
   * Microsoft Word 2013 STIG V1R6
-* Added the DSC Composite Resource for Windows Outlook2013 STIG
-* Added PolicyFileEditor for applying Office HKCU/HKLM settings
+* Added the DSC Composite Resource for Microsoft Office 2013 STIGs
+* Added required module "PolicyFileEditor" for applying Office HKCU/HKLM settings
 
 ## 2.1.0.0
 

diff --git a/DSCResources/Office/Office.psd1 b/DSCResources/Office/Office.psd1
@@ -22,7 +22,7 @@
     Copyright = '(c) 2018 Microsoft. All rights reserved.'
 
     # Description of the functionality provided by this module
-    Description = 'Composite DSC Resource for managing the Office 2013 DISA STIGs'
+    Description = 'Composite DSC Resource for managing the Microsoft Office DISA STIGs'
 
     # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
     FunctionsToExport = @('Office')

diff --git a/DSCResources/Office/Office.schema.psm1 b/DSCResources/Office/Office.schema.psm1
@@ -6,10 +6,10 @@ using module ..\..\PowerStig.psm1
 
 <#
     .SYNOPSIS
-        A composite DSC resource to manage the Windows Office 2013 DISA STIG settings
+        A composite DSC resource to manage the Microsoft Office DISA STIG settings
 
     .PARAMETER StigVersion
-        The version of the Office 2013 DISA STIG to apply and/or monitor
+        The version of the Microsoft Office DISA STIG to apply and/or monitor
 
     .PARAMETER Exception
         A hashtable of StigId=Value key pairs that are injected into the STIG data and applied to

diff --git a/DSCResources/Resources/windows.cAdministrativeTemplateSetting.ps1 b/DSCResources/Resources/windows.cAdministrativeTemplateSetting.ps1
@@ -3,7 +3,7 @@
 
 $rules = Get-RuleClassData -StigData $StigData -Name RegistryRule
 
-foreach ( $rule in $rules )
+foreach ($rule in $rules)
 {
     if ($rule.Key -match "^HKEY_CURRENT_USER")
     {
@@ -16,5 +16,5 @@ foreach ( $rule in $rules )
             Data         = $valueData
             Type         = $rule.ValueType
         }
-    }   
+    }
 }
diff --git a/README.md b/README.md
@@ -82,7 +82,7 @@ The list of STIGs that we are currently covering.
 | ---- | --- |
 |[Browser](https://github.com/Microsoft/PowerStig/wiki/Browser) | Provides a mechanism to manage Browser STIG settings. |
 |[DotNetFramework](https://github.com/Microsoft/PowerStig/wiki/DotNetFramework) | Provides a mechanism to manage .Net Framework STIG settings. |
-|[Outlook2013](https://github.com/Microsoft/PowerStig/wiki/Outlook2013) | Provides a mechanism to manage Outlook2013 STIG settings. |
+|[Office](https://github.com/Microsoft/PowerStig/wiki/Office) | Provides a mechanism to manage Microsoft Office STIG settings. |
 |[SqlServer](https://github.com/Microsoft/PowerStig/wiki/SqlServer) | Provides a mechanism to manage SqlServer STIG settings. |
 |[WindowsDnsServer](https://github.com/Microsoft/PowerStig/wiki/WindowsDnsServer) | Provides a mechanism to manage Windows DNS Server STIG settings. |
 |[WindowsFirewall](https://github.com/Microsoft/PowerStig/wiki/WindowsFirewall) | Provides a mechanism to manage the Windows Firewall STIG settings. |

diff --git a/Tests/Integration/DSCResources/Office.integration.tests.ps1 b/Tests/Integration/DSCResources/Office.integration.tests.ps1
@@ -8,7 +8,7 @@ try
     #region Integration Tests$
     $configFile = Join-Path -Path $PSScriptRoot -ChildPath "$($script:DSCCompositeResourceName).config.ps1"
     . $configFile
- 
+
     $stigList = Get-StigVersionTable -CompositeResourceName $script:DSCCompositeResourceName
 
     #region Integration Tests