diff options
| author | Andrew Hoglund <ahoglund@github.com> | 2022-07-25 22:23:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-26 15:23:00 +1200 |
| commit | 63ca628d7809758b332021e2f1f9ee69f4252441 (patch) | |
| tree | 382b1ed90ccd0721f6615638813cee3b07b2ae51 | |
| parent | 16342f562ceee101657fc9b7a175eb42914ee87b (diff) | |
| download | rack-63ca628d7809758b332021e2f1f9ee69f4252441.tar.gz | |
Update docs and remove a dead link. (#1930)
* Replaces references to the master branch with main.
* Removes a bad link in a comment as a reference for
not parsing CGI ISINDEX parameters.
| -rw-r--r-- | CONTRIBUTING.md | 8 | ||||
| -rw-r--r-- | README.rdoc | 2 | ||||
| -rw-r--r-- | SECURITY.md | 2 | ||||
| -rw-r--r-- | lib/rack/server.rb | 1 | ||||
| -rw-r--r-- | rack.gemspec | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b0bf9ab6..95db71b9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,8 +18,8 @@ git remote add upstream https://github.com/rack/rack.git Make sure your fork is up-to-date and create a topic branch for your feature or bug fix. ``` -git checkout master -git pull upstream master +git checkout main +git pull upstream main git checkout -b my-feature-branch ``` @@ -110,11 +110,11 @@ Go to https://github.com/contributor/rack and select your feature branch. Click #### Rebase -If you've been working on a change for a while, rebase with upstream/master. +If you've been working on a change for a while, rebase with upstream/main. ``` git fetch upstream -git rebase upstream/master +git rebase upstream/main git push origin my-feature-branch -f ``` diff --git a/README.rdoc b/README.rdoc index d54b2b32..7398c892 100644 --- a/README.rdoc +++ b/README.rdoc @@ -2,7 +2,7 @@ {<img src="https://github.com/rack/rack/workflows/Development/badge.svg" alt="GitHub Actions status" />}[https://github.com/rack/rack/actions?query=workflow%3ADevelopment] {<img src="https://badge.fury.io/rb/rack.svg" alt="Gem Version" />}[http://badge.fury.io/rb/rack] -{<img src="http://inch-ci.org/github/rack/rack.svg?branch=master" alt="Inline docs" />}[http://inch-ci.org/github/rack/rack] +{<img src="http://inch-ci.org/github/rack/rack.svg?branch=main" alt="Inline docs" />}[http://inch-ci.org/github/rack/rack] \Rack provides a minimal, modular, and adaptable interface for developing web applications in Ruby. By wrapping HTTP requests and responses in diff --git a/SECURITY.md b/SECURITY.md index 83d832ab..93e413c7 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,7 +4,7 @@ ### New features -New features will only be added to the master branch and will not be made available in point releases. +New features will only be added to the main branch and will not be made available in point releases. ### Bug fixes diff --git a/lib/rack/server.rb b/lib/rack/server.rb index 3b362b21..cf361a94 100644 --- a/lib/rack/server.rb +++ b/lib/rack/server.rb @@ -393,7 +393,6 @@ module Rack def parse_options(args) # Don't evaluate CGI ISINDEX parameters. - # http://www.meb.uni-bonn.de/docs/cgi/cl.html args.clear if ENV.include?(REQUEST_METHOD) @options = opt_parser.parse!(args) diff --git a/rack.gemspec b/rack.gemspec index 6e1a007f..47da78fd 100644 --- a/rack.gemspec +++ b/rack.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |s| s.metadata = { "bug_tracker_uri" => "https://github.com/rack/rack/issues", - "changelog_uri" => "https://github.com/rack/rack/blob/master/CHANGELOG.md", + "changelog_uri" => "https://github.com/rack/rack/blob/main/CHANGELOG.md", "documentation_uri" => "https://rubydoc.info/github/rack/rack", "source_code_uri" => "https://github.com/rack/rack" } |