fixes #4461 - Fixing the association docs
Merge pull request #184 from daviddavis/temp/20140226071416

fixes #4461 - Fixing the association docs