Use master branch instead of trunk

hsbt · hsbt · commit d31893fc0588 · 2019-09-02T21:43:18.000+09:00
diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,7 @@
 require 'rdoc/task'
 
 versions = {
-  "trunk" => "trunk",
+  "master" => "master",
   "2.6.0" => "ruby_2_6",
   "2.5.0" => "ruby_2_5",
   "2.4.0" => "ruby_2_4",
diff --git a/config/deploy.rb b/config/deploy.rb
@@ -2,5 +2,5 @@
 set :repo_url, 'https://github.com/ruby/docs.ruby-lang.org'
 set :deploy_to, '/var/www/docs.ruby-lang.org'
 
-versions = %w[1.8.7 1.9.3 2.0.0 2.1.0 2.2.0 2.3.0 2.4.0 2.5.0 2.6.0 trunk]
+versions = %w[1.8.7 1.9.3 2.0.0 2.1.0 2.2.0 2.3.0 2.4.0 2.5.0 2.6.0 master]
 set :linked_dirs, ["sources", "public/ja/latest"] + versions.map{|v| ["public/en/#{v}", "public/ja/#{v}"]}.flatten
diff --git a/public/en/index.html b/public/en/index.html
@@ -20,7 +20,7 @@
     <h1>Documentation for Ruby</h1>
   </div>
   <div class="list-group">
-    <a class="list-group-item" href="./trunk/">Ruby trunk</a>
+    <a class="list-group-item" href="./master/">Ruby master</a>
     <a class="list-group-item" href="./2.6.0/">Ruby 2.6.0</a>
     <a class="list-group-item" href="./2.5.0/">Ruby 2.5.0</a>
     <a class="list-group-item" href="./2.4.0/">Ruby 2.4.0</a>
diff --git a/system/rdoc-static-all b/system/rdoc-static-all
@@ -4,7 +4,7 @@ VERSIONS = %w[
   2.4.0
   2.5.0
   2.6.0
-  trunk
+  master
 ]
 
 DOC_ROOT = ENV.fetch('DOC_ROOT', "/var/www/docs.ruby-lang.org/shared/public/en")

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ VERSIONS = %w[`
`4`	`4`	`2.4.0`
`5`	`5`	`2.5.0`
`6`	`6`	`2.6.0`
`7`		`- trunk`
	`7`	`+ master`
`8`	`8`	`]`
`9`	`9`
`10`	`10`	`DOC_ROOT = ENV.fetch('DOC_ROOT', "/var/www/docs.ruby-lang.org/shared/public/en")`