diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-04 12:42:22 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-04 12:42:22 +0530 |
commit | 02b9c22df8053d71782ae11900d0194f217afc3c (patch) | |
tree | 8a581720153199868492fb6ebec7be54573a1861 /guides/source/engines.textile | |
parent | e25eeed5b873f05f9614ecf6720c0eb636d52b63 (diff) | |
parent | f89f74896b711d5b073289c9e485e3357c032cc8 (diff) | |
download | rails-02b9c22df8053d71782ae11900d0194f217afc3c.tar.gz rails-02b9c22df8053d71782ae11900d0194f217afc3c.tar.bz2 rails-02b9c22df8053d71782ae11900d0194f217afc3c.zip |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/engines.textile
Diffstat (limited to 'guides/source/engines.textile')
-rw-r--r-- | guides/source/engines.textile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/engines.textile b/guides/source/engines.textile index 4993cae55a..36210aedb0 100644 --- a/guides/source/engines.textile +++ b/guides/source/engines.textile @@ -125,7 +125,7 @@ Also in the test directory is the +test/integration+ directory, where integratio h3. Providing engine functionality -The engine that this guide covers will provide posting and commenting functionality and follows a similar thread to the "Getting Started Guide":getting-started.html, with some new twists. +The engine that this guide covers will provide posting and commenting functionality and follows a similar thread to the "Getting Started Guide":getting_started.html, with some new twists. h4. Generating a post resource |