Skip to content

Commit

Permalink
main branch reference fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ruby0x1 committed Jun 12, 2020
1 parent e45a9d0 commit 9fb6d02
Show file tree
Hide file tree
Showing 23 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/rfc/0001-smarter-imports.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/site/blog/0-hello-wren.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion doc/site/blog/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ <h2>{title}</h2>
<a href="https://github.com/wren-lang/wren">on GitHub</a>
&mdash; Made with &#x2764; by
<a href="http://journal.stuffwithstuff.com/">Bob Nystrom</a> and
<a href="https://github.com/wren-lang/wren/blob/master/AUTHORS">friends</a>.
<a href="https://github.com/wren-lang/wren/blob/main/AUTHORS">friends</a>.
</p>
<div class="main-column">
</div>
Expand Down
2 changes: 1 addition & 1 deletion doc/site/cli/modules/io/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ <h1>{title}</h1>
<a href="https://github.com/wren-lang/wren">on GitHub</a>
&mdash; Made with &#x2764; by
<a href="http://journal.stuffwithstuff.com/">Bob Nystrom</a> and
<a href="https://github.com/wren-lang/wren/blob/master/AUTHORS">friends</a>.
<a href="https://github.com/wren-lang/wren/blob/main/AUTHORS">friends</a>.
</p>
<div class="main-column">
</div>
Expand Down
2 changes: 1 addition & 1 deletion doc/site/cli/modules/os/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h1>{title}</h1>
<a href="https://github.com/wren-lang/wren">on GitHub</a>
&mdash; Made with &#x2764; by
<a href="http://journal.stuffwithstuff.com/">Bob Nystrom</a> and
<a href="https://github.com/wren-lang/wren/blob/master/AUTHORS">friends</a>.
<a href="https://github.com/wren-lang/wren/blob/main/AUTHORS">friends</a>.
</p>
<div class="main-column">
</div>
Expand Down
2 changes: 1 addition & 1 deletion doc/site/cli/modules/scheduler/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ <h1>{title}</h1>
<a href="https://github.com/wren-lang/wren">on GitHub</a>
&mdash; Made with &#x2764; by
<a href="http://journal.stuffwithstuff.com/">Bob Nystrom</a> and
<a href="https://github.com/wren-lang/wren/blob/master/AUTHORS">friends</a>.
<a href="https://github.com/wren-lang/wren/blob/main/AUTHORS">friends</a>.
</p>
<div class="main-column">
</div>
Expand Down
2 changes: 1 addition & 1 deletion doc/site/cli/modules/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ <h1>{title}</h1>
<a href="https://github.com/wren-lang/wren">on GitHub</a>
&mdash; Made with &#x2764; by
<a href="http://journal.stuffwithstuff.com/">Bob Nystrom</a> and
<a href="https://github.com/wren-lang/wren/blob/master/AUTHORS">friends</a>.
<a href="https://github.com/wren-lang/wren/blob/main/AUTHORS">friends</a>.
</p>
<div class="main-column">
</div>
Expand Down
2 changes: 1 addition & 1 deletion doc/site/cli/modules/timer/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ <h1>{title}</h1>
<a href="https://github.com/wren-lang/wren">on GitHub</a>
&mdash; Made with &#x2764; by
<a href="http://journal.stuffwithstuff.com/">Bob Nystrom</a> and
<a href="https://github.com/wren-lang/wren/blob/master/AUTHORS">friends</a>.
<a href="https://github.com/wren-lang/wren/blob/main/AUTHORS">friends</a>.
</p>
<div class="main-column">
</div>
Expand Down
2 changes: 1 addition & 1 deletion doc/site/cli/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ <h2>{title}</h2>
<a href="https://github.com/wren-lang/wren">on GitHub</a>
&mdash; Made with &#x2764; by
<a href="http://journal.stuffwithstuff.com/">Bob Nystrom</a> and
<a href="https://github.com/wren-lang/wren/blob/master/AUTHORS">friends</a>.
<a href="https://github.com/wren-lang/wren/blob/main/AUTHORS">friends</a>.
</p>
<div class="main-column">
</div>
Expand Down
4 changes: 2 additions & 2 deletions doc/site/contributing.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion doc/site/embedding/index.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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

<pre class="snippet" data-lang="c">
#include "wren.h"
Expand Down
2 changes: 1 addition & 1 deletion doc/site/embedding/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ <h1>{title}</h1>
<a href="https://github.com/wren-lang/wren">on GitHub</a>
&mdash; Made with &#x2764; by
<a href="http://journal.stuffwithstuff.com/">Bob Nystrom</a> and
<a href="https://github.com/wren-lang/wren/blob/master/AUTHORS">friends</a>.
<a href="https://github.com/wren-lang/wren/blob/main/AUTHORS">friends</a>.
</p>
<div class="main-column">
</div>
Expand Down
2 changes: 1 addition & 1 deletion doc/site/index.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/site/modules/core/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ <h1>{title}</h1>
<a href="https://github.com/wren-lang/wren">on GitHub</a>
&mdash; Made with &#x2764; by
<a href="http://journal.stuffwithstuff.com/">Bob Nystrom</a> and
<a href="https://github.com/wren-lang/wren/blob/master/AUTHORS">friends</a>.
<a href="https://github.com/wren-lang/wren/blob/main/AUTHORS">friends</a>.
</p>
<div class="main-column">
</div>
Expand Down
2 changes: 1 addition & 1 deletion doc/site/modules/meta/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h1>{title}</h1>
<a href="https://github.com/wren-lang/wren">on GitHub</a>
&mdash; Made with &#x2764; by
<a href="http://journal.stuffwithstuff.com/">Bob Nystrom</a> and
<a href="https://github.com/wren-lang/wren/blob/master/AUTHORS">friends</a>.
<a href="https://github.com/wren-lang/wren/blob/main/AUTHORS">friends</a>.
</p>
<div class="main-column">
</div>
Expand Down
2 changes: 1 addition & 1 deletion doc/site/modules/random/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h1>{title}</h1>
<a href="https://github.com/wren-lang/wren">on GitHub</a>
&mdash; Made with &#x2764; by
<a href="http://journal.stuffwithstuff.com/">Bob Nystrom</a> and
<a href="https://github.com/wren-lang/wren/blob/master/AUTHORS">friends</a>.
<a href="https://github.com/wren-lang/wren/blob/main/AUTHORS">friends</a>.
</p>
<div class="main-column">
</div>
Expand Down
2 changes: 1 addition & 1 deletion doc/site/modules/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ <h1>{title}</h1>
<a href="https://github.com/wren-lang/wren">on GitHub</a>
&mdash; Made with &#x2764; by
<a href="http://journal.stuffwithstuff.com/">Bob Nystrom</a> and
<a href="https://github.com/wren-lang/wren/blob/master/AUTHORS">friends</a>.
<a href="https://github.com/wren-lang/wren/blob/main/AUTHORS">friends</a>.
</p>
<div class="main-column">
</div>
Expand Down
2 changes: 1 addition & 1 deletion doc/site/performance.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down
2 changes: 1 addition & 1 deletion doc/site/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ <h2>{title}</h2>
<a href="https://github.com/wren-lang/wren">on GitHub</a>
&mdash; Made with &#x2764; by
<a href="http://journal.stuffwithstuff.com/">Bob Nystrom</a> and
<a href="https://github.com/wren-lang/wren/blob/master/AUTHORS">friends</a>.
<a href="https://github.com/wren-lang/wren/blob/main/AUTHORS">friends</a>.
</p>
<div class="main-column">
</div>
Expand Down
2 changes: 1 addition & 1 deletion doc/site/try/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ <h2>{title}</h2>
<a href="https://github.com/wren-lang/wren">on GitHub</a>
&mdash; Made with &#x2764; by
<a href="http://journal.stuffwithstuff.com/">Bob Nystrom</a> and
<a href="https://github.com/wren-lang/wren/blob/master/AUTHORS">friends</a>.
<a href="https://github.com/wren-lang/wren/blob/main/AUTHORS">friends</a>.
</p>
<div class="main-column">
</div>
Expand Down

0 comments on commit 9fb6d02

Please sign in to comment.