diff --git a/.travis.yml b/.travis.yml index 9e84c08b..0f58843e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,8 @@ jobs: - stage: deploy script: ./util/deploy_docs_from_travis.sh - # Only deploy commits that land on master. - if: branch = master and type = push + # Only deploy commits that land on main. + if: branch = main and type = push # Travis VMs are 64-bit but we compile both for 32 and 64 bit. To enable the # 32-bit builds to work, we need gcc-multilib. diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d576b3d..3fb3306f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,7 +33,7 @@ Docs have also had a clean up, and a new page to try Wren directly on the doc pa ## 0.2.0 -0.2.0 spans a pretty wide time period with [around 290 commits](https://github.com/wren-lang/wren/compare/0.1.0...master). +0.2.0 spans a pretty wide time period with [around 290 commits](https://github.com/wren-lang/wren/compare/0.1.0...main). This includes many bug fixes, improvements, clarity in the code and documentation and so on. There's too many to explicitly list. Below is the obvious user facing stuff that was easy to spot in the history. diff --git a/README.md b/README.md index 17bb9ea2..564b085c 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ involved][contribute]! [![Build Status](https://travis-ci.org/wren-lang/wren.svg)](https://travis-ci.org/wren-lang/wren) [syntax]: http://wren.io/syntax.html -[src]: https://github.com/wren-lang/wren/tree/master/src +[src]: https://github.com/wren-lang/wren/tree/main/src [nan]: https://github.com/wren-lang/wren/blob/93dac9132773c5bc0bbe92df5ccbff14da9d25a6/src/vm/wren_value.h#L486-L541 [perf]: http://wren.io/performance.html [classes]: http://wren.io/classes.html diff --git a/doc/rfc/0001-smarter-imports.md b/doc/rfc/0001-smarter-imports.md index 91d6c4e5..d2c36ad3 100644 --- a/doc/rfc/0001-smarter-imports.md +++ b/doc/rfc/0001-smarter-imports.md @@ -410,7 +410,7 @@ import strings will mean something different. We definitely *can* and will make breaking changes in Wren, so that's OK, but I'd like to minimize the pain. Right now, Wren is currently at version 0.1.0. I'll probably consider the commit right before I start landing this to be the "official" 0.1.0 release and then the -import changes will land in "0.2.0". I'll work in a branch off master until +import changes will land in "0.2.0". I'll work in a branch off main until everything looks solid and then merge it in. If you have existing Wren code that you run on the CLI and that contains diff --git a/doc/site/blog/0-hello-wren.markdown b/doc/site/blog/0-hello-wren.markdown index 60036731..b1ae9d7f 100644 --- a/doc/site/blog/0-hello-wren.markdown +++ b/doc/site/blog/0-hello-wren.markdown @@ -25,7 +25,7 @@ Wren attracted me as a language because of what it _is_, not because it isn't {_ So, Wren is going to be changing in ways that align with it's existing design intentions. Staying small, simple, learnable and hackable is all vital to what makes Wren valuable, and will remain. -We're just as excited as you are to get to longer term changes and fun tweaks (we have lots of work done already in local projects like [the debugger](https://i.imgur.com/dazexnY.gifv)). There's plenty of ideas we've tried since we've been [using Wren full time](https://luxeengine.com) the last 2.5+ years, and can't wait to get started with bring those into master (and optional modules). There's a lot to do! +We're just as excited as you are to get to longer term changes and fun tweaks (we have lots of work done already in local projects like [the debugger](https://i.imgur.com/dazexnY.gifv)). There's plenty of ideas we've tried since we've been [using Wren full time](https://luxeengine.com) the last 2.5+ years, and can't wait to get started with bring those into the main branch (and optional modules). There's a lot to do! In the next blog I want to try talk a bit more about the short to medium term goals and roadmap (rather than mixing it here with the meta/hello world post). Be sure to keep an eye out for that one, as it has more juicy details on what we're gonna get up to. diff --git a/doc/site/blog/template.html b/doc/site/blog/template.html index cefd861c..33676157 100644 --- a/doc/site/blog/template.html +++ b/doc/site/blog/template.html @@ -57,7 +57,7 @@ on GitHub — Made with ❤ by Bob Nystrom and - friends. + friends.

diff --git a/doc/site/cli/modules/io/template.html b/doc/site/cli/modules/io/template.html index 5a4a4c8a..bac3cfba 100644 --- a/doc/site/cli/modules/io/template.html +++ b/doc/site/cli/modules/io/template.html @@ -80,7 +80,7 @@ on GitHub — Made with ❤ by Bob Nystrom and - friends. + friends.

diff --git a/doc/site/cli/modules/os/template.html b/doc/site/cli/modules/os/template.html index 0c3752a4..1e407733 100644 --- a/doc/site/cli/modules/os/template.html +++ b/doc/site/cli/modules/os/template.html @@ -72,7 +72,7 @@ on GitHub — Made with ❤ by Bob Nystrom and - friends. + friends.

diff --git a/doc/site/cli/modules/scheduler/template.html b/doc/site/cli/modules/scheduler/template.html index d446b02e..db98ab81 100644 --- a/doc/site/cli/modules/scheduler/template.html +++ b/doc/site/cli/modules/scheduler/template.html @@ -70,7 +70,7 @@ on GitHub — Made with ❤ by Bob Nystrom and - friends. + friends.

diff --git a/doc/site/cli/modules/template.html b/doc/site/cli/modules/template.html index 3cb2c7c4..91cc37ca 100644 --- a/doc/site/cli/modules/template.html +++ b/doc/site/cli/modules/template.html @@ -85,7 +85,7 @@ on GitHub — Made with ❤ by Bob Nystrom and - friends. + friends.

diff --git a/doc/site/cli/modules/timer/template.html b/doc/site/cli/modules/timer/template.html index 6f6ca535..ffa6e655 100644 --- a/doc/site/cli/modules/timer/template.html +++ b/doc/site/cli/modules/timer/template.html @@ -70,7 +70,7 @@ on GitHub — Made with ❤ by Bob Nystrom and - friends. + friends.

diff --git a/doc/site/cli/template.html b/doc/site/cli/template.html index 16e5073f..85c84648 100644 --- a/doc/site/cli/template.html +++ b/doc/site/cli/template.html @@ -79,7 +79,7 @@ on GitHub — Made with ❤ by Bob Nystrom and - friends. + friends.

diff --git a/doc/site/contributing.markdown b/doc/site/contributing.markdown index 526c8b20..1aa42e91 100644 --- a/doc/site/contributing.markdown +++ b/doc/site/contributing.markdown @@ -118,11 +118,11 @@ on the [discord community][discord] (or the [mailing list][list]). If you're a R [mit]: http://opensource.org/licenses/MIT [github]: https://github.com/wren-lang/ [fork]: https://help.github.com/articles/fork-a-repo/ -[docs]: https://github.com/wren-lang/wren/tree/master/doc/site +[docs]: https://github.com/wren-lang/wren/tree/main/doc/site [issue]: https://github.com/wren-lang/wren/issues [proposal]: https://github.com/wren-lang/wren/labels/proposal [feature branches]: https://www.atlassian.com/git/tutorials/comparing-workflows/centralized-workflow -[authors]: https://github.com/wren-lang/wren/tree/master/AUTHORS +[authors]: https://github.com/wren-lang/wren/tree/main/AUTHORS [pull request]: https://github.com/wren-lang/wren/pulls [list]: https://groups.google.com/forum/#!forum/wren-lang [subreddit]: https://www.reddit.com/r/wren_lang/ diff --git a/doc/site/embedding/index.markdown b/doc/site/embedding/index.markdown index 18887a52..24bbbc26 100644 --- a/doc/site/embedding/index.markdown +++ b/doc/site/embedding/index.markdown @@ -79,7 +79,7 @@ There are two (well, three) ways to get the Wren VM into your program: In either case, you also want to add `src/include` to your include path so you can find the [public header for Wren][wren.h]: -[wren.h]: https://github.com/wren-lang/wren/blob/master/src/include/wren.h +[wren.h]: https://github.com/wren-lang/wren/blob/main/src/include/wren.h 
 #include "wren.h"
diff --git a/doc/site/embedding/template.html b/doc/site/embedding/template.html
index c86ce616..a360a0fe 100644
--- a/doc/site/embedding/template.html
+++ b/doc/site/embedding/template.html
@@ -80,7 +80,7 @@
       on GitHub
       — Made with ❤ by
       Bob Nystrom and
-      friends.
+      friends.
     

     

   

diff --git a/doc/site/index.markdown b/doc/site/index.markdown
index 3b1c9955..b9a1cc4d 100644
--- a/doc/site/index.markdown
+++ b/doc/site/index.markdown
@@ -51,7 +51,7 @@ If you like the sound of this, [let's get started][started].
 Excited? You're also welcome to [get involved][contribute]!
 
 [syntax]: syntax.html
-[src]: https://github.com/wren-lang/wren/tree/master/src
+[src]: https://github.com/wren-lang/wren/tree/main/src
 [nan]: https://github.com/wren-lang/wren/blob/46c1ba92492e9257aba6418403161072d640cb29/src/wren_value.h#L378-L433
 [perf]: performance.html
 [classes]: classes.html
diff --git a/doc/site/modules/core/template.html b/doc/site/modules/core/template.html
index 5e064bc3..0334effe 100644
--- a/doc/site/modules/core/template.html
+++ b/doc/site/modules/core/template.html
@@ -92,7 +92,7 @@
       on GitHub
       — Made with ❤ by
       Bob Nystrom and
-      friends.
+      friends.
     

     

   

diff --git a/doc/site/modules/meta/template.html b/doc/site/modules/meta/template.html
index 008f2f95..6252a6de 100644
--- a/doc/site/modules/meta/template.html
+++ b/doc/site/modules/meta/template.html
@@ -69,7 +69,7 @@
       on GitHub
       — Made with ❤ by
       Bob Nystrom and
-      friends.
+      friends.
     

     

   

diff --git a/doc/site/modules/random/template.html b/doc/site/modules/random/template.html
index e9e61af0..5cb13223 100644
--- a/doc/site/modules/random/template.html
+++ b/doc/site/modules/random/template.html
@@ -69,7 +69,7 @@
       on GitHub
       — Made with ❤ by
       Bob Nystrom and
-      friends.
+      friends.
     

     

   

diff --git a/doc/site/modules/template.html b/doc/site/modules/template.html
index 1b7cc6ca..de20a5ee 100644
--- a/doc/site/modules/template.html
+++ b/doc/site/modules/template.html
@@ -98,7 +98,7 @@
       on GitHub
       — Made with ❤ by
       Bob Nystrom and
-      friends.
+      friends.
     

     

   

diff --git a/doc/site/performance.markdown b/doc/site/performance.markdown
index 5dd10ab0..9c217377 100644
--- a/doc/site/performance.markdown
+++ b/doc/site/performance.markdown
@@ -92,7 +92,7 @@ languages benchmarked, including Wren, because Mike Pall is a robot from the
 future.
 
 The benchmark harness and programs are
-[here](https://github.com/wren-lang/wren/tree/master/test/benchmark).
+[here](https://github.com/wren-lang/wren/tree/main/test/benchmark).
 
 ## Why is Wren fast?
 
diff --git a/doc/site/template.html b/doc/site/template.html
index 232e8792..328223ee 100644
--- a/doc/site/template.html
+++ b/doc/site/template.html
@@ -120,7 +120,7 @@
       on GitHub
       — Made with ❤ by
       Bob Nystrom and
-      friends.
+      friends.
     

     

   

diff --git a/doc/site/try/template.html b/doc/site/try/template.html
index 00fc9b6c..7c53a98e 100644
--- a/doc/site/try/template.html
+++ b/doc/site/try/template.html
@@ -121,7 +121,7 @@
       on GitHub
       — Made with ❤ by
       Bob Nystrom and
-      friends.
+      friends.