sinatra 1.3.0.c → 1.3.0.d

data/README.es.rdoc

@@ -597,6 +597,19 @@ La gem/librería <tt>slim</tt> es necesaria para renderizar plantillas Slim:
 
 Renderiza <tt>./views/index.slim</tt>.
 
+=== Plantillas Creole
+
+La gem/librería <tt>creole</tt> es necesaria para renderizar plantillas Creole:
+
+  # Vas a necesitar requerir creole en tu app
+  require 'creole'
+
+  get '/' do
+    creole :index
+  end
+
+Renderiza <tt>./views/index.creole</tt>.
+
 === Plantillas CoffeeScript
 
 La gem/librería <tt>coffee-script</tt> y al menos <b>una</b> de las siguientes
@@ -883,8 +896,8 @@ Cuando querés obtener el resultado de la llamada a una ruta, +pass+ no te va a
 servir.  Para lograr esto, podés usar +call+:
 
   get '/foo' do
-    status, headers, body = call request.env.merge("PATH_INFO" => '/bar')
-    [status, body.upcase]
+    status, headers, body = call env.merge("PATH_INFO" => '/bar')
+    [status, headers, body.map(&:upcase)]
   end
 
   get '/bar' do
@@ -1367,9 +1380,11 @@ Podés acceder a estas opciones utilizando el método <tt>settings</tt>:
 [static]              define si Sinatra debe encargarse de servir archivos
                       estáticos.
 
-                      Deshabilitala cuando usés un servidor capaz de hacerlo
-                      por sí solo, porque mejorará el rendimiento.  Se encuentra
-                      habilitada por defecto.
+                      Deshabilitala cuando usés un servidor capaz de
+                      hacerlo por sí solo, porque mejorará el
+                      rendimiento.  Se encuentra habilitada por
+                      defecto en el estilo clásico y desactivado en el
+                      el modular.
 
 [views]               directorio de las vistas.
 
@@ -1401,7 +1416,7 @@ obtener de la variable Rack <tt>sinatra.error</tt>:
 Errores personalizados:
 
   error MiErrorPersonalizado do
-    'Lo que pasó fue...' request.env['sinatra.error'].message
+    'Lo que pasó fue...' + env['sinatra.error'].message
   end
 
 Entonces, si pasa esto:
@@ -1570,6 +1585,7 @@ entre sus configuraciones:
   logging             true                         false
   method_override     true                         false
   inline_templates    true                         false
+  static              true                         false
 
 === Sirviendo una Aplicación Modular
 
@@ -1936,3 +1952,7 @@ siguiendo las especificaciones SemVer y SemVerTag.
 * {Twitter}[http://twitter.com/sinatra]
 * {Lista de Correo}[http://groups.google.com/group/sinatrarb/topics]
 * {IRC: #sinatra}[irc://chat.freenode.net/#sinatra] en http://freenode.net
+* Documentación de la API para la
+  {última versión liberada}[http://rubydoc.info/gems/sinatra] o para la
+  {rama de desarrollo actual}[http://rubydoc.info/github/sinatra/sinatra]
+  en http://rubydoc.info/

data/README.fr.rdoc

@@ -618,6 +618,20 @@ Le gem slim est nécessaire pour utiliser la fonction de rendu Slim:
 
 Utilisera <tt>./views/index.slim</tt>.
 
+=== Templates Creole
+
+Le gem <tt>creole</tt> est nécessaire pour utiliser la fonction de rendu
+Creole:
+
+  # Chargez la bibliothèque creole dans votre application
+  require 'creole'
+
+  get '/' do
+    creole :index
+  end
+
+Utilisera <tt>./views/index.creole</tt>.
+
 === Templates CoffeeScript
 
 Le gem <tt>coffee-script</tt> est nécessaire ainsi que l'<b>une</b> des
@@ -911,8 +925,8 @@ souhaitez obtenir le résultat d'une autre route. Pour cela, utilisez
 simplement +call+ :
 
   get '/foo' do
-    status, headers, body = call request.env.merge("PATH_INFO" => '/bar')
-    [status, body.upcase]
+    status, headers, body = call env.merge("PATH_INFO" => '/bar')
+    [status, headers, body.map(&:upcase)]
   end
 
   get '/bar' do
@@ -1443,7 +1457,7 @@ variable Rack <tt>sinatra.error</tt>:
 Erreur sur mesure:
 
   error MonErreurSurMesure do
-    'Donc il est arrivé ceci...' + request.env['sinatra.error'].message
+    'Donc il est arrivé ceci...' + env['sinatra.error'].message
   end
 
 Donc si ceci arrive:

data/README.hu.rdoc

@@ -399,7 +399,7 @@ előszűrő kivételt vált ki. A kivétel objektum lehívható a
 Egyéni hibakezelés:
 
   error MyCustomError do
-    'Szóval az van, hogy...' + request.env['sinatra.error'].message
+    'Szóval az van, hogy...' + env['sinatra.error'].message
   end
 
 És amikor fellép:

data/README.jp.rdoc

@@ -432,6 +432,19 @@ Slimテンプレートを使うにはslimライブラリが必要です:
 
 <tt>./views/index.slim</tt>を表示します。
 
+=== Creole テンプレート
+
+Creoleテンプレートを使うにはcreoleライブラリが必要です:
+
+  # creoleを読み込みます
+  require 'creole'
+
+  get '/' do
+    creole :index
+  end
+
+<tt>./views/index.creole</tt>を表示します。
+
 === CoffeeScript テンプレート
 
 CoffeeScriptテンプレートを表示するにはcoffee-scriptライブラリと`coffee`バイナリが必要です:
@@ -700,7 +713,7 @@ body部を指定することもできます ...
 エラーをカスタマイズする場合は、
 
   error MyCustomError do
-    'エラーメッセージ...' + request.env['sinatra.error'].message
+    'エラーメッセージ...' + env['sinatra.error'].message
   end
 
 と書いておいて,下記のように呼び出します。

data/README.pt-br.rdoc

@@ -431,7 +431,7 @@ Rack <tt>sinatra.error</tt>:
 Erros customizados:
 
   error MeuErroCustomizado do
-    'Então que aconteceu foi...' + request.env['sinatra.error'].message
+    'Então que aconteceu foi...' + env['sinatra.error'].message
   end
 
 Então, se isso acontecer:

data/README.pt-pt.rdoc

@@ -430,7 +430,7 @@ Rack <tt>sinatra.error</tt>:
 Erros personalizados:
 
   error MeuErroPersonalizado do
-    'O que aconteceu foi...' + request.env['sinatra.error'].message
+    'O que aconteceu foi...' + env['sinatra.error'].message
   end
 
 Então, se isso acontecer:

data/README.rdoc

@@ -209,195 +209,163 @@ Note that the public directory name is not included in the URL. A file
 
 == Views / Templates
 
-Templates are assumed to be located directly under the <tt>./views</tt>
-directory. To use a different views directory:
-
-  set :views, File.dirname(__FILE__) + '/templates'
-
-One important thing to remember is that you always have to reference
-templates with symbols, even if they're in a subdirectory (in this
-case, use <tt>:'subdir/template'</tt>). You must use a symbol because
-otherwise rendering methods will render any strings passed to them
-directly.
-
-=== Haml Templates
-
-The <tt>haml</tt> gem/library is required to render HAML templates:
-
-  # You'll need to require haml in your app
-  require 'haml'
+Each template language is exposed as via its own rendering method. These
+methods simply return a string:
 
   get '/' do
-    haml :index
+    erb :index
   end
 
-Renders <tt>./views/index.haml</tt>.
+This renders <tt>views/index.erb</tt>.
 
-{Haml's options}[http://haml-lang.com/docs/yardoc/file.HAML_REFERENCE.html#options]
-can be set globally through Sinatra's configurations,
-see {Options and Configurations}[http://www.sinatrarb.com/configuration.html],
-and overridden on an individual basis.
-
-  set :haml, :format => :html5 # default Haml format is :xhtml
+Instead of a template name, you can also just pass in the template content
+directly:
 
   get '/' do
-    haml :index, :format => :html4 # overridden
+    code = "<%= Time.now >"
+    erb code
   end
 
-
-=== Erb Templates
-
-  # You'll need to require erb in your app
-  require 'erb'
+Templates take a second argument, the options hash:
 
   get '/' do
-    erb :index
+    erb :index, :layout => :post
   end
 
-Renders <tt>./views/index.erb</tt>.
-
-=== Erubis Templates
-
-The <tt>erubis</tt> gem/library is required to render Erubis templates:
+This will render <tt>views/index.erb</tt> embedded in the
+<tt>views/post.erb</tt> (default is <tt>views/layout.erb</tt>, if it exists).
 
-  # You'll need to require erubis in your app
-  require 'erubis'
+Any options not understood by Sinatra will be passed on to the template
+engine:
 
   get '/' do
-    erubis :index
+    haml :index, :format => :html5
   end
 
-Renders <tt>./views/index.erubis</tt>.
+You can also set options per template language in general:
 
-It is also possible to replace Erb with Erubis:
+  set :haml, :format => :html5
 
-  require 'erubis'
-  Tilt.register :erb, Tilt[:erubis]
-  
   get '/' do
-    erb :index
+    haml :index
   end
 
-Renders <tt>./views/index.erb</tt> with Erubis.
+Options passed to the render method override options set via +set+.
 
-=== Builder Templates
-
-The <tt>builder</tt> gem/library is required to render builder templates:
+Available Options:
 
-  # You'll need to require builder in your app
-  require 'builder'
+[locals]
+  List of locals passed to the document. Handy with partials.
+  Example: <tt>erb "<%= foo %>", :locals => {:foo => "bar"}</tt>
 
-  get '/' do
-    builder :index
-  end
+[default_encoding]
+  String encoding to use if uncertain. Defaults to
+  <tt>settings.default_encoding</tt>.
 
-Renders <tt>./views/index.builder</tt>.
+[views]
+  Views folder to load templates from. Defaults to <tt>settings.views</tt>.
 
-=== Nokogiri Templates
+[layout]
+  Whether to use a layout (+true+ or +false+), if it's a Symbol, specifies
+  what template to use. Example: <tt>erb :index, :layout => request.xhr?</tt>
 
-The <tt>nokogiri</tt> gem/library is required to render nokogiri templates:
+[content_type]
+  Content-Type the template produces, default depends on template language.
 
-  # You'll need to require nokogiri in your app
-  require 'nokogiri'
+[scope]
+  Scope to render template under. Defaults to the application instance. If you
+  change this, instance variables and helper methods will not be available.
 
-  get '/' do
-    nokogiri :index
-  end
+[layout_engine]
+  Template engine to use for rendering the layout. Useful for languages that
+  do not support layouts otherwise. Defaults to the engine used for the
+  temple. Example: <tt>set :rdoc, :layout_engine => :erb</tt>
 
-Renders <tt>./views/index.nokogiri</tt>.
+Templates are assumed to be located directly under the <tt>./views</tt>
+directory. To use a different views directory:
 
-=== Sass Templates
+  set :views, settings.root + '/templates'
 
-The <tt>haml</tt> or <tt>sass</tt> gem/library is required to render Sass templates:
+One important thing to remember is that you always have to reference
+templates with symbols, even if they're in a subdirectory (in this
+case, use <tt>:'subdir/template'</tt>). You must use a symbol because
+otherwise rendering methods will render any strings passed to them
+directly.
 
-  # You'll need to require haml or sass in your app
-  require 'sass'
+=== Available Template Languages
 
-  get '/stylesheet.css' do
-    sass :stylesheet
-  end
+Some languages have multiple implementations. To specify what implementation
+to use (and to be thread-safe), you should simply require it first:
 
-Renders <tt>./views/stylesheet.sass</tt>.
+  require 'rdiscount' # or require 'bluecloth'
+  get('/') { markdown :index }
 
-{Sass's options}[http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#options]
-can be set globally through Sinatra's configurations,
-see {Options and Configurations}[http://www.sinatrarb.com/configuration.html],
-and overridden on an individual basis.
+=== Haml Templates
 
-  set :sass, :style => :compact # default Sass style is :nested
+Dependency::        {haml}[http://haml-lang.com/]
+File Extensions::   <tt>.haml</tt>
+Example::           <tt>haml :index, :format => :html5</tt>
 
-  get '/stylesheet.css' do
-    sass :stylesheet, :style => :expanded # overridden
-  end
+=== Erb Templates
 
-=== Scss Templates
+Dependency::        {erubis}[http://www.kuwata-lab.com/erubis/] or
+                    erb (included in Ruby)
+File Extensions::   <tt>.erb</tt>, <tt>.rhtml</tt> or <tt>.erubis</tt> (Erubis
+                    only)
+Example::           <tt>erb :index</tt>
 
-The <tt>haml</tt> or <tt>sass</tt> gem/library is required to render Scss templates:
+=== Builder Templates
 
-  # You'll need to require haml or sass in your app
-  require 'sass'
+Dependency::        {builder}[http://builder.rubyforge.org/]
+File Extensions::   <tt>.builder</tt>
+Example::           <tt>builder { |xml| xml.em "hi" }</tt>
 
-  get '/stylesheet.css' do
-    scss :stylesheet
-  end
+It also takes a block for inline templates (see example).
 
-Renders <tt>./views/stylesheet.scss</tt>.
+=== Nokogiri Templates
 
-{Scss's options}[http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#options]
-can be set globally through Sinatra's configurations,
-see {Options and Configurations}[http://www.sinatrarb.com/configuration.html],
-and overridden on an individual basis.
+Dependency::        {nokogiri}[http://nokogiri.org/]
+File Extensions::   <tt>.nokogiri</tt>
+Example::           <tt>builder { |xml| xml.em "hi" }</tt>
 
-  set :scss, :style => :compact # default Scss style is :nested
+It also takes a block for inline templates (see example).
 
-  get '/stylesheet.css' do
-    scss :stylesheet, :style => :expanded # overridden
-  end
+=== Sass Templates
 
-=== Less Templates
+Dependency::        {sass}[http://sass-lang.com/]
+File Extensions::   <tt>.sass</tt>
+Example::           <tt>sass :stylesheet, :style => :expanded</tt>
 
-The <tt>less</tt> gem/library is required to render Less templates:
+=== SCSS Templates
 
-  # You'll need to require less in your app
-  require 'less'
+Dependency::        {sass}[http://sass-lang.com/]
+File Extensions::   <tt>.scss</tt>
+Example::           <tt>scss :stylesheet, :style => :expanded</tt>
 
-  get '/stylesheet.css' do
-    less :stylesheet
-  end
+=== Less Templates
 
-Renders <tt>./views/stylesheet.less</tt>.
+Dependency::        {less}[http://www.lesscss.org/]
+File Extensions::   <tt>.less</tt>
+Example::           <tt>less :stylesheet</tt>
 
 === Liquid Templates
 
-The <tt>liquid</tt> gem/library is required to render Liquid templates:
-
-  # You'll need to require liquid in your app
-  require 'liquid'
-
-  get '/' do
-    liquid :index
-  end
-
-Renders <tt>./views/index.liquid</tt>.
+Dependency::        {liquid}[http://www.liquidmarkup.org/]
+File Extensions::   <tt>.liquid</tt>
+Example::           <tt>liquid :index, :locals => { :key => 'value' }</tt>
 
 Since you cannot call Ruby methods (except for +yield+) from a Liquid
-template, you almost always want to pass locals to it:
-
-  liquid :index, :locals => { :key => 'value' }
+template, you almost always want to pass locals to it.
 
 === Markdown Templates
 
-The <tt>rdiscount</tt> gem/library is required to render Markdown templates:
-
-  # You'll need to require rdiscount in your app
-  require "rdiscount"
-  
-  get '/' do
-    markdown :index
-  end
-
-Renders <tt>./views/index.markdown</tt> (+md+ and +mkd+ are also valid file
-extensions).
+Dependency::        {rdiscount}[https://github.com/rtomayko/rdiscount],
+                    {redcarpet}[https://github.com/tanoku/redcarpet],
+                    {bluecloth}[http://deveiate.org/projects/BlueCloth],
+                    {kramdown}[http://kramdown.rubyforge.org/] *or*
+                    {maruku}[http://maruku.rubyforge.org/]
+File Extensions::   <tt>.markdown</tt>, <tt>.mkd</tt> and <tt>.md</tt>
+Example::           <tt>markdown :index, :layout_engine => :erb</tt>
 
 It is not possible to call methods from markdown, nor to pass locals to it.
 You therefore will usually use it in combination with another rendering
@@ -412,52 +380,13 @@ Note that you may also call the +markdown+ method from within other templates:
 
 Since you cannot call Ruby from Markdown, you cannot use layouts written in
 Markdown. However, it is possible to use another rendering engine for the
-template than for the layout by passing the <tt>:layout_engine</tt> option:
-
-  get '/' do
-    markdown :index, :layout_engine => :erb
-  end
-
-This will render <tt>./views/index.md</tt> with <tt>./views/layout.erb</tt> as
-layout.
-
-Remember that you can set such rendering options globally:
-
-  set :markdown, :layout_engine => :haml, :layout => :post
-
-  get '/' do
-    markdown :index
-  end
-
-This will render <tt>./views/index.md</tt> (and any other Markdown template)
-with <tt>./views/post.haml</tt> as layout.
-
-It is also possible to parse Markdown with BlueCloth rather than RDiscount:
-
-  require 'bluecloth'
-  
-  Tilt.register 'markdown', BlueClothTemplate
-  Tilt.register 'mkd',      BlueClothTemplate
-  Tilt.register 'md',       BlueClothTemplate
-  
-  get '/' do
-    markdown :index
-  end
-
-Renders <tt>./views/index.md</tt> with BlueCloth.
+template than for the layout by passing the <tt>:layout_engine</tt> option.
 
 === Textile Templates
 
-The <tt>RedCloth</tt> gem/library is required to render Textile templates:
-
-  # You'll need to require redcloth in your app
-  require "redcloth"
-
-  get '/' do
-    textile :index
-  end
-
-Renders <tt>./views/index.textile</tt>.
+Dependency::        {RedCloth}[http://redcloth.org/]
+File Extensions::   <tt>.textile</tt>
+Example::           <tt>textile :index, :layout_engine => :erb</tt>
 
 It is not possible to call methods from textile, nor to pass locals to it. You
 therefore will usually use it in combination with another rendering engine:
@@ -471,38 +400,13 @@ Note that you may also call the +textile+ method from within other templates:
 
 Since you cannot call Ruby from Textile, you cannot use layouts written in
 Textile. However, it is possible to use another rendering engine for the
-template than for the layout by passing the <tt>:layout_engine</tt> option:
-
-  get '/' do
-    textile :index, :layout_engine => :erb
-  end
-
-This will render <tt>./views/index.textile</tt> with
-<tt>./views/layout.erb</tt> as layout.
-
-Remember that you can set such rendering options globally:
-
-  set :textile, :layout_engine => :haml, :layout => :post
-
-  get '/' do
-    textile :index
-  end
-
-This will render <tt>./views/index.textile</tt> (and any other Textile
-template) with <tt>./views/post.haml</tt> as layout.
+template than for the layout by passing the <tt>:layout_engine</tt> option.
 
 === RDoc Templates
 
-The <tt>rdoc</tt> gem/library is required to render RDoc templates:
-
-  # You'll need to require rdoc/markup/to_html in your app
-  require "rdoc/markup/to_html"
-
-  get '/' do
-    rdoc :index
-  end
-
-Renders <tt>./views/index.rdoc</tt>.
+Dependency::        {rdoc}[http://rdoc.rubyforge.org/]
+File Extensions::   <tt>.rdoc</tt>
+Example::           <tt>textile :README, :layout_engine => :erb</tt>
 
 It is not possible to call methods from rdoc, nor to pass locals to it. You
 therefore will usually use it in combination with another rendering engine:
@@ -516,97 +420,57 @@ Note that you may also call the +rdoc+ method from within other templates:
 
 Since you cannot call Ruby from RDoc, you cannot use layouts written in
 RDoc. However, it is possible to use another rendering engine for the
-template than for the layout by passing the <tt>:layout_engine</tt> option:
-
-  get '/' do
-    rdoc :index, :layout_engine => :erb
-  end
-
-This will render <tt>./views/index.rdoc</tt> with <tt>./views/layout.erb</tt> as
-layout.
-
-Remember that you can set such rendering options globally:
-
-  set :rdoc, :layout_engine => :haml, :layout => :post
-
-  get '/' do
-    rdoc :index
-  end
-
-This will render <tt>./views/index.rdoc</tt> (and any other RDoc template)
-with <tt>./views/post.haml</tt> as layout.
+template than for the layout by passing the <tt>:layout_engine</tt> option.
 
 === Radius Templates
 
-The <tt>radius</tt> gem/library is required to render Radius templates:
-
-  # You'll need to require radius in your app
-  require 'radius'
-
-  get '/' do
-    radius :index
-  end
-
-Renders <tt>./views/index.radius</tt>.
+Dependency::        {radius}[http://radius.rubyforge.org/]
+File Extensions::   <tt>.radius</tt>
+Example::           <tt>radius :index, :locals => { :key => 'value' }</tt>
 
-Since you cannot call Ruby methods (except for +yield+) from a Radius
-template, you almost always want to pass locals to it:
-
-  radius :index, :locals => { :key => 'value' }
+Since you cannot call Ruby methods directly from a Radius template, you almost
+always want to pass locals to it.
 
 === Markaby Templates
 
-The <tt>markaby</tt> gem/library is required to render Markaby templates:
+Dependency::        {markaby}[http://markaby.github.com/]
+File Extensions::   <tt>.mab</tt>
+Example::           <tt>markaby { h1 "Welcome!" }</tt>
 
-  # You'll need to require markaby in your app
-  require 'markaby'
-
-  get '/' do
-    markaby :index
-  end
-
-Renders <tt>./views/index.mab</tt>.
-
-You may also use inline Markaby:
-
-  get '/' do
-    markaby { h1 "Welcome!" }
-  end
+It also takes a block for inline templates (see example).
 
 === Slim Templates
 
-The <tt>slim</tt> gem/library is required to render Slim templates:
-
-  # You'll need to require slim in your app
-  require 'slim'
+Dependency::        {slim}[http://slim-lang.com/]
+File Extensions::   <tt>.slim</tt>
+Example::           <tt>slim :index</tt>
 
-  get '/' do
-    slim :index
-  end
+=== Creole Templates
 
-Renders <tt>./views/index.slim</tt>.
-
-=== CoffeeScript Templates
+Dependency::        {creole}[https://github.com/minad/creole]
+File Extensions::   <tt>.creole</tt>
+Example::           <tt>creole :wiki, :layout_engine => :erb</tt>
 
-The <tt>coffee-script</tt> gem/library and at least <b>one</b> of the
-following options to execute JavaScript:
+It is not possible to call methods from creole, nor to pass locals to it. You
+therefore will usually use it in combination with another rendering engine:
 
-* +node+ (from Node.js) in your path
-* you must be running on OSX
-* +therubyracer+ gem/library
+  erb :overview, :locals => { :text => creole(:introduction) }
 
-See http://github.com/josh/ruby-coffee-script for an updated list of options.
+Note that you may also call the +creole+ method from within other templates:
 
-Now you can render CoffeeScript templates:
+  %h1 Hello From Haml!
+  %p= creole(:greetings)
 
-  # You'll need to require coffee-script in your app
-  require 'coffee-script'
+Since you cannot call Ruby from Creole, you cannot use layouts written in
+Creole. However, it is possible to use another rendering engine for the
+template than for the layout by passing the <tt>:layout_engine</tt> option.
 
-  get '/application.js' do
-    coffee :application
-  end
+=== CoffeeScript Templates
 
-Renders <tt>./views/application.coffee</tt>.
+Dependency::        {coffee-script}[https://github.com/josh/ruby-coffee-script]
+                    and a {way to execute javascript}[https://github.com/sstephenson/execjs/blob/master/README.md#readme]
+File Extensions::   <tt>.coffee</tt>
+Example::           <tt>coffee :index</tt>
 
 === Embedded Templates
 
@@ -863,8 +727,8 @@ Sometimes +pass+ is not what you want, instead you would like to get the result
 of calling another route. Simply use +call+ to achieve this:
 
   get '/foo' do
-    status, headers, body = call request.env.merge("PATH_INFO" => '/bar')
-    [status, body.upcase]
+    status, headers, body = call env.merge("PATH_INFO" => '/bar')
+    [status, headers, body.map(&:upcase)]
   end
 
   get '/bar' do
@@ -1328,7 +1192,8 @@ You can access those options via <tt>settings</tt>:
 [static]              Whether Sinatra should handle serving static files.
                       Disable when using a Server able to do this on its own.
                       Disabling will boost performance.
-                      Enabled per default.
+                      Enabled per default in classic style, disabled for
+                      modular apps.
 
 [views]               views folder.
 
@@ -1360,7 +1225,7 @@ block or a filter. The exception object can be obtained from the
 Custom errors:
 
   error MyCustomError do
-    'So what happened was...' + request.env['sinatra.error'].message
+    'So what happened was...' + env['sinatra.error'].message
   end
 
 Then, if this happens:
@@ -1513,8 +1378,8 @@ There are only two downsides compared with modular style:
 
 There is no reason you cannot mix modular and classic style.
 
-If switching from one style to the other, you should be aware of slight
-differences in the setting:
+If switching from one style to the other, you should be aware of slightly
+different default settings:
 
   Setting             Classic                 Modular
 
@@ -1523,6 +1388,7 @@ differences in the setting:
   logging             true                    false
   method_override     true                    false
   inline_templates    true                    false
+  static              true                    false
 
 
 === Serving a Modular Application
@@ -1882,6 +1748,8 @@ SemVerTag.
 * {Twitter}[http://twitter.com/sinatra]
 * {Mailing List}[http://groups.google.com/group/sinatrarb/topics]
 * {IRC: #sinatra}[irc://chat.freenode.net/#sinatra] on http://freenode.net
+* {Sinatra Book}[http://sinatra-book.gittr.com] Cookbook Tutorial
+* {Sinatra Book Contrib}[http://sinatra-book-contrib.com/] Community contributed recipes
 * API documentation for the {latest release}[http://rubydoc.info/gems/sinatra]
   or the {current HEAD}[http://rubydoc.info/github/sinatra/sinatra] on
   http://rubydoc.info/