diff --git a/src/v0.10/guide/resources.md b/src/v0.10/guide/resources.md index e5e917c..90d093a 100644 --- a/src/v0.10/guide/resources.md +++ b/src/v0.10/guide/resources.md @@ -488,7 +488,7 @@ The relationship methods (`relationship`, `has_one`, and `has_many`) support the * `relation_name` - the name of the relation to use on the model. A lambda may be provided which allows conditional selection of the relation based on the context. * `always_include_linkage_data` - if set to true, the serialized relationship will include the type and id of the related record under a `data` key. Defaults to false if not set. * `eager_load_on_include` - if set to false, will not include this relationship in join SQL when requested via an include. You usually want to leave this on, but it will break 'relationships' which are not active record, for example if you want to expose a tree using the `ancestry` gem or similar, or the SQL query becomes too large to handle. Defaults to true if not set. - * `exclude_links` - accepts either `:default`, `:none`, or and array containing the specific default links to exclude, which may be `:self` and `:related`. Use this to supress warning for links which are not routeable or when you wish to prevent a client from following the links. + * `exclude_links` - accepts either `:default`, `:none`, or an array containing the specific default links to exclude, which may be `:self` and `:related`. Use this to supress warning for links which are not routeable or when you wish to prevent a client from following the links. `to_one` relationships support the additional option: * `foreign_key_on` - defaults to `:self`. To indicate that the foreign key is on the related resource specify `:related`. diff --git a/src/v0.9/guide/resources.md b/src/v0.9/guide/resources.md index c131ab8..662def3 100644 --- a/src/v0.9/guide/resources.md +++ b/src/v0.9/guide/resources.md @@ -470,7 +470,7 @@ The relationship methods (`relationship`, `has_one`, and `has_many`) support the * `relation_name` - the name of the relation to use on the model. A lambda may be provided which allows conditional selection of the relation based on the context. * `always_include_linkage_data` - if set to true, the serialized relationship will include the type and id of the related record under a `data` key. Defaults to false if not set. * `eager_load_on_include` - if set to false, will not include this relationship in join SQL when requested via an include. You usually want to leave this on, but it will break 'relationships' which are not active record, for example if you want to expose a tree using the `ancestry` gem or similar, or the SQL query becomes too large to handle. Defaults to true if not set. - * `exclude_links` - accepts either `:default`, `:none`, or and array containing the specific default links to exclude, which may be `:self` and `:related`. Use this to supress warning for links which are not routeable or when you wish to prevent a client from following the links. + * `exclude_links` - accepts either `:default`, `:none`, or an array containing the specific default links to exclude, which may be `:self` and `:related`. Use this to supress warning for links which are not routeable or when you wish to prevent a client from following the links. `to_one` relationships support the additional option: * `foreign_key_on` - defaults to `:self`. To indicate that the foreign key is on the related resource specify `:related`.