Merge branch 'active-model-secure-password-guide' of https://github.com/aditya-kapoor/rails into aditya-kapoor-active-model-secure-password-guide
Conflicts:
guides/source/active_model_basics.md
- Some grammatical errors and rewording of sentences throughout document
- Renaming headers to be more human readable, and if following paragraphs do not include module
names, adding those in
- In ActiveModel::AttributeMethods
* formatting expected output correctly, changing from `#` to `# =>`
- In ActiveModel::Dirty
* changing expected output of person.first_name_was from "First Name" to nil
* removing 'active_model' requirement at top of code snippet
- In ActiveModel::Validations
* originally Person.new(token: "2b1f325") raises an argument error (1 for 0), so setting of
attribute occurs on the line after object instantiation
- In ActiveModel::Naming
* closing code snippet tag at end of section so ActiveModel::Model is a separate section
- In ActiveModel::Model
* fixing spelling mistake of attr_accessor
- In ActiveModel::Serialization
* adding edit to description of how from_json and from_xml works under serialization
- In ActiveModel::Lint::Tests
* capitalizing person for class name
These methods may cause confusion with the `reset_changes` that
behaves differently
of them.
Also rename undo_changes to restore_changes to match this new set of
methods.
The other way it was not marking the text as italic, it was showing the
underlines as normal text.
Also fixes some code examples indentation and # => marks in Active Model
and Active Record guides.
[ci skip]
