You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: CONTRIBUTING.md
+4-4Lines changed: 4 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -6,7 +6,7 @@ We'd love for you to contribute and help make [Maptime.io](http://maptime.io) be
6
6
Code for Conduct
7
7
----------------
8
8
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).
10
10
11
11
Need a question answered?
12
12
-------------------------
@@ -24,7 +24,7 @@ If you find a bug, or issue in the documentation, you can help us out by [creati
24
24
25
25
Want to contribute without writing code?
26
26
----------------------------------------
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:
28
28
29
29
```yml
30
30
# Add a term to the glossary:
@@ -46,7 +46,7 @@ Before you submit your pull request consider the following guidelines:
46
46
- Make your changes in a new git branch
47
47
48
48
```
49
-
git checkout -b my-fix-branch master
49
+
git checkout -b my-fix-branch main
50
50
```
51
51
52
52
- Commit your changes using a descriptive commit message
@@ -63,7 +63,7 @@ Before you submit your pull request consider the following guidelines:
63
63
git push origin my-fix-branch
64
64
```
65
65
66
-
- In GitHub, send a pull request to `maptime.github.io:master`.
66
+
- In GitHub, send a pull request to `maptime.github.io:main`.
Copy file name to clipboardExpand all lines: _posts/2014-10-24-maptime-has-a-new-website.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -27,7 +27,7 @@ With the new website it's easier than ever to get the materials you need to star
27
27
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.
28
28
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.
29
29
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!
31
31
32
32
### [Curated resources to get started with mapping](http://maptime.io/lessons-resources/)
Copy file name to clipboardExpand all lines: chapters/README.md
+3-3Lines changed: 3 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -4,9 +4,9 @@
4
4
5
5
1. Ask [Alan](https://twitter.com/mappingmashups) (or some other Maptime organizer) to make you an owner on the GitHub organization.
6
6
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)
10
10
4. Add your chapter as a new marker to the map (be sure to click **Table** and add twitter and contact info).
11
11
5. Click **Save > GitHub** and add a commit message (maybe something like "just added Maptime Null Island chapter!").
Copy file name to clipboardExpand all lines: chapters/start.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -25,13 +25,13 @@ Forking a site means you're making a copy of it to your account and the origin r
25
25
1. Once you have a fork of the site, create a folder for your chapter.
26
26

27
27
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.
29
29
1. Modify your details.
30
30
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!_'
31
31
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.
32
32

33
33
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.
35
35

36
36
1. Add a nice, relevant message regarding the changes you're proposing.
37
37
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