Skip to content

Commit

Permalink
Merge pull request rails#32227 from ydakuka/fix-notes-marks
Browse files Browse the repository at this point in the history
Fix note marks
  • Loading branch information
eileencodes authored Mar 12, 2018
2 parents aacda9c + f1b1494 commit 76d5160
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion guides/source/action_controller_overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ If you want to set custom headers for a response then `response.headers` is the
response.headers["Content-Type"] = "application/pdf"
```

Note: in the above case it would make more sense to use the `content_type` setter directly.
NOTE: In the above case it would make more sense to use the `content_type` setter directly.

HTTP Authentications
--------------------
Expand Down
2 changes: 1 addition & 1 deletion guides/source/action_mailer_basics.md
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ config.action_mailer.smtp_settings = {
authentication: 'plain',
enable_starttls_auto: true }
```
Note: As of July 15, 2014, Google increased [its security measures](https://support.google.com/accounts/answer/6010255) and now blocks attempts from apps it deems less secure.
NOTE: As of July 15, 2014, Google increased [its security measures](https://support.google.com/accounts/answer/6010255) and now blocks attempts from apps it deems less secure.
You can change your Gmail settings [here](https://www.google.com/settings/security/lesssecureapps) to allow the attempts. If your Gmail account has 2-factor authentication enabled,
then you will need to set an [app password](https://myaccount.google.com/apppasswords) and use that instead of your regular password. Alternatively, you can
use another ESP to send email by replacing 'smtp.gmail.com' above with the address of your provider.
Expand Down
6 changes: 3 additions & 3 deletions guides/source/action_view_overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ Possible output:
</optgroup>
```

Note: Only the `optgroup` and `option` tags are returned, so you still have to wrap the output in an appropriate `select` tag.
NOTE: Only the `optgroup` and `option` tags are returned, so you still have to wrap the output in an appropriate `select` tag.

#### options_for_select

Expand All @@ -1113,7 +1113,7 @@ options_for_select([ "VISA", "MasterCard" ])
# => <option>VISA</option> <option>MasterCard</option>
```

Note: Only the `option` tags are returned, you have to wrap this call in a regular HTML `select` tag.
NOTE: Only the `option` tags are returned, you have to wrap this call in a regular HTML `select` tag.

#### options_from_collection_for_select

Expand All @@ -1130,7 +1130,7 @@ options_from_collection_for_select(@project.people, "id", "name")
# => <option value="#{person.id}">#{person.name}</option>
```

Note: Only the `option` tags are returned, you have to wrap this call in a regular HTML `select` tag.
NOTE: Only the `option` tags are returned, you have to wrap this call in a regular HTML `select` tag.

#### select

Expand Down
2 changes: 1 addition & 1 deletion guides/source/active_record_migrations.md
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ change_column_default :products, :approved, from: true, to: false
This sets `:name` field on products to a `NOT NULL` column and the default
value of the `:approved` field from true to false.

Note: You could also write the above `change_column_default` migration as
NOTE: You could also write the above `change_column_default` migration as
`change_column_default :products, :approved, false`, but unlike the previous
example, this would make your migration irreversible.

Expand Down
2 changes: 1 addition & 1 deletion guides/source/asset_pipeline.md
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,7 @@ config.action_controller.asset_host = ENV['CDN_HOST']



Note: You would need to set `CDN_HOST` on your server to `mycdnsubdomain
NOTE: You would need to set `CDN_HOST` on your server to `mycdnsubdomain
.fictional-cdn.com` for this to work.

Once you have configured your server and your CDN when you serve a webpage that
Expand Down
2 changes: 1 addition & 1 deletion guides/source/security.md
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ Or the attacker places the code into the onmouseover event handler of an image:
There are many other possibilities, like using a `<script>` tag to make a cross-site request to a URL with a JSONP or JavaScript response. The response is executable code that the attacker can find a way to run, possibly extracting sensitive data. To protect against this data leakage, we must disallow cross-site `<script>` tags. Ajax requests, however, obey the browser's same-origin policy (only your own site is allowed to initiate `XmlHttpRequest`) so we can safely allow them to return JavaScript responses.

Note: We can't distinguish a `<script>` tag's origin—whether it's a tag on your own site or on some other malicious site—so we must block all `<script>` across the board, even if it's actually a safe same-origin script served from your own site. In these cases, explicitly skip CSRF protection on actions that serve JavaScript meant for a `<script>` tag.
NOTE: We can't distinguish a `<script>` tag's origin—whether it's a tag on your own site or on some other malicious site—so we must block all `<script>` across the board, even if it's actually a safe same-origin script served from your own site. In these cases, explicitly skip CSRF protection on actions that serve JavaScript meant for a `<script>` tag.

To protect against all other forged requests, we introduce a _required security token_ that our site knows but other sites don't know. We include the security token in requests and verify it on the server. This is a one-liner in your application controller, and is the default for newly created Rails applications:
Expand Down
2 changes: 1 addition & 1 deletion guides/source/upgrading_ruby_on_rails.md
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ xhr :get, :index, format: :js

to explicitly test an `XmlHttpRequest`.

Note: Your own `<script>` tags are treated as cross-origin and blocked by
NOTE: Your own `<script>` tags are treated as cross-origin and blocked by
default, too. If you really mean to load JavaScript from `<script>` tags,
you must now explicitly skip CSRF protection on those actions.

Expand Down

0 comments on commit 76d5160

Please sign in to comment.