diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9f4cbc58..14563a23 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -65,21 +65,21 @@ track patch requests. also has its own [Git repository](http://github.com/sinatra/sinatra-recipes). * [The Introduction](http://www.sinatrarb.com/intro.html) is generated from - Sinatra's [README file](http://github.com/sinatra/sinatra/blob/master/README.md). + Sinatra's [README file](http://github.com/sinatra/sinatra/blob/main/README.md). * If you want to help translating the documentation, the README is already available in - [Japanese](http://github.com/sinatra/sinatra/blob/master/README.ja.md), - [German](http://github.com/sinatra/sinatra/blob/master/README.de.md), - [Chinese](https://github.com/sinatra/sinatra/blob/master/README.zh.md), - [Russian](https://github.com/sinatra/sinatra/blob/master/README.ru.md), - [European](https://github.com/sinatra/sinatra/blob/master/README.pt-pt.md) and - [Brazilian](https://github.com/sinatra/sinatra/blob/master/README.pt-br.md) + [Japanese](http://github.com/sinatra/sinatra/blob/main/README.ja.md), + [German](http://github.com/sinatra/sinatra/blob/main/README.de.md), + [Chinese](https://github.com/sinatra/sinatra/blob/main/README.zh.md), + [Russian](https://github.com/sinatra/sinatra/blob/main/README.ru.md), + [European](https://github.com/sinatra/sinatra/blob/main/README.pt-pt.md) and + [Brazilian](https://github.com/sinatra/sinatra/blob/main/README.pt-br.md) Portuguese, - [French](https://github.com/sinatra/sinatra/blob/master/README.fr.md), - [Spanish](https://github.com/sinatra/sinatra/blob/master/README.es.md), - [Korean](https://github.com/sinatra/sinatra/blob/master/README.ko.md), and - [Hungarian](https://github.com/sinatra/sinatra/blob/master/README.hu.md). + [French](https://github.com/sinatra/sinatra/blob/main/README.fr.md), + [Spanish](https://github.com/sinatra/sinatra/blob/main/README.es.md), + [Korean](https://github.com/sinatra/sinatra/blob/main/README.ko.md), and + [Hungarian](https://github.com/sinatra/sinatra/blob/main/README.hu.md). The translations tend to fall behind the English version. Translations into other languages would also be appreciated. diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 79951c64..550032ac 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -4,13 +4,13 @@ ### Releases -The next major version of Sinatra will be released from the master branch. Each version will be tagged so it will be possible to branch of should there be a need for bug fixes and other updates. +The next major version of Sinatra will be released from the main branch. Each version will be tagged so it will be possible to branch of should there be a need for bug fixes and other updates. ## Issues ### 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/README.md b/README.md index b7e738e0..41d4eb00 100644 --- a/README.md +++ b/README.md @@ -1933,7 +1933,7 @@ end ### Configuring attack protection Sinatra is using -[Rack::Protection](https://github.com/sinatra/sinatra/tree/master/rack-protection#readme) to +[Rack::Protection](https://github.com/sinatra/sinatra/tree/main/rack-protection#readme) to defend your application against common, opportunistic attacks. You can easily disable this behavior (which will open up your application to tons of common vulnerabilities): @@ -2838,7 +2838,7 @@ Running Sinatra on a not officially supported Ruby flavor means that if things o ## The Bleeding Edge If you would like to use Sinatra's latest bleeding-edge code, feel free -to run your application against the master branch, it should be rather +to run your application against the main branch, it should be rather stable. We also push out prerelease gems from time to time, so you can do a diff --git a/rack-protection/rack-protection.gemspec b/rack-protection/rack-protection.gemspec index c473815b..2303f37d 100644 --- a/rack-protection/rack-protection.gemspec +++ b/rack-protection/rack-protection.gemspec @@ -30,7 +30,7 @@ RubyGems 2.0 or newer is required to protect against public gem pushes. You can end s.metadata = { - 'source_code_uri' => 'https://github.com/sinatra/sinatra/tree/master/rack-protection', + 'source_code_uri' => 'https://github.com/sinatra/sinatra/tree/main/rack-protection', 'homepage_uri' => 'http://sinatrarb.com/protection/', 'documentation_uri' => 'https://www.rubydoc.info/gems/rack-protection', 'rubygems_mfa_required' => 'true' diff --git a/sinatra-contrib/README.md b/sinatra-contrib/README.md index 56f0b822..02f49928 100644 --- a/sinatra-contrib/README.md +++ b/sinatra-contrib/README.md @@ -167,7 +167,7 @@ For more info check the [official docs](http://www.sinatrarb.com/contrib/) and [sinatra-webdav]: http://www.sinatrarb.com/contrib/webdav [sinatra-runner]: http://www.sinatrarb.com/contrib/runner [sinatra-extension]: http://www.sinatrarb.com/contrib/extension -[sinatra-test-helpers]: https://github.com/sinatra/sinatra/blob/master/sinatra-contrib/lib/sinatra/test_helpers.rb +[sinatra-test-helpers]: https://github.com/sinatra/sinatra/blob/main/sinatra-contrib/lib/sinatra/test_helpers.rb [sinatra-required-params]: http://www.sinatrarb.com/contrib/required_params [sinatra-custom-logger]: http://www.sinatrarb.com/contrib/custom_logger [sinatra-multi-route]: http://www.sinatrarb.com/contrib/multi_route @@ -176,5 +176,5 @@ For more info check the [official docs](http://www.sinatrarb.com/contrib/) and [sinatra-config-file]: http://www.sinatrarb.com/contrib/config_file [sinatra-link-header]: http://www.sinatrarb.com/contrib/link_header [sinatra-capture]: http://www.sinatrarb.com/contrib/capture -[sinatra-engine-tracking]: https://github.com/sinatra/sinatra/blob/master/sinatra-contrib/lib/sinatra/engine_tracking.rb +[sinatra-engine-tracking]: https://github.com/sinatra/sinatra/blob/main/sinatra-contrib/lib/sinatra/engine_tracking.rb diff --git a/sinatra-contrib/Rakefile b/sinatra-contrib/Rakefile index c7818942..3bb065c3 100644 --- a/sinatra-contrib/Rakefile +++ b/sinatra-contrib/Rakefile @@ -69,7 +69,7 @@ task release: :gemspec do gem push sinatra-contrib*.gem && git commit --allow-empty -a -m '#{Sinatra::Contrib::VERSION} release' && git tag -s v#{Sinatra::Contrib::VERSION} -m '#{Sinatra::Contrib::VERSION} release' && - git push && (git push origin master || true) && + git push && (git push origin main || true) && git push --tags && (git push origin --tags || true) SH end diff --git a/sinatra-contrib/sinatra-contrib.gemspec b/sinatra-contrib/sinatra-contrib.gemspec index 3a05e395..35eae935 100644 --- a/sinatra-contrib/sinatra-contrib.gemspec +++ b/sinatra-contrib/sinatra-contrib.gemspec @@ -29,7 +29,7 @@ RubyGems 2.0 or newer is required to protect against public gem pushes. You can end s.metadata = { - 'source_code_uri' => 'https://github.com/sinatra/sinatra/tree/master/sinatra-contrib', + 'source_code_uri' => 'https://github.com/sinatra/sinatra/tree/main/sinatra-contrib', 'homepage_uri' => 'http://sinatrarb.com/contrib/', 'documentation_uri' => 'https://www.rubydoc.info/gems/sinatra-contrib', 'rubygems_mfa_required' => 'true' diff --git a/sinatra.gemspec b/sinatra.gemspec index 8f9cf599..45c93b05 100644 --- a/sinatra.gemspec +++ b/sinatra.gemspec @@ -36,7 +36,7 @@ RubyGems 2.0 or newer is required to protect against public gem pushes. You can s.metadata = { 'source_code_uri' => 'https://github.com/sinatra/sinatra', - 'changelog_uri' => 'https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md', + 'changelog_uri' => 'https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md', 'homepage_uri' => 'http://sinatrarb.com/', 'bug_tracker_uri' => 'https://github.com/sinatra/sinatra/issues', 'mailing_list_uri' => 'http://groups.google.com/group/sinatrarb',