sinatra 1.4.0.d → 1.4.0

data/README.fr.md

@@ -479,7 +479,7 @@ exemple).
   </tr>
   <tr>
     <td>Exemple</td>
-    <td><tt>nokogiri { |xml| xml.em "salut" }</p>
+    <td><tt>nokogiri { |xml| xml.em "salut" }</tt>
     </td>
   </tr>
 </table>
@@ -2627,4 +2627,4 @@ SemVer que SemVerTag.
 * Documentation API de la [dernière version](http://rubydoc.info/gems/sinatra)
   ou du [HEAD courant](http://rubydoc.info/github/sinatra/sinatra) sur
   http://rubydoc.info
-* [CI server](http://travis-ci.org/sinatra/sinatra)
+* [CI server](http://travis-ci.org/sinatra/sinatra)

data/README.ko.md

@@ -1705,20 +1705,25 @@ set :protection, :except => [:path_traversal, :session_hijacking]
     <tt>settings.add_charsets << "application/foobar"</tt>
   </dd>
 
-  <dt>app_file<dt>
+  <dt>app_file</dt>
   <dd>메인 애플리케이션 파일의 경로. 프로젝트 루트와 뷰, 그리고 public 폴더, 인라인 템플릿을
-   파악할 때 사용됨.</dd>
+   파악할 때 사용됨.
+  </dd>
 
-  <dt>bind<dt>
+  <dt>bind</dt>
   <dd>바인드할 IP 주소(기본값: 0.0.0.0).
-   오직 빌트인(built-in) 서버에서만 사용됨.</dd>
+   오직 빌트인(built-in) 서버에서만 사용됨.
+  </dd>
 
   <dt>default_encoding</dt>
   <dd>모를 때 가정할 인코딩
-   (기본값은 <tt>"utf-8"</tt>).</dd>
+   (기본값은 <tt>"utf-8"</tt>).
+  </dd>
 
   <dt>dump_errors</dt>
-  <dd>로그로 에러 출력.</dd>
+  <dd>
+    로그로 에러 출력.
+  </dd>
 
   <dt>environment</dt>
   <dd>현재 환경, 기본값은 <tt>ENV['RACK_ENV']</tt> 또는 알 수 없을 경우 "development".</dd>
@@ -1807,6 +1812,7 @@ set :protection, :except => [:path_traversal, :session_hijacking]
   <dd>뷰 폴더 경로. 설정하지 않은 경우 <tt>app_file</tt>로부터 유추됨.</dd>
 </dl>
 
+
 ## 환경(Environments)
 
 환경은 `RACK_ENV` 환경 변수를 통해서도 설정할 수 있다. 기본값은 "development"다.

data/README.md

@@ -30,11 +30,11 @@ pick up if available.
     * [Table of Contents](#table-of-contents)
     * [Routes](#routes)
     * [Conditions](#conditions)
-        * [Return Values](#return-values)
-        * [Custom Route Matchers](#custom-route-matchers)
-        * [Static Files](#static-files)
-        * [Views / Templates](#views--templates)
-            * [Literal Templates](#literal-templates)
+    * [Return Values](#return-values)
+    * [Custom Route Matchers](#custom-route-matchers)
+    * [Static Files](#static-files)
+    * [Views / Templates](#views--templates)
+        * [Literal Templates](#literal-templates)
         * [Available Template Languages](#available-template-languages)
             * [Haml Templates](#haml-templates)
             * [Erb Templates](#erb-templates)
@@ -284,7 +284,7 @@ get "/only/admin/", :auth => :admin do
 end
 ```
 
-### Return Values
+## Return Values
 
 The return value of a route block determines at least the response body passed
 on to the HTTP client, or at least the next middleware in the Rack stack.
@@ -317,7 +317,7 @@ get('/') { Stream.new }
 You can also use the `stream` helper method (described below) to reduce boiler
 plate and embed the streaming logic in the route.
 
-### Custom Route Matchers
+## Custom Route Matchers
 
 As shown above, Sinatra ships with built-in support for using String patterns
 and regular expressions as route matches. However, it does not stop there. You
@@ -364,7 +364,7 @@ get %r{^(?!/index$)} do
 end
 ```
 
-### Static Files
+## Static Files
 
 Static files are served from the `./public` directory. You can specify
 a different location by setting the `:public_folder` option:
@@ -380,7 +380,7 @@ Note that the public directory name is not included in the URL. A file
 Use the `:static_cache_control` setting (see below) to add
 `Cache-Control` header info.
 
-### Views / Templates
+## Views / Templates
 
 Each template language is exposed via its own rendering method. These
 methods simply return a string:
@@ -484,23 +484,18 @@ Available Options:
     Special options only used for rendering the layout. Example:
     <tt>set :rdoc, :layout_options => { :views => 'views/layouts' }</tt>
   </dd>
-
-  <dd>
-    Templates are assumed to be located directly under the `./views`
-    directory. To use a different views directory:
-  <tt>set :views, settings.root + '/templates'</tt>
-  </dd>
-
-  <dd>
-    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.
-  </dd>
 </dl>
+    
+Templates are assumed to be located directly under the `./views` directory. To 
+use a different views directory: 
+<tt>set :views, settings.root + '/templates'</tt>
 
-#### Literal 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.
+
+### Literal Templates
 
 ``` ruby
 get '/' do
@@ -977,14 +972,15 @@ end
 
 
 The template source is evaluated as a Ruby string, and the
-resulting json variable is converted using `#to_json`.
+resulting json variable is converted using `#to_json`:
 
 ``` ruby
 json = { :foo => 'bar' }
 json[:baz] = key
 ```
 
-The `:callback` and `:variable` options can be used to decorate the rendered object.
+The `:callback` and `:variable` options can be used to decorate the rendered
+object:
 
 ``` ruby
 var resource = {"foo":"bar","baz":"qux"}; present(resource);
@@ -2013,7 +2009,7 @@ set :protection, :session => true
   </dd>
 
   <dt>bind</dt>
-  <dd>IP address to bind to (default: 0.0.0.0). Only used for built-in server.</dd>
+  <dd>IP address to bind to (default: <tt>0.0.0.0</tt>). Only used for built-in server.</dd>
 
   <dt>default_encoding</dt>
   <dd>encoding to assume if unknown (defaults to <tt>"utf-8"</tt>).</dd>
@@ -2093,8 +2089,8 @@ set :protection, :session => true
 
   <dt>server</dt>
   <dd>
-    server or list of servers to use for built-in server. defaults to
-    ['thin', 'mongrel', 'webrick'], order indicates priority.
+    Server or list of servers to use for built-in server. order indicates priority,
+    default depends on Ruby implementation.
   </dd>
 
   <dt>sessions</dt>
@@ -2150,7 +2146,7 @@ set :protection, :session => true
   <dt>x_cascade</dt>
   <dd>
     Whether or not to set the X-Cascade header if no route matches.
-    Defaults to `true`.
+    Defaults to <tt>true</tt>.
   </dd>
 </dl>
 
@@ -2658,8 +2654,8 @@ end
 
 You have the request scope binding inside:
 
-* get/head/post/put/delete/options blocks
-* before/after filters
+* get, head, post, put, delete, options, patch, link, and unlink blocks
+* before and after filters
 * helper methods
 * templates/views
 
@@ -2707,45 +2703,44 @@ The following Ruby versions are officially supported:
   <dt>Ruby 1.8.7</dt>
   <dd>
     1.8.7 is fully supported, however, if nothing is keeping you from it, we
-    recommend upgrading to 1.9.2 or switching to JRuby or Rubinius. Support for
-    1.8.7 will not be dropped before Sinatra 2.0 and Ruby 2.0 except maybe in
-    the unlikely event of 1.8.8 being released. Even then, we might continue
-    supporting it. <b>Ruby 1.8.6 is no longer supported.</b> If you want to run
-    with 1.8.6, downgrade to Sinatra 1.2, which will receive bug fixes until
-    Sinatra 1.4.0 is released.
+    recommend upgrading or switching to JRuby or Rubinius. Support for 1.8.7
+    will not be dropped before Sinatra 2.0. Ruby 1.8.6 is no longer supported.
   </dd>
 
   <dt>Ruby 1.9.2</dt>
   <dd>
-    1.9.2 is fully supported and recommended. Do not use 1.9.2p0, as it is known to
-    cause segmentation faults when running Sinatra. Support will continue at least
-    until the release of Ruby 1.9.4/2.0 and support for the latest 1.9 release
-    will continue as long as it is still supported by the Ruby core team.
+    1.9.2 is fully supported. Do not use 1.9.2p0, as it is known to cause
+    segmentation faults when running Sinatra. Official support will continue
+    at least until the release of Sinatra 1.5.
   </dd>
 
   <dt>Ruby 1.9.3</dt>
   <dd>
     1.9.3 is fully supported and recommended. Please note that switching to 1.9.3
-    from an earlier version will invalidate all sessions.
+    from an earlier version will invalidate all sessions. 1.9.3 will be supported
+    until the release of Sinatra 2.0.
+  </dd>
+
+  <dt>Ruby 2.0.0</dt>
+  <dd>
+    2.0.0 is fully supported and recommended. There are currently no plans to drop
+    official support for it.
   </dd>
 
   <dt>Rubinius</dt>
   <dd>
-    Rubinius is officially supported (Rubinius >= 1.2.4), everything works, including
-    all template languages. The upcoming 2.0 release is supported as
-    well, including 1.9 mode.
+    Rubinius is officially supported (Rubinius >= 2.x). It is recommendended to
+    `gem install puma`.
   </dd>
 
   <dt>JRuby</dt>
   <dd>
-    JRuby is officially supported (JRuby >= 1.6.7). No issues with third party
-    template libraries are known, however, if you choose to use JRuby, please
-    look into JRuby rack handlers, as the Thin web server is not fully supported
-    on JRuby. JRuby's support for C extensions is still experimental, which only
-    affects RDiscount, Redcarpet, RedCloth and Yajl templates as well as Thin
-    and Mongrel at the moment.
+    The latest stable release of JRuby is officially supported. It is not
+    recommended to use C extensions with JRuby. It is recommended to
+    `gem install trinidad`.
   </dd>
 </dl>
+
 We also keep an eye on upcoming Ruby versions.
 
 The following Ruby implementations are not officially supported but still are
@@ -2759,13 +2754,15 @@ known to run Sinatra:
 Not being officially supported means if things only break there and not on a
 supported platform, we assume it's not our issue but theirs.
 
-We also run our CI against ruby-head (the upcoming 2.0.0) and the 1.9.4
-branch, but we can't guarantee anything, since it is constantly moving. Expect
-both 1.9.4p0 and 2.0.0p0 to be supported.
+We also run our CI against ruby-head (the upcoming 2.1.0), but we can't
+guarantee anything, since it is constantly moving. Expect 2.1.0 to be fully
+supported.
 
 Sinatra should work on any operating system supported by the chosen Ruby
 implementation.
 
+If you run MacRuby, you should `gem install control_tower`.
+
 Sinatra currently doesn't run on Cardinal, SmallRuby, BlueRuby or any
 Ruby version prior to 1.8.7.
 

data/README.ru.md

@@ -85,7 +85,7 @@ end
 get '/hello/:name' do |n|
   "Hello #{n}!"
 end
-````
+```
 
 Шаблоны маршрутов также могут включать в себя splat (или '*' маску,
 обозначающую любой символ) параметры, доступные в массиве `params[:splat]`:
@@ -416,7 +416,7 @@ set :views, settings.root + '/templates'
 `:'subdir/template'`). Вы должны использовать символы, потому что иначе
 шаблонизаторы попросту отображают любые строки, переданные им.
 
-#### Буквальные шаблоны
+### Буквальные шаблоны
 
 ```ruby
 get '/' do
@@ -436,7 +436,7 @@ require 'rdiscount' # или require 'bluecloth'
 get('/') { markdown :index }
 ```
 
-### Haml шаблоны
+#### Haml шаблоны
 
 <table>
   <tr>
@@ -453,7 +453,7 @@ get('/') { markdown :index }
   </tr>
 </table>
 
-### Erb шаблоны
+#### Erb шаблоны
 
 <table>
   <tr>
@@ -473,7 +473,7 @@ get('/') { markdown :index }
   </tr>
 </table>
 
-### Builder шаблоны
+#### Builder шаблоны
 
 <table>
   <tr>
@@ -494,7 +494,7 @@ get('/') { markdown :index }
 
 Блок также используется и для встроенных шаблонов (см. пример).
 
-### Nokogiri шаблоны
+#### Nokogiri шаблоны
 
 <table>
   <tr>
@@ -513,7 +513,7 @@ get('/') { markdown :index }
 
 Блок также используется и для встроенных шаблонов (см. пример).
 
-### Sass шаблоны
+#### Sass шаблоны
 
 <table>
   <tr>
@@ -530,7 +530,7 @@ get('/') { markdown :index }
   </tr>
 </table>
 
-### SCSS шаблоны
+#### SCSS шаблоны
 
 <table>
   <tr>
@@ -547,7 +547,7 @@ get('/') { markdown :index }
   </tr>
 </table>
 
-### Less шаблоны
+#### Less шаблоны
 
 <table>
   <tr>
@@ -564,7 +564,7 @@ get('/') { markdown :index }
   </tr>
 </table>
 
-### Liquid шаблоны
+#### Liquid шаблоны
 
 <table>
   <tr>
@@ -584,7 +584,7 @@ get('/') { markdown :index }
 Так как в Liquid шаблонах невозможно вызывать методы из Ruby (кроме `yield`), то
 вы почти всегда будете передавать в шаблон локальные переменные.
 
-### Markdown шаблоны
+#### Markdown шаблоны
 
 <table>
   <tr>
@@ -628,7 +628,7 @@ erb :overview, :locals => { :text => markdown(:introduction) }
 один шаблонизатор для отображения шаблона, а другой для лэйаута с помощью
 опции `:layout_engine`.
 
-### Textile шаблоны
+#### Textile шаблоны
 
 <table>
   <tr>
@@ -665,7 +665,7 @@ erb :overview, :locals => { :text => textile(:introduction) }
 один шаблонизатор для отображения шаблона, а другой для лэйаута с помощью
 опции `:layout_engine`.
 
-### RDoc шаблоны
+#### RDoc шаблоны
 
 <table>
   <tr>
@@ -702,7 +702,7 @@ erb :overview, :locals => { :text => rdoc(:introduction) }
 для отображения шаблона, а другой для лэйаута с помощью опции
 `:layout_engine`.
 
-### Radius шаблоны
+#### Radius шаблоны
 
 <table>
   <tr>
@@ -722,7 +722,7 @@ erb :overview, :locals => { :text => rdoc(:introduction) }
 Так как в Radius шаблонах невозможно вызывать методы из Ruby напрямую, то вы
 почти всегда будете передавать в шаблон локальные переменные.
 
-### Markaby шаблоны
+#### Markaby шаблоны
 
 <table>
   <tr>
@@ -741,7 +741,7 @@ erb :overview, :locals => { :text => rdoc(:introduction) }
 
 Блок также используется и для встроенных шаблонов (см. пример).
 
-### RABL шаблоны
+#### RABL шаблоны
 
 <table>
   <tr>
@@ -758,7 +758,7 @@ erb :overview, :locals => { :text => rdoc(:introduction) }
   </tr>
 </table>
 
-### Slim шаблоны
+#### Slim шаблоны
 
 <table>
   <tr>
@@ -775,7 +775,7 @@ erb :overview, :locals => { :text => rdoc(:introduction) }
   </tr>
 </table>
 
-### Creole шаблоны
+#### Creole шаблоны
 
 <table>
   <tr>
@@ -812,7 +812,7 @@ erb :overview, :locals => { :text => creole(:introduction) }
 один шаблонизатор для отображения шаблона, а другой для лэйаута с помощью
 опции `:layout_engine`.
 
-### CoffeeScript шаблоны
+#### CoffeeScript шаблоны
 
 <table>
   <tr>
@@ -836,7 +836,7 @@ erb :overview, :locals => { :text => creole(:introduction) }
   </tr>
 </table>
 
-### Yajl шаблоны
+#### Yajl шаблоны
 
 <table>
   <tr>
@@ -875,7 +875,7 @@ json[:baz] = key
 var resource = {"foo":"bar","baz":"qux"}; present(resource);
 ```
 
-### WLang шаблоны
+#### WLang шаблоны
 
 <table>
   <tr>