Skip to content
This repository
Browse code

Merge pull request #1105 from benmanns/master

Documentation fix.
  • Loading branch information...
commit ac7b41168d58dd71fd5397595d1bd998d2725397 2 parents ba76875 + 26beeb1
Daniel Collis-Puro authored December 21, 2012

Showing 1 changed file with 3 additions and 3 deletions. Show diff stats Hide diff stats

  1. 6  lib/paperclip/storage/s3.rb
6  lib/paperclip/storage/s3.rb
@@ -35,7 +35,7 @@ module Storage
35 35
     #     :s3_permissions => {
36 36
     #       :original => :private
37 37
     #     }
38  
-    #   Or globaly:
  38
+    #   Or globally:
39 39
     #     :s3_permissions => :private
40 40
     #
41 41
     # * +s3_protocol+: The protocol for the URLs generated to your S3 assets. Can be either
@@ -45,7 +45,7 @@ module Storage
45 45
     # * +s3_headers+: A hash of headers or a Proc. You may specify a hash such as
46 46
     #   {'Expires' => 1.year.from_now.httpdate}. If you use a Proc, headers are determined at
47 47
     #   runtime. Paperclip will call that Proc with attachment as the only argument.
48  
-    #   Can be defined both globaly and within a style-specific hash.
  48
+    #   Can be defined both globally and within a style-specific hash.
49 49
     # * +bucket+: This is the name of the S3 bucket that will store your files. Remember
50 50
     #   that the bucket must be unique across all of Amazon S3. If the bucket does not exist
51 51
     #   Paperclip will attempt to create it. The bucket name will not be interpolated.
@@ -84,7 +84,7 @@ module Storage
84 84
     # * +s3_metadata+: These key/value pairs will be stored with the
85 85
     #   object.  This option works by prefixing each key with
86 86
     #   "x-amz-meta-" before sending it as a header on the object
87  
-    #   upload request. Can be defined both globaly and within a style-specific hash.
  87
+    #   upload request. Can be defined both globally and within a style-specific hash.
88 88
     # * +s3_storage_class+: If this option is set to
89 89
     #   <tt>:reduced_redundancy</tt>, the object will be stored using Reduced
90 90
     #   Redundancy Storage.  RRS enables customers to reduce their

0 notes on commit ac7b411

Please sign in to comment.
Something went wrong with that request. Please try again.