From dbe834ab5ac4f90df5db9fc314b45890726cca3b Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 1 Jul 2019 01:04:40 +0900 Subject: [PATCH] Prefer master rather than trunk in README [ci skip] --- README.ja.md | 10 +++++----- README.md | 10 +++++----- spec/ruby/core/regexp/case_compare_spec.rb | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.ja.md b/README.ja.md index d552d369de..1b45c67819 100644 --- a/README.ja.md +++ b/README.ja.md @@ -1,6 +1,6 @@ -[![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=trunk)](https://travis-ci.org/ruby/ruby) -[![wercker status](https://app.wercker.com/status/e5e7e1704f62b76525022aa424aef6ef/s/trunk "wercker status")](https://app.wercker.com/project/byKey/e5e7e1704f62b76525022aa424aef6ef) -[![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/trunk?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/trunk) +[![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=master)](https://travis-ci.org/ruby/ruby) +[![wercker status](https://app.wercker.com/status/e5e7e1704f62b76525022aa424aef6ef/s/master "wercker status")](https://app.wercker.com/project/byKey/e5e7e1704f62b76525022aa424aef6ef) +[![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/master) [![Build Status](https://dev.azure.com/rubylang/ruby/_apis/build/status/ruby.ruby?branchName=master)](https://dev.azure.com/rubylang/ruby/_build/latest?definitionId=3&branchName=master) @@ -24,7 +24,7 @@ Rubyはテキスト処理関係の能力などに優れ，Perlと同じくらい * ダイナミックローディング (アーキテクチャによる) * 移植性が高い．多くのUnix-like/POSIX互換プラットフォーム上で動くだけでなく，Windows， macOS， Haikuなどの上でも動く cf. - https://github.com/ruby/ruby/blob/trunk/doc/contributing.rdoc#platform-maintainers + https://github.com/ruby/ruby/blob/master/doc/contributing.rdoc#platform-maintainers ## 入手法 @@ -45,7 +45,7 @@ https://www.ruby-lang.org/ja/downloads/ $ git ls-remote https://github.com/ruby/ruby.git -Rubyリポジトリの本来のtrunkは https://git.ruby-lang.org/ruby.git にあります． +Rubyリポジトリの本来のmasterは https://git.ruby-lang.org/ruby.git にあります． コミッタはこちらを使います． ### Subversion diff --git a/README.md b/README.md index 878a523b9a..570166d551 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -[![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=trunk)](https://travis-ci.org/ruby/ruby) -[![wercker status](https://app.wercker.com/status/e5e7e1704f62b76525022aa424aef6ef/s/trunk "wercker status")](https://app.wercker.com/project/byKey/e5e7e1704f62b76525022aa424aef6ef) -[![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/trunk?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/trunk) +[![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=master)](https://travis-ci.org/ruby/ruby) +[![wercker status](https://app.wercker.com/status/e5e7e1704f62b76525022aa424aef6ef/s/master "wercker status")](https://app.wercker.com/project/byKey/e5e7e1704f62b76525022aa424aef6ef) +[![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/master) [![Build Status](https://dev.azure.com/rubylang/ruby/_apis/build/status/ruby.ruby?branchName=master)](https://dev.azure.com/rubylang/ruby/_build/latest?definitionId=3&branchName=master) # What's Ruby @@ -22,7 +22,7 @@ It is simple, straightforward, and extensible. * Dynamic Loading of Object Files (on some architectures) * Highly Portable (works on many Unix-like/POSIX compatible platforms as well as Windows, macOS, Haiku, etc.) cf. - https://github.com/ruby/ruby/blob/trunk/doc/contributing.rdoc#platform-maintainers + https://github.com/ruby/ruby/blob/master/doc/contributing.rdoc#platform-maintainers ## How to get Ruby @@ -43,7 +43,7 @@ to see the list of branches: $ git ls-remote https://github.com/ruby/ruby.git -You may also want to use https://git.ruby-lang.org/ruby.git (actual trunk of Ruby source) +You may also want to use https://git.ruby-lang.org/ruby.git (actual master of Ruby source) if you are a committer. ### Subversion diff --git a/spec/ruby/core/regexp/case_compare_spec.rb b/spec/ruby/core/regexp/case_compare_spec.rb index 2a41cfc25e..a621713f6f 100644 --- a/spec/ruby/core/regexp/case_compare_spec.rb +++ b/spec/ruby/core/regexp/case_compare_spec.rb @@ -17,7 +17,7 @@ describe "Regexp#===" do (/a/ === :b).should be_false end - # mirroring https://github.com/ruby/ruby/blob/trunk/test/ruby/test_regexp.rb + # mirroring https://github.com/ruby/ruby/blob/master/test/ruby/test_regexp.rb it "returns false if the other value cannot be coerced to a string" do (/abc/ === nil).should be_false (/abc/ === /abc/).should be_false