Permalink
Browse files

Merge pull request #1105 from benmanns/master

Documentation fix.
  • Loading branch information...
2 parents ba76875 + 26beeb1 commit ac7b41168d58dd71fd5397595d1bd998d2725397 Daniel Collis-Puro committed Dec 21, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 lib/paperclip/storage/s3.rb
@@ -35,7 +35,7 @@ module Storage
# :s3_permissions => {
# :original => :private
# }
- # Or globaly:
+ # Or globally:
# :s3_permissions => :private
#
# * +s3_protocol+: The protocol for the URLs generated to your S3 assets. Can be either
@@ -45,7 +45,7 @@ module Storage
# * +s3_headers+: A hash of headers or a Proc. You may specify a hash such as
# {'Expires' => 1.year.from_now.httpdate}. If you use a Proc, headers are determined at
# runtime. Paperclip will call that Proc with attachment as the only argument.
- # Can be defined both globaly and within a style-specific hash.
+ # Can be defined both globally and within a style-specific hash.
# * +bucket+: This is the name of the S3 bucket that will store your files. Remember
# that the bucket must be unique across all of Amazon S3. If the bucket does not exist
# Paperclip will attempt to create it. The bucket name will not be interpolated.
@@ -84,7 +84,7 @@ module Storage
# * +s3_metadata+: These key/value pairs will be stored with the
# object. This option works by prefixing each key with
# "x-amz-meta-" before sending it as a header on the object
- # upload request. Can be defined both globaly and within a style-specific hash.
+ # upload request. Can be defined both globally and within a style-specific hash.
# * +s3_storage_class+: If this option is set to
# <tt>:reduced_redundancy</tt>, the object will be stored using Reduced
# Redundancy Storage. RRS enables customers to reduce their

0 comments on commit ac7b411

Please sign in to comment.