diff options
| author | Mingdong Luo <mdluo@nsmss.com> | 2015-01-31 19:23:48 -0800 |
|---|---|---|
| committer | Mingdong Luo <mdluo@nsmss.com> | 2015-01-31 19:23:48 -0800 |
| commit | 549d171a90135999e3c670f489494b7a39dd6dd7 (patch) | |
| tree | 233466527b797fe3ea7c6a7a3673795cea28aebe /guides/source/documents.yaml | |
| parent | c840b18ac31a852d99ff760229f2c087b6961727 (diff) | |
| parent | 70ac072976c8cc6f013f0df3777e54ccae3f4f8c (diff) | |
| download | rails-549d171a90135999e3c670f489494b7a39dd6dd7.tar.gz rails-549d171a90135999e3c670f489494b7a39dd6dd7.tar.bz2 rails-549d171a90135999e3c670f489494b7a39dd6dd7.zip | |
Merge branch 'master' into pr/18316
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'guides/source/documents.yaml')
| -rw-r--r-- | guides/source/documents.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/guides/source/documents.yaml b/guides/source/documents.yaml index 52de98ee52..7ae3640937 100644 --- a/guides/source/documents.yaml +++ b/guides/source/documents.yaml @@ -33,7 +33,7 @@ url: active_record_querying.html description: This guide covers the database query interface provided by Active Record. - - name: Active Model basics + name: Active Model Basics url: active_model_basics.html description: This guide covers the use of model classes without Active Record. work_in_progress: true @@ -118,9 +118,9 @@ url: initialization.html description: This guide explains the internals of the Rails initialization process as of Rails 4 - - name: Constant Autoloading and Reloading - url: constant_autoloading_and_reloading.html - description: This guide documents how constant autoloading and reloading work. + name: Autoloading and Reloading Constants + url: autoloading_and_reloading_constants.html + description: This guide documents how autoloading and reloading constants work. - name: Active Support Instrumentation work_in_progress: true |