Skip to content

Commit 0300135

Browse files
authored
docs: modernize some of the wording
Fix https for links, avoid pointing at very old websites, rewording historical things to being historical.
1 parent 7f792ab commit 0300135

1 file changed

Lines changed: 14 additions & 19 deletions

File tree

book/Introduction.markdown

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ $ gem install sinatra
3838

3939
### Dependencies
4040

41-
Sinatra depends on the _Rack_ gem (<http://rack.rubyforge.org>).
41+
Sinatra depends on the _Rack_ gem (<https://rubygems.org/rack>).
4242

4343
Sinatra supports many different template engines (it uses the Tilt library
4444
internally to support practically every template engine in Ruby)
@@ -53,27 +53,24 @@ $ gem install haml
5353
### Living on the Edge
5454

5555
The _edge_ version of Sinatra lives in its Git repository, available at
56-
**<http://github.com/sinatra/sinatra/tree/master>**.
56+
**<https://github.com/sinatra/sinatra/>**.
5757

5858
You can use the _edge_ version to try new functionality or to contribute to the
5959
framework. You need to have [Git version control
60-
software](http://www.git-scm.com) and [bundler](http://gembundler.com/).
60+
software](https://www.git-scm.com/) and [Bundler](https://bundler.io/).
6161

6262
```
6363
$ gem install bundler
6464
```
6565

66-
To use Sinatra _edge_ with bundler, you'll have to create a `Gemfile` listing
66+
To use Sinatra _edge_ with Bundler, you'll have to create a `Gemfile` listing
6767
Sinatra's and any other dependencies you're going to need.
6868

6969
```ruby
70-
source :rubygems
7170
gem 'sinatra', :git => 'git://github.com/sinatra/sinatra.git'
7271
```
7372

74-
Here we use the rubygems source to specify where to get Sinatra's
75-
dependencies; alternatively you can use the git version, but that is up to you.
76-
So now we can install our bundle:
73+
Now we can install our dependencies:
7774

7875
```
7976
$ bundle install
@@ -85,8 +82,6 @@ Hello World Application
8582
Sinatra is installed, how about making your first application?
8683

8784
```ruby
88-
require 'rubygems'
89-
9085
# If you're using bundler, you will need to add this
9186
require 'bundler/setup'
9287

@@ -100,7 +95,7 @@ end
10095
Run this application by `$ ruby hello_world.rb` and load
10196
`http://localhost:4567` in your browser.
10297

103-
As you can see, Sinatra doesn't force you to setup much infrastructure: a
98+
As you can see, Sinatra doesn't force you to set up much infrastructure: a
10499
request to a URL evaluates some Ruby code and returns some text in response.
105100
Whatever the block returns is sent back to the browser.
106101

@@ -110,16 +105,16 @@ Real World Applications in Sinatra
110105

111106
### Github Services
112107

113-
Git hosting provider Github uses Sinatra for post-receive hooks, calling user
114-
specified services/URLs, whenever someone pushes to their repository:
108+
Git hosting provider Github used Sinatra for Git post-receive hooks, calling user-specified
109+
services/URLs, whenever someone pushed to their repository:
115110

116-
* <http://github.com/blog/53-github-services-ipo>
117-
* <http://github.com/guides/post-receive-hooks>
118-
* <http://github.com/pjhyett/github-services>
111+
* <https://github.blog/2008-04-29-github-services-ipo/> explains how it was introduced
112+
* <https://github.com/github/github-services> is a deprecated repository
113+
* <https://docs.github.com/en/rest/webhooks> is the documentation for the current non-Sinatra solution
119114

120115
Check out a full list of Sinatra apps [in the wild][in-the-wild].
121116

122-
[in-the-wild]: http://www.sinatrarb.com/wild.html
117+
[in-the-wild]: https://sinatrarb.com/wild.html
123118

124119
About this book
125120
---------------
@@ -128,8 +123,8 @@ and a working Ruby interpreter.
128123

129124
For more information about the Ruby language visit the following links:
130125

131-
* [ruby-lang](http://www.ruby-lang.org)
132-
* [ruby-lang / documentation](http://www.ruby-lang.org/en/documentation/)
126+
* [ruby-lang](https://www.ruby-lang.org)
127+
* [ruby-lang / documentation](https://www.ruby-lang.org/en/documentation/)
133128

134129
Need Help?
135130
----------

0 commit comments

Comments
 (0)