Skip to content

Commit 5df372b

Browse files
committed
rename master to main
1 parent be5b19c commit 5df372b

6 files changed

Lines changed: 13 additions & 13 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ before_install:
55
- npm install -g geojsonhint
66
branches:
77
only:
8-
- master
8+
- main
99
rvm:
1010
- 2.2.2
1111
script:

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ We'd love for you to contribute and help make [Maptime.io](http://maptime.io) be
66
Code for Conduct
77
----------------
88

9-
Help us keep Maptime open and inclusive. Please read and follow our [Code of Conduct](https://github.com/maptime/code-of-conduct/blob/master/code-of-conduct.md).
9+
Help us keep Maptime open and inclusive. Please read and follow our [Code of Conduct](https://github.com/maptime/code-of-conduct/blob/main/code-of-conduct.md).
1010

1111
Need a question answered?
1212
-------------------------
@@ -24,7 +24,7 @@ If you find a bug, or issue in the documentation, you can help us out by [creati
2424

2525
Want to contribute without writing code?
2626
----------------------------------------
27-
Help us move the [abs-of-cartography](https://github.com/maptime/abcs-of-cartography/wiki) over to our [glossary](https://github.com/maptime/maptime.github.io/blob/master/_data/glossary.yml). Each entry in the wiki should have an entry in the website's glossary. The format is as follows:
27+
Help us move the [abs-of-cartography](https://github.com/maptime/abcs-of-cartography/wiki) over to our [glossary](https://github.com/maptime/maptime.github.io/blob/main/_data/glossary.yml). Each entry in the wiki should have an entry in the website's glossary. The format is as follows:
2828

2929
```yml
3030
# Add a term to the glossary:
@@ -46,7 +46,7 @@ Before you submit your pull request consider the following guidelines:
4646
- Make your changes in a new git branch
4747
4848
```
49-
git checkout -b my-fix-branch master
49+
git checkout -b my-fix-branch main
5050
```
5151

5252
- Commit your changes using a descriptive commit message
@@ -63,7 +63,7 @@ Before you submit your pull request consider the following guidelines:
6363
git push origin my-fix-branch
6464
```
6565

66-
- In GitHub, send a pull request to `maptime.github.io:master`.
66+
- In GitHub, send a pull request to `maptime.github.io:main`.
6767

6868
That's it, thanks!
6969

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://travis-ci.org/maptime/maptime.github.io.svg?branch=master)](https://travis-ci.org/maptime/maptime.github.io)
1+
[![Build Status](https://travis-ci.org/maptime/maptime.github.io.svg?branch=main)](https://travis-ci.org/maptime/maptime.github.io)
22

33
maptime.github.io
44
=================
@@ -72,6 +72,6 @@ $ gem install rdiscount
7272
Clone the [maptime.github.io repo](http://github.com/maptime/maptime.github.io) on your computer. Then switch into that file directory.
7373

7474
```
75-
$ git clone -b master git@github.com:maptime/maptime.github.io.git
75+
$ git clone -b main git@github.com:maptime/maptime.github.io.git
7676
$ cd maptime.github.io
7777
```

_posts/2014-10-24-maptime-has-a-new-website.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ With the new website it's easier than ever to get the materials you need to star
2727
1. __Get on Slack__: [Slack](https://maptime.slack.com/messages/general/) is our internal chat app for all things Maptime. We have channels for everything from website admin to tutorials. It's a great way to manage your chapter's communications. We'll send you an invite to get you squared away.
2828
1. __Get on Github__: we use Github for everything from [managing our website](https://github.com/maptime/maptime.github.io/issues) to writing our [Code of Conduct](https://github.com/maptime/code-of-conduct). You and your admins can be added to teams where you can get access to the Maptime organization, your chapter's repo, or other privileges that you think you need.
2929

30-
Once you're all setup, you can add your new chapter to the [map](http://maptime.io/chapters/). With the new re-design all you need to do is add your information in [one place](https://github.com/maptime/maptime.github.io/blob/master/_data/chapters.json) and make a __pull request__. Once your chapter has its first meeting scheduled, you'll see your chapter added to the map and the Chapters listing automatically!
30+
Once you're all setup, you can add your new chapter to the [map](http://maptime.io/chapters/). With the new re-design all you need to do is add your information in [one place](https://github.com/maptime/maptime.github.io/blob/main/_data/chapters.json) and make a __pull request__. Once your chapter has its first meeting scheduled, you'll see your chapter added to the map and the Chapters listing automatically!
3131

3232
### [Curated resources to get started with mapping](http://maptime.io/lessons-resources/)
3333

chapters/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
1. Ask [Alan](https://twitter.com/mappingmashups) (or some other Maptime organizer) to make you an owner on the GitHub organization.
66
2. Publicize your membership! (Go [here](https://github.com/orgs/maptime/people), find you, and click **make public**.)
7-
3. Add your chapter to [chapters.geojson](https://github.com/maptime/maptime.github.io/blob/master/_data/chapters.json) -- We use this to populate our map and the listing of Maptime Chapters!
8-
- If you have the [geojson.io chrome extension](https://chrome.google.com/webstore/detail/geojsonio/oibjgofbhldcajfamjganpeacipebckp?hl=en-US) installed you'll see a link to the geojson.io editor above the [Chapters map](https://github.com/maptime/maptime.github.io/blob/master/_data/chapters.json) on GitHub.
9-
- Otherwise open the file in the geojson.io editor by [clicking here!](http://geojson.io/#id=github:maptime/maptime.github.io/blob/master/_data/chapters.json&map=3/29.56/-54.94)
7+
3. Add your chapter to [chapters.geojson](https://github.com/maptime/maptime.github.io/blob/main/_data/chapters.json) -- We use this to populate our map and the listing of Maptime Chapters!
8+
- If you have the [geojson.io chrome extension](https://chrome.google.com/webstore/detail/geojsonio/oibjgofbhldcajfamjganpeacipebckp?hl=en-US) installed you'll see a link to the geojson.io editor above the [Chapters map](https://github.com/maptime/maptime.github.io/blob/main/_data/chapters.json) on GitHub.
9+
- Otherwise open the file in the geojson.io editor by [clicking here!](http://geojson.io/#id=github:maptime/maptime.github.io/blob/main/_data/chapters.json&map=3/29.56/-54.94)
1010
4. Add your chapter as a new marker to the map (be sure to click **Table** and add twitter and contact info).
1111
5. Click **Save > GitHub** and add a commit message (maybe something like "just added Maptime Null Island chapter!").
1212
6. You're done!

chapters/start.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ Forking a site means you're making a copy of it to your account and the origin r
2525
1. Once you have a fork of the site, create a folder for your chapter.
2626
![start-add-folder](/img/start-add-folder.png)
2727
Keep things simple by naming your folder after your city.
28-
1. Add a file named `index.html` and copy contents from the [/nullisland/index.html](https://github.com/maptime/maptime.github.io/blob/master/nullisland/index.html) file for the template into your new file.
28+
1. Add a file named `index.html` and copy contents from the [/nullisland/index.html](https://github.com/maptime/maptime.github.io/blob/main/nullisland/index.html) file for the template into your new file.
2929
1. Modify your details.
3030
1. When you're finished, commit the new file (it's like saving it) and add a commit message like '_Adds new Maptime chapter for Null Island!_'
3131
1. Once committed, go back to the root directory of your repo and make a __Pull Request__ (aka PR) by clicking the green button to the left of your repo's branch name.
3232
![start-pull](/img/start-pull.png)
3333
1. A new page appears where you can review your changes.
34-
1. Make sure you are making a PR from your repo's branch to the maptime.github.io master branch.
34+
1. Make sure you are making a PR from your repo's branch to the maptime.github.io main branch.
3535
![start-compare](/img/start-compare.png)
3636
1. Add a nice, relevant message regarding the changes you're proposing.
3737
1. Finally, click the big shiny green __Create Pull Request__ button. It's ok, you won't break anything. Extra points if you tag an admin with Maptime to notify them of changes (e.g. @geografa).

0 commit comments

Comments
 (0)