aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorBrandon Tilley <binarymuse@binarymuse.net>2010-08-09 15:46:39 -0700
committerBrandon Tilley <binarymuse@binarymuse.net>2010-08-09 15:46:39 -0700
commitdd1b33078addb07fa2c2efb133f079be38c45657 (patch)
tree7e87bfd6fb5a776f942e5235491a55028334a93f /railties
parent190e270db2e2cc802216b4eb7e300bed372259cf (diff)
downloadrails-dd1b33078addb07fa2c2efb133f079be38c45657.tar.gz
rails-dd1b33078addb07fa2c2efb133f079be38c45657.tar.bz2
rails-dd1b33078addb07fa2c2efb133f079be38c45657.zip
Fixed problem with markup that caused an extra symbol in a function name when rendered.
Diffstat (limited to 'railties')
-rw-r--r--railties/guides/source/association_basics.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/association_basics.textile b/railties/guides/source/association_basics.textile
index b1ee4b8be4..fd1e7f4baf 100644
--- a/railties/guides/source/association_basics.textile
+++ b/railties/guides/source/association_basics.textile
@@ -550,7 +550,7 @@ build_customer
create_customer
</ruby>
-h6. _association_(force_reload = false)
+h6. <em>association</em>(force_reload = false)
The <tt><em>association</em></tt> method returns the associated object, if any. If no associated object is found, it returns +nil+.