diff --git a/actionpack/lib/action_controller/templates/scaffolds/layout.rhtml b/actionpack/lib/action_controller/templates/scaffolds/layout.rhtml index 80996985d2..f03588ffa0 100644 --- a/actionpack/lib/action_controller/templates/scaffolds/layout.rhtml +++ b/actionpack/lib/action_controller/templates/scaffolds/layout.rhtml @@ -1,3 +1,5 @@ + Scaffolding diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 18ab2ba0b9..b22851552a 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,8 +1,10 @@ *SVN* +* Added a DOCTYPE of HTML transitional to the HTML files generated by Rails #1124 [Michael Koziarski] + * SIGTERM also gracefully exits dispatch.fcgi. Ignore SIGUSR1 on Windows. -* Add the option to manually manage garbage collection in the FastCGI dispatcher. Set the number of requests between GC runs in your public/dispatch.fcgi. [skaes@web.de] +* Add the option to manually manage garbage collection in the FastCGI dispatcher. Set the number of requests between GC runs in your public/dispatch.fcgi [skaes@web.de] * Allow dynamic application reloading for dispatch.fcgi processes by sending a SIGHUP. If the process is currently handling a request, the request will be allowed to complete first. This allows production fcgi's to be reloaded without having to restart them. diff --git a/railties/html/404.html b/railties/html/404.html index edbc89bf99..0e1845619d 100644 --- a/railties/html/404.html +++ b/railties/html/404.html @@ -1,3 +1,5 @@ +

File not found

diff --git a/railties/html/500.html b/railties/html/500.html index ee0c919c4a..a1001a008d 100644 --- a/railties/html/500.html +++ b/railties/html/500.html @@ -1,3 +1,5 @@ +

Application error (Apache)

diff --git a/railties/html/index.html b/railties/html/index.html index f1d84b2c94..d547e7fa04 100644 --- a/railties/html/index.html +++ b/railties/html/index.html @@ -1,3 +1,5 @@ + Rails: Welcome on board