some fixes in README.md #835

Merged
merged 3 commits into from Feb 21, 2014

Conversation

Projects
None yet
2 participants
Contributor

melborne commented Jan 25, 2014

No description provided.

@rkh rkh and 1 other commented on an outdated diff Jan 25, 2014

-use Sinatra do
+use Sinatra.new do
@rkh

rkh Jan 25, 2014

Owner

This is wrong.

@melborne

melborne Jan 25, 2014

Contributor

Sorry for that. I didn't know this syntax.

@rkh

rkh Jan 25, 2014

Owner

The block is handed to the use method, which will call new internally.

@melborne

melborne Jan 25, 2014

Contributor

Aha! I see. so should I provide another pull request for other changes?

@rkh rkh and 1 other commented on an outdated diff Jan 25, 2014

@@ -2596,9 +2595,9 @@ your own library.
This also makes using Sinatra as middleware extremely easy:
``` ruby
-require 'sinatra/base'
+require 'sinatra'
@rkh

rkh Jan 25, 2014

Owner

This is wrong.

@melborne

melborne Jan 25, 2014

Contributor

sorry.

@rkh rkh commented on the diff Jan 25, 2014

README.md
@@ -1180,9 +1180,9 @@ get '/foo/*' do
end
```
-After filters are evaluated after each request within the same context and can
-also modify the request and response. Instance variables set in before filters
-and routes are accessible by after filters:
+After filters are evaluated after each request within the same
+context as the routes will be and can also modify the request and response. Instance
+variables set in before filters and routes are accessible by after filters:

@rkh rkh commented on the diff Jan 25, 2014

README.md
@@ -2315,8 +2315,7 @@ typically don't have to `use` them explicitly.
You can find useful middleware in
[rack](https://github.com/rack/rack/tree/master/lib/rack),
[rack-contrib](https://github.com/rack/rack-contrib#readm),
-with [CodeRack](http://coderack.org/) or in the
-[Rack wiki](https://github.com/rack/rack/wiki/List-of-Middleware).
+or in the [Rack wiki](https://github.com/rack/rack/wiki/List-of-Middleware).

@rkh rkh commented on the diff Jan 25, 2014

README.md
@@ -2391,7 +2390,7 @@ available via the top-level DSL. Most top-level apps can be converted to
`Sinatra::Base` is a blank slate. Most options are disabled by default,
including the built-in server. See
-[Options and Configuration](http://sinatra.github.com/configuration.html)
+[Configuring Settings](http://sinatra.github.com/configuration.html)

@rkh rkh added a commit that referenced this pull request Feb 21, 2014

@rkh rkh Merge pull request #835 from melborne/fix-readme
some fixes in README.md
45be874

@rkh rkh merged commit 45be874 into sinatra:master Feb 21, 2014

1 check passed

default The Travis CI build passed
Details

melborne deleted the melborne:fix-readme branch Feb 22, 2014

@rkh rkh added a commit that referenced this pull request Sep 11, 2015

@rkh rkh Merge pull request #835 from melborne/fix-readme
some fixes in README.md
d1fd9bd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment