Skip to content

Commit

Permalink
Merge pull request rails#31481 from claudiob/fix-ast-guides
Browse files Browse the repository at this point in the history
[ci skip] Use :amazon, not :s3, so that guides reflect the current code
  • Loading branch information
claudiob authored Dec 15, 2017
2 parents 6bd2890 + 6211445 commit ca2c4cb
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions guides/source/active_storage_overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ the migration is generated automatically.

Declare Active Storage services in `config/storage.yml`. For each service your
application uses, provide a name and the requisite configuration. The example
below declares three services named `local`, `test`, and `s3`:
below declares three services named `local`, `test`, and `amazon`:

```yaml
local:
Expand All @@ -57,7 +57,7 @@ test:
service: Disk
root: <%= Rails.root.join("tmp/storage") %>

s3:
amazon:
service: S3
access_key_id: ""
secret_access_key: ""
Expand All @@ -75,12 +75,12 @@ development environment, you would add the following to
config.active_storage.service = :local
```

To use the s3 service in production, you add the following to
To use the Amazon S3 service in production, you add the following to
`config/environments/production.rb`:

```ruby
# Store files in S3.
config.active_storage.service = :s3
# Store files on Amazon S3.
config.active_storage.service = :amazon
```

Continue reading for more information on the built-in service adapters (e.g.
Expand All @@ -101,7 +101,7 @@ local:
Declare an S3 service in `config/storage.yml`:

``` yaml
s3:
amazon:
service: S3
access_key_id: ""
secret_access_key: ""
Expand Down

0 comments on commit ca2c4cb

Please sign in to comment.