Merge pull request puppetlabs#1254 from olivierHa/master

Fix typo about dynamic AddHandler/AddType

Author: igalic

manifests/params.pp

@@ -35,7 +35,7 @@
       'type-map' => 'var'
       },
     'AddType'    => {
-      'type-map' => '.shtml'
+      'text/html' => '.shtml'
       },
     'AddOutputFilter' => {
       'INCLUDES'      => '.shtml'

spec/acceptance/mod_mime_spec.rb

@@ -33,7 +33,7 @@ class { 'apache': }
     describe file("#{mod_dir}/mime.conf") do
       it { is_expected.to contain "AddType application/x-compress .Z" }
       it { is_expected.to contain "AddHandler type-map var\n" }
-      it { is_expected.to contain "AddType type-map .shtml\n" }
+      it { is_expected.to contain "AddType text/html .shtml\n" }
       it { is_expected.to contain "AddOutputFilter INCLUDES .shtml\n" }
     end
   end