Merge pull request #91 from MorrisA/master

Minor changes to remove errors I was seeing in Puppet
2013-01-28 16:34:40 -08:00 · 2013-01-28 16:34:40 -08:00 · 6ec85968a5
commit 6ec85968a5
parent 26c270f164 39d1417fbd
6 changed files with 6 additions and 6 deletions
--- a/manifests/proxy/authtoken.pp
+++ b/manifests/proxy/authtoken.pp
@ -13,7 +13,7 @@
 #  [admin_password] Password used with user to authenticate service.
 #    Optional. Defaults to ChangeMe.
 #  [delay_decision] Set to 1 to support token-less access (anonymous access,
-#    tempurl, …)
+#    tempurl, ...)
 #    Optional, Defaults to 0
 #  [auth_host] Host providing the keystone service API endpoint. Optional.
 #    Defaults to 127.0.0.1
--- a/manifests/proxy/catch_errors.pp
+++ b/manifests/proxy/catch_errors.pp
@ -9,7 +9,7 @@
 #
 # == Authors
 #
-#   François Charlier fcharlier@ploup.net
+#   Francois Charlier fcharlier@ploup.net
 #
 # == Copyright
 #
--- a/manifests/proxy/keystone.pp
+++ b/manifests/proxy/keystone.pp
@ -14,7 +14,7 @@
 # == Authors
 #
 #  Dan Bode dan@puppetlabs.com
-#  François Charlier fcharlier@ploup.net
+#  Francois Charlier fcharlier@ploup.net
 #

 class swift::proxy::keystone(
--- a/manifests/proxy/ratelimit.pp
+++ b/manifests/proxy/ratelimit.pp
@ -23,7 +23,7 @@
 #
 # == Authors
 #
-#   François Charlier fcharlier@ploup.net
+#   Francois Charlier fcharlier@ploup.net
 #
 # == Copyright
 #
--- a/manifests/proxy/s3token.pp
+++ b/manifests/proxy/s3token.pp
@ -15,7 +15,7 @@
 #
 # == Authors
 #
-#   François Charlier fcharlier@ploup.net
+#   Francois Charlier fcharlier@ploup.net
 #
 # == Copyright
 #
--- a/manifests/proxy/swift3.pp
+++ b/manifests/proxy/swift3.pp
@ -7,7 +7,7 @@
 #
 # == Authors
 #
-#   François Charlier fcharlier@ploup.net
+#   Francois Charlier fcharlier@ploup.net
 #   Joe Topjian joe@topjian.net
 #
 # == Copyright